diff --git a/common/shlibs b/common/shlibs index 6eb84f5955..4c40822f53 100644 --- a/common/shlibs +++ b/common/shlibs @@ -886,29 +886,6 @@ libIceXML.so.34 libIce Ice-devel libvdpau.so.1 libvdpau libvdpau-devel libgtkhtml-4.0.so.0 libgtkhtml gtkhtml-devel libgtkhtml-editor-4.0.so.0 libgtkhtml gtkhtml-devel -libevolution-mail.so.0 libevolution evolution-devel -libevolution-calendar.so.0 libevolution evolution-devel -libevolution-mail-settings.so.0 libevolution evolution-devel -libevolution-mail-importers.so.0 libevolution evolution-devel -libevolution-calendar-importers.so.0 libevolution evolution-devel -libevolution-addressbook-importers.so.0 libevolution evolution-devel -libevolution-smime.so.0 libevolution evolution-devel -libetimezonedialog.so.0 libevolution evolution-devel -libgnomecanvas.so.0 libevolution evolution-devel -libevolution-a11y.so.0 libevolution evolution-devel -libfilter.so.0 libevolution evolution-devel -libemiscwidgets.so.0 libevolution evolution-devel -libetext.so.0 libevolution evolution-devel -libetable.so.0 libevolution evolution-devel -libmenus.so.0 libevolution evolution-devel -libessmime.so.0 libevolution evolution-devel -libemformat.so.0 libevolution evolution-devel -libeabutil.so.0 libevolution evolution-devel -libecontacteditor.so.0 libevolution evolution-devel -libecontactlisteditor.so.0 libevolution evolution-devel -libcomposer.so.0 libevolution evolution-devel -libeutil.so.0 libevolution evolution-devel -libeshell.so.0 libevolution evolution-devel libgsm.so libgsm libgsm-devel libcgroup.so.1 libcgroup libcgroup-devel libxdg-basedir.so.1 libxdg-basedir libxdg-basedir-devel diff --git a/srcpkgs/evolution-devel b/srcpkgs/evolution-devel deleted file mode 120000 index cbf0fe2241..0000000000 --- a/srcpkgs/evolution-devel +++ /dev/null @@ -1 +0,0 @@ -evolution \ No newline at end of file diff --git a/srcpkgs/evolution/depends b/srcpkgs/evolution/depends deleted file mode 100644 index 922a531c89..0000000000 --- a/srcpkgs/evolution/depends +++ /dev/null @@ -1,2 +0,0 @@ -abi_depends=">=3.2.1_1" -api_depends="${abi_depends}" diff --git a/srcpkgs/evolution/evolution-devel.template b/srcpkgs/evolution/evolution-devel.template deleted file mode 100644 index e2dd40f197..0000000000 --- a/srcpkgs/evolution/evolution-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'evolution-devel'. -# -short_desc="${sourcepkg} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -Add_dependency run libevolution - -do_install() -{ - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/evolution/evolution.rshlibs b/srcpkgs/evolution/evolution.rshlibs index b8db30967e..7363bd8496 100644 --- a/srcpkgs/evolution/evolution.rshlibs +++ b/srcpkgs/evolution/evolution.rshlibs @@ -1,14 +1,9 @@ -libeutil.so.0 -libcamel-provider-1.2.so.29 libpthread.so.0 libm.so.6 -libecal-1.2.so.10 libical.so.0 libicalss.so.0 libicalvcal.so.0 libedataserverui-3.0.so.1 -libebook-1.2.so.12 -libcamel-1.2.so.29 libdl.so.2 libplc4.so libplds4.so @@ -16,10 +11,8 @@ libnspr4.so libssl3.so libsmime3.so libnss3.so -libedataserver-1.2.so.15 libsqlite3.so.0 libsoup-2.4.so.1 -libebackend-1.2.so.1 libnotify.so.4 libgtkhtml-editor-4.0.so.0 libgtkhtml-4.0.so.0 @@ -32,53 +25,28 @@ libgtk-3.so.0 libgdk-3.so.0 libatk-1.0.so.0 libgio-2.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 librt.so.1 libglib-2.0.so.0 libc.so.6 -libevolution-calendar.so.0 -libevolution-calendar-importers.so.0 -libetimezonedialog.so.0 libsoup-gnome-2.4.so.1 -libevolution-mail.so.0 -libcomposer.so.0 -libecontactlisteditor.so.0 -libecontacteditor.so.0 -libeabutil.so.0 libcanberra-gtk3.so.0 libcanberra.so.0 -libevolution-smime.so.0 -libessmime.so.0 -libemformat.so.0 -libeshell.so.0 -libmenus.so.0 -libetable.so.0 -libetext.so.0 libSM.so.6 libICE.so.6 -libemiscwidgets.so.0 -libfilter.so.0 -libevolution-a11y.so.0 -libgnomecanvas.so.0 libnssutil3.so libmx-1.0.so.2 libclutter-gtk-1.0.so.0 -libclutter-glx-1.0.so.0 libcogl-pango.so.0 libjson-glib-1.0.so.0 -libGL.so.1 libXi.so.6 -libcogl.so.5 libdrm.so.2 libX11.so.6 libXext.so.6 @@ -88,11 +56,17 @@ libXfixes.so.3 libgdata.so.13 libgweather-3.so.0 libgstreamer-0.10.so.0 -libevolution-addressbook-importers.so.0 libldap-2.4.so.2 liblber-2.4.so.2 libresolv.so.2 libnsl.so.1 -libevolution-mail-importers.so.0 -libevolution-mail-settings.so.0 libgoa-1.0.so.0 +libdbus-glib-1.so.2 +libdbus-1.so.3 +libclutter-1.0.so.0 +libcogl.so.9 +libcamel-1.2.so.33 +libecal-1.2.so.11 +libebook-1.2.so.13 +libedataserver-1.2.so.16 +libebackend-1.2.so.2 diff --git a/srcpkgs/evolution/libevolution.rshlibs b/srcpkgs/evolution/libevolution.rshlibs deleted file mode 100644 index d675965803..0000000000 --- a/srcpkgs/evolution/libevolution.rshlibs +++ /dev/null @@ -1,67 +0,0 @@ -libm.so.6 -libecal-1.2.so.10 -libical.so.0 -libicalss.so.0 -libicalvcal.so.0 -libebackend-1.2.so.1 -libSM.so.6 -libICE.so.6 -libmx-1.0.so.2 -libclutter-gtk-1.0.so.0 -libclutter-glx-1.0.so.0 -libcogl-pango.so.0 -libjson-glib-1.0.so.0 -libGL.so.1 -libXi.so.6 -libcogl.so.5 -libdrm.so.2 -libX11.so.6 -libXext.so.6 -libXdamage.so.1 -libXcomposite.so.1 -libXfixes.so.3 -libcamel-provider-1.2.so.29 -libgtkhtml-editor-4.0.so.0 -libgtkhtml-4.0.so.0 -libenchant.so.1 -libnssutil3.so -libpthread.so.0 -libedataserverui-3.0.so.1 -libebook-1.2.so.12 -libcamel-1.2.so.29 -libdl.so.2 -libplc4.so -libplds4.so -libnspr4.so -libssl3.so -libsmime3.so -libnss3.so -libedataserver-1.2.so.15 -libsqlite3.so.0 -libsoup-2.4.so.1 -libgailutil-3.so.0 -libgconf-2.so.4 -libxml2.so.2 -libgnome-desktop-3.so.2 -libgtk-3.so.0 -libgdk-3.so.0 -libatk-1.0.so.0 -libgio-2.0.so.0 -libpangoft2-1.0.so.0 -libpangocairo-1.0.so.0 -libgdk_pixbuf-2.0.so.0 -libcairo-gobject.so.2 -libcairo.so.2 -libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 -libgobject-2.0.so.0 -libgmodule-2.0.so.0 -libgthread-2.0.so.0 -librt.so.1 -libglib-2.0.so.0 -libc.so.6 -libnotify.so.4 -libsoup-gnome-2.4.so.1 -libcanberra-gtk3.so.0 -libcanberra.so.0 diff --git a/srcpkgs/evolution/libevolution.template b/srcpkgs/evolution/libevolution.template deleted file mode 100644 index 0176df064e..0000000000 --- a/srcpkgs/evolution/libevolution.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'libevolution'. -# -short_desc="${sourcepkg} - runtime libraries" -long_desc="${long_desc} - - This package contains the runtime libraries." - -do_install() -{ - vmove "usr/lib/evolution/3.2/*.so*" usr/lib/evolution/3.2 -} diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index ae644c0606..48a6b701d4 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,8 +1,8 @@ # Template file for 'evolution' pkgname=evolution -version=3.2.3 +version=3.3.92 homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-pst-import --with-clutter --with-openldap --with-krb5=/usr --disable-schemas-install --disable-scrollkeeper @@ -10,34 +10,33 @@ configure_args="--disable-pst-import --with-clutter --with-openldap short_desc="Integrated mail, addressbook and calendaring" maintainer="davehome " license="GPL-2" -checksum=a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d +checksum=5932bd6d9c37657dde1ef3350341760c07a7c3022a4c24e7f533dbcd587bc33d long_desc=" Evolution provides integrated mail, addressbook and calendaring functionality to users of the GNOME desktop." gconf_schemas=" -apps_evolution_shell.schemas -evolution-mail.schemas -apps-evolution-mail-notification.schemas apps-evolution-attachment-reminder.schemas -apps_evolution_email_custom_header.schemas -apps_evolution_eplugin_face.schemas +apps-evolution-mail-notification.schemas +apps-evolution-mail-prompts-checkdefault.schemas apps-evolution-template-placeholders.schemas apps_evolution_addressbook.schemas -evolution-bogofilter.schemas apps_evolution_calendar.schemas -apps-evolution-mail-prompts-checkdefault.schemas +apps_evolution_email_custom_header.schemas +apps_evolution_eplugin_face.schemas +apps_evolution_shell.schemas +evolution-bogofilter.schemas +evolution-mail.schemas evolution-spamassassin.schemas" -subpackages="lib${pkgname} ${pkgname}-devel" gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency build which Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils Add_dependency build evolution-data-server-devel Add_dependency build gtk+3-devel -Add_dependency build glib-devel Add_dependency build libical-devel Add_dependency build GConf-devel Add_dependency build mx-devel @@ -45,31 +44,14 @@ Add_dependency build clutter-gtk-devel Add_dependency build libcanberra-devel Add_dependency build gtkhtml-devel Add_dependency build nss-devel -Add_dependency build libSM-devel -Add_dependency build libICE-devel Add_dependency build clutter-devel -Add_dependency build cogl-devel Add_dependency build json-glib-devel -Add_dependency build MesaLib-devel -Add_dependency build libXi-devel -Add_dependency build libdrm-devel -Add_dependency build libX11-devel -Add_dependency build libXext-devel -Add_dependency build libXdamage-devel -Add_dependency build libXcomposite-devel Add_dependency build libXfixes-devel Add_dependency build enchant-devel Add_dependency build sqlite-devel Add_dependency build libsoup-devel -Add_dependency build nspr-devel Add_dependency build libxml2-devel Add_dependency build gnome-desktop-devel -Add_dependency build atk-devel -Add_dependency build pango-devel -Add_dependency build gdk-pixbuf-devel -Add_dependency build cairo-devel -Add_dependency build freetype-devel -Add_dependency build fontconfig-devel Add_dependency build libldap-devel Add_dependency build libsoup-gnome-devel Add_dependency build libnotify-devel @@ -91,4 +73,7 @@ post_install() { gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${f} \ --domain ${pkgname}-3.2 ${wrksrc}/${f} done + # Remove devel stuff, not interested. + rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig \ + ${DESTDIR}/usr/share/gtk-doc } diff --git a/srcpkgs/libevolution b/srcpkgs/libevolution deleted file mode 120000 index cbf0fe2241..0000000000 --- a/srcpkgs/libevolution +++ /dev/null @@ -1 +0,0 @@ -evolution \ No newline at end of file