Merge remote-tracking branch 'x/master'

* x/master: (261 commits)
  gnome: update for latest updates.
  gnome-icon-theme-extras: update to 3.4.0.
  sushi: update to 0.4.0.
  gjs: update to 1.32.0.
  gdm: update to 3.4.0.1.
  gobject-introspection: update to 1.32.0.
  evolution: update to 3.4.0.1.
  papyon: update to 0.5.6.
  totem: update to 3.4.0.
  totem-pl-parser: update to 3.4.0.
  libwacom: update to 0.4.
  gnome-session: update to 3.4.0.
  libgnomekbd: update to 3.4.0.2.
  gnome: explicitly depend on gnome-keyring.
  cairo: reenable the patch for 1.10 we had.
  gnome: fix sushi version.
  gnome: depend on gnome-screenshot.
  gnome-user-docs: update to 3.4.0.
  gnome-video-effects: update to 0.4.0.
  gtk+: rebuild against glib-2.32.0.
  ...

common/shlibs

@@ -90,6 +90,7 @@ libpangox-1.0.so.0		pango			pango-devel
 libpango-1.0.so.0		pango			pango-devel
 libcairo.so.2			cairo			cairo-devel
 libcairo-gobject.so.2		cairo			cairo-devel
+libcairo-script-interpreter.so.2	cairo		cairo-devel
 libgdk-x11-2.0.so.0		gtk+			gtk+-devel
 libgtk-x11-2.0.so.0		gtk+			gtk+-devel
 libgdk_pixbuf-2.0.so.0		gdk-pixbuf		gdk-pixbuf-devel
@@ -520,23 +521,19 @@ libmetacity-private.so.0	metacity		metacity-devel
 libgnome-menu-3.so.0		gnome-menus		gnome-menus-devel
 libart_lgpl_2.so.2		libart			libart-devel
 libgnomecanvas-2.so.0		libgnomecanvas		libgnomecanvas-devel
-libgcr-3.so.1			gnome-keyring		gnome-keyring-devel
-libgck-1.so.0			gnome-keyring		gnome-keyring-devel
 libgnome-keyring.so.0		libgnome-keyring	libgnome-keyring-devel
 libgweather-3.so.0		libgweather		libgweather-devel
 libical.so.0			libical			libical-devel
 libicalss.so.0			libical			libical-devel
 libicalvcal.so.0		libical			libical-devel
-libcamel-1.2.so.29		evolution-data-server	evolution-data-server-devel
+libcamel-1.2.so.33		evolution-data-server	evolution-data-server-devel
-libcamel-provider-1.2.so.29	evolution-data-server	evolution-data-server-devel
+libebackend-1.2.so.2		evolution-data-server	evolution-data-server-devel
-libebackend-1.2.so.1		evolution-data-server	evolution-data-server-devel
+libebook-1.2.so.13		evolution-data-server	evolution-data-server-devel
-libebook-1.2.so.12		evolution-data-server	evolution-data-server-devel
+libecal-1.2.so.11		evolution-data-server	evolution-data-server-devel
-libecal-1.2.so.10		evolution-data-server	evolution-data-server-devel
+libedata-book-1.2.so.13		evolution-data-server	evolution-data-server-devel
-libedata-book-1.2.so.11		evolution-data-server	evolution-data-server-devel
+libedata-cal-1.2.so.15		evolution-data-server	evolution-data-server-devel
-libedata-cal-1.2.so.13		evolution-data-server	evolution-data-server-devel
+libedataserver-1.2.so.16	evolution-data-server	evolution-data-server-devel
-libedataserver-1.2.so.15	evolution-data-server	evolution-data-server-devel
 libedataserverui-3.0.so.1	evolution-data-server	evolution-data-server-devel
-libegroupwise-1.2.so.13		evolution-data-server	evolution-data-server-devel
 libgdata.so.13			libgdata		libgdata-devel
 libpcap.so.1			libpcap			libpcap-devel
 libiptc.so.0			iptables		iptables-devel
@@ -574,8 +571,6 @@ libexempi.so.3			exempi			exempi-devel
 libatasmart.so.4		libatasmart		libatasmart-devel
 libsgutils2.so.2		libsgutils		sg3_utils-devel
 liblvm2app.so.2.2		liblvm2app		liblvm2app-devel
-libgdu.so.0			gnome-disk-utility	gnome-disk-utility-devel
-libgdu-gtk.so.0			gnome-disk-utility	gnome-disk-utility-devel
 libcpufreq.so.0			libcpufreq		libcpufreq-devel
 libgucharmap_2_90.so.7		gucharmap		gucharmap-devel
 libgphoto2.so.2			libgphoto2		libgphoto2-devel
@@ -583,7 +578,6 @@ libgphoto2_port.so.0		libgphoto2		libgphoto2-devel
 libgvfscommon.so.0		gvfs			gvfs-devel
 libgvfscommon-dnssd.so.0	gvfs			gvfs-devel
 libnautilus-extension.so.1	libnautilus		nautilus-devel
-libgdict-1.0.so.6		gnome-utils		gnome-utils-devel
 libgnomeui-2.so.0		libgnomeui		libgnomeui-devel
 libmpc.so.2.0.0			mpc			mpc-devel
 libsigc-2.0.so.0		libsigc++		libsigc++-devel
@@ -596,7 +590,7 @@ libatkmm-1.6.so.1		atkmm			atkmm-devel
 libgtkmm-3.0.so.1		gtkmm			gtkmm-devel
 libgdkmm-3.0.so.1		gtkmm			gtkmm-devel
 libgksu2.so.0			libgksu			libgksu-devel
-libgnome-bluetooth.so.8		gnome-bluetooth		gnome-bluetooth-devel
+libgnome-bluetooth.so.10	gnome-bluetooth		gnome-bluetooth-devel
 libgnome-bluetooth-applet.so.0	gnome-bluetooth		gnome-bluetooth-devel
 libsasl2.so.2			libsasl			libsasl-devel
 liblber-2.4.so.2		libldap			libldap-devel
@@ -678,7 +672,7 @@ libjasper.so.1			libjasper		jasper-devel
 librecode.so.0			librecode		recode-devel
 libenca.so.0			libenca			enca-devel
 libwavpack.so.1			libwavpack		wavpack-devel
-libvala-0.14.so.0		libvala			vala-devel
+libvala-0.16.so.0		libvala			vala-devel
 libSDL_net-1.2.so.0		SDL_net			SDL_net-devel
 libmodplug.so.1			libmodplug		libmodplug-devel
 libfetch.so			libfetch		libfetch-devel
@@ -720,7 +714,7 @@ libyelp.so.0			yelp			yelp-devel
 libpeas-1.0.so.0		libpeas			libpeas-devel
 libpeas-gtk-1.0.so.0		libpeas			libpeas-devel
 libtotem.so.0			totem			totem-devel
-libclutter-glx-1.0.so.0		clutter			clutter-devel
+libclutter-1.0.so.0		clutter			clutter-devel
 libmutter-private.so		mutter			mutter-devel
 libmutter-wm.so			mutter			mutter-devel
 libgjs.so.0			gjs			gjs-devel
@@ -784,10 +778,10 @@ libv4l1.so.0			v4l-utils		v4l-utils-devel
 libclutter-gst-1.0.so.0		clutter-gst		clutter-gst-devel
 libmx-1.0.so.2			mx			mx-devel
 libmx-gtk-1.0.so.0		mx			mx-devel
-libcheese.so.1			libcheese		cheese-devel
+libcheese.so.3			libcheese		cheese-devel
-libcheese-gtk.so.20		libcheese		cheese-devel
+libcheese-gtk.so.21		libcheese		cheese-devel
 libjson.so.0			json-c			json-c-devel
-libcogl.so.5			cogl			cogl-devel
+libcogl.so.9			cogl			cogl-devel
 libcogl-pango.so.0		cogl			cogl-devel
 libp11-kit.so.0			p11-kit			p11-kit-devel
 librest-0.7.so.0		rest			rest-devel
@@ -837,7 +831,7 @@ libdjvulibre.so.21		libdjvulibre		djvulibre-devel
 libgxps.so.2			libgxps			libgxps-devel
 libt1.so.5			libt1			t1lib-devel
 libt1x.so.5			libt1			t1lib-devel
-libevdocument3.so.3		libevince		evince-devel
+libevdocument3.so.4		libevince		evince-devel
 libevview3.so.3			libevince		evince-devel
 libjack.so.0			libjack			jack-devel
 libjackserver.so.0		libjack			jack-devel
@@ -891,29 +885,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
@@ -974,3 +945,11 @@ libmtdev.so.1			mtdev			mtdev-devel
 libcryptsetup.so.4		libcryptsetup		cryptsetup-devel
 libgusb.so.2			libgusb			libgusb-devel
 libmash-0.1.so.0		mash			mash-devel
+libudisks2.so.0			udisks2			udisks2-devel
+libgcr-3.so.1			gcr			gcr-devel
+libgck-1.so.0			gcr			gcr-devel
+libgcr-base-3.so.1 		gcr			gcr-devel
+libwacom.so.2			libwacom		libwacom-devel
+libfarstream-0.1.so.0		farstream		farstream-devel
+libtelepathy-farstream.so.2	telepathy-farstream	telepathy-farstream-devel
+libass.so.4			libass			libass-devel

srcpkgs/GConf/GConf-devel.template

@@ -9,8 +9,7 @@ Add_dependency run glib-devel
 Add_dependency run dbus-devel
 Add_dependency run GConf
 
-do_install()
+do_install() {
-{
 	install -d ${DESTDIR}/usr/lib/GConf/2 ${DESTDIR}/usr/{bin,share}
 	install -d ${DESTDIR}/usr/lib/gio/modules
 

srcpkgs/GConf/template

@@ -1,16 +1,15 @@
 # Template file for 'GConf'
 pkgname=GConf
-version=3.2.3
+version=3.2.5
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--without-openldap --with-gtk=3.0 --enable-defaults-service
+configure_args="--without-openldap --enable-gtk --enable-defaults-service
---disable-orbit"
+--disable-orbit --enable-gsettings-backend"
-revision=1
 short_desc="A process-transparent configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/gconf"
 license="GPL-2"
-checksum=9eb55dd1d009b6eba9c32e3fae87d3aa45a33629a5e2031ed9f5acb05efaa149
+checksum=4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6
 long_desc="
  GConf is a process-transparent configuration database API used to
  store user preferences. It has pluggable backends and features to
@@ -19,7 +18,6 @@ long_desc="
 conf_files="/etc/gconf/2/path"
 subpackages="$pkgname-devel"
 
-
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gobject-introspection
@@ -28,8 +26,7 @@ Add_dependency build dbus-glib-devel
 Add_dependency build polkit-devel
 Add_dependency build libxml2-devel
 
-post_install()
+post_install() {
-{
 	# Create GCONF_SCHEMAS_DIR
 	install -d ${DESTDIR}/usr/share/gconf/schemas
 	touch -f ${DESTDIR}/usr/share/gconf/schemas/.empty_on_purpose

srcpkgs/NetworkManager/NetworkManager-devel.template

@@ -1,15 +1,16 @@
 # Template file for 'NetworkManager-devel'.
 #
-short_desc="${sourcepkg} (development files)"
+short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 Add_dependency run dbus-glib-devel
-Add_dependency run libnm
+Add_dependency run libnm ">=${version}"
 
-do_install()
+noarch=yes
-{
+
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gir-1.0 usr/share

srcpkgs/NetworkManager/NetworkManager.rshlibs

@@ -24,3 +24,5 @@ libplds4.so
 libplc4.so
 libnspr4.so
 librt.so.1
+libnl-genl-3.so.200
+libsoup-2.4.so.1

srcpkgs/NetworkManager/depends

@@ -1,2 +1,2 @@
 abi_depends=">=0.9.1.90"
-api_depends=">=0.9.1.95" # -devel subpkg with reduced rundeps.
+api_depends=">=0.9.4.0"

srcpkgs/NetworkManager/libnm.rshlibs

@@ -16,3 +16,4 @@ libgthread-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
 libc.so.6
+libgio-2.0.so.0

srcpkgs/NetworkManager/libnm.template

@@ -1,6 +1,5 @@
 # Template file for 'libnm'.
 #
-revision=1
 short_desc="${sourcepkg} - shared libraries" 
 long_desc="${long_desc}
 
@@ -9,9 +8,7 @@ long_desc="${long_desc}
 
 replaces="NetworkManager<0.9.1.90_1"
 
-
+do_install() {
-do_install()
-{
 	vmove "usr/lib/*.so*" usr/lib
 	vmove "usr/lib/girepository-*" usr/lib
 }

srcpkgs/NetworkManager/template

@@ -1,19 +1,19 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=0.9.2.0
+version=0.9.4.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-distro=gentoo
 --with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no --disable-wimax
 --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
---with-crypto=nss --disable-static --enable-ppp
+--with-crypto=nss --disable-static --enable-ppp --enable-concheck
 --with-systemdsystemunitdir=/lib/systemd/system"
-revision=3
 short_desc="Network Management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/NetworkManager/"
 license="GPL-2"
-checksum=437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf
+checksum=eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f
 long_desc="
  NetworkManager attempts to keep an active network connection available at all
  times. It is intended only for the desktop use-case, and is not intended for
@@ -37,6 +37,7 @@ Add_dependency build libnl3-devel
 Add_dependency build polkit-devel
 Add_dependency build ppp-devel
 Add_dependency build iptables-devel
+Add_dependency build libsoup-devel
 
 Add_dependency full dbus		">=0"
 Add_dependency full iproute2

srcpkgs/accountsservice/accountsservice.rshlibs

@@ -6,6 +6,5 @@ libgio-2.0.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
 libc.so.6
-libgthread-2.0.so.0
 librt.so.1
 libcrypt.so.1

srcpkgs/accountsservice/template

@@ -1,7 +1,7 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
 version=0.6.15
-revision=3
+revision=5
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-systemdsystemunitdir=/lib/systemd/system"
@@ -18,13 +18,14 @@ long_desc="
 systemd_services="accounts-daemon.service on"
 subpackages="$pkgname-devel"
 
-
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gobject-introspection
 Add_dependency build dbus-glib-devel
 Add_dependency build polkit-devel
 
+Add_dependency run ConsoleKit-x11 # uses ConsoleKit dbus stuff.
+
 post_install() {
 	for d in users icons; do
 		vmkdir var/lib/AccountsService/${d}

srcpkgs/at-spi2-atk/at-spi2-atk.rshlibs

@@ -1,7 +1,6 @@
 libgmodule-2.0.so.0
 libatk-1.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libglib-2.0.so.0
 libatspi.so.0
 libdbus-1.so.3

srcpkgs/at-spi2-atk/template

@@ -1,11 +1,11 @@
 # Template file for 'at-spi2-atk'
 pkgname=at-spi2-atk
-version=2.2.2
+version=2.4.0
-distfiles="${GNOME_SITE}/$pkgname/2.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/2.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="A GTK+ module that bridges ATK to D-Bus at-spi"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=b63b214cec23163bf59239c59b350d55a7fcfab7a95858ea833815e0b16a4041
+checksum=28e9c21ec8a76cae4914bdbc011c4f6bf1beeaa27751a88534d87364e6a888bf
 long_desc="
  This package includes a gtk-module that bridges ATK to the new D-Bus based
  AT-SPI as well as C and Python client libraries.
@@ -16,6 +16,5 @@ long_desc="
 
 Add_dependency build pkg-config
 Add_dependency build intltool
-Add_dependency build dbus-glib-devel
 Add_dependency build gtk+3-devel
 Add_dependency build at-spi2-core-devel

srcpkgs/at-spi2-core/at-spi2-core-devel.template

@@ -6,11 +6,13 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 Add_dependency run dbus-devel
-Add_dependency run at-spi2-core
+Add_dependency run at-spi2-core ">=${version}"
 
-do_install()
+noarch=yes
-{
+
-	mkdir -p ${DESTDIR}/usr/{lib,share}
+do_install() {
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/include usr
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
 }

srcpkgs/at-spi2-core/at-spi2-core.rshlibs

@@ -1,5 +1,4 @@
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libSM.so.6
 libICE.so.6
 libX11.so.6

srcpkgs/at-spi2-core/template

@@ -1,11 +1,11 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.2.3
+version=2.4.0
-distfiles="${GNOME_SITE}/$pkgname/2.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/2.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="Assistive Technology Service Provider Interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1
+checksum=d9d087efe528b392cb7ee27982798126df6ec8c18d5e30c557c8fcc55022c669
 long_desc="
  This package includes the protocol definitions for the new D-Bus
  at-spi.
@@ -21,6 +21,7 @@ Add_dependency build intltool
 Add_dependency build gobject-introspection
 Add_dependency build libXtst-devel
 Add_dependency build libXevie-devel
+Add_dependency build libXi-devel
 Add_dependency build dbus-devel
 
 Add_dependency full dbus

srcpkgs/atk/atk-devel.template

@@ -6,10 +6,11 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 Add_dependency run glib-devel
-Add_dependency run atk
+Add_dependency run atk ">=${version}"
 
-do_install()
+noarch=yes
-{
+
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove "usr/share/gir-*" usr/share

srcpkgs/atk/atk.rshlibs

@@ -1,6 +1,3 @@
 libgobject-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
-libpthread.so.0
 libc.so.6

srcpkgs/atk/template

@@ -1,14 +1,13 @@
 # Template build file for 'atk'.
 pkgname=atk
-version=2.2.0
+version=2.4.0
-distfiles="${GNOME_SITE}/atk/2.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/atk/2.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-revision=1
 short_desc="Set of interfaces for accessibility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="LGPL-2.1"
-checksum=8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d
+checksum=091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d
 long_desc="
  The ATK library provides a set of interfaces for accessibility.
  By supporting the ATK interfaces, an application or toolkit can

srcpkgs/baobab/baobab.rshlibs

@@ -0,0 +1,13 @@
+libm.so.6
+libgtk-3.so.0
+libgdk-3.so.0
+libgio-2.0.so.0
+libpangocairo-1.0.so.0
+libgdk_pixbuf-2.0.so.0
+libpango-1.0.so.0
+libcairo.so.2
+libgobject-2.0.so.0
+libgtop-2.0.so.7
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6

srcpkgs/baobab/template

@@ -0,0 +1,32 @@
+# Template file for 'baobab'
+pkgname=baobab
+version=3.4.0
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+build_style=gnu-configure
+configure_args="--disable-schemas-compile"
+short_desc="A graphical directory tree analyzer"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.gnome.org"
+license="GPL-2"
+checksum=0936bb2e1bb9a9a7518eaa2a29cffd0bd9b99ae9c33e4e99b5d11c6d150a08bd
+long_desc="
+ Baobab is able to scan either specific directories or the whole
+ filesystem, in order to give the user a graphical tree representation
+ including each directory size or percentage in the branch.
+ It also auto-detects in real-time any change made to your home
+  folder as far as any mounted/unmounted device."
+
+replaces="gnome-utils>=3.0"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
+Add_dependency run hicolor-icon-theme
+Add_dependency run desktop-file-utils
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build itstool
+Add_dependency build gnome-doc-utils
+Add_dependency build gtk+3-devel
+Add_dependency build libgtop-devel
+
+Add_dependency full gsettings-desktop-schemas

srcpkgs/brasero/brasero-devel.template

@@ -5,19 +5,18 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run gst-plugins-base-devel
 Add_dependency run totem-pl-parser-devel
 Add_dependency run libnotify-devel
 Add_dependency run libcanberra-devel
 Add_dependency run nautilus-devel
-Add_dependency run brasero
+Add_dependency run brasero ">=${version}"
 
-do_install()
+noarch=yes
-{
+
-	install -d ${DESTDIR}/usr/{lib,share}
+do_install() {
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/include usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove usr/lib/pkgconfig usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
 }

srcpkgs/brasero/brasero.rshlibs

@@ -6,9 +6,6 @@ libtotem-plparser.so.17
 libgtk-3.so.0
 libatk-1.0.so.0
 libgio-2.0.so.0
-libpangoft2-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
 libgdk-3.so.0
 libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0

srcpkgs/brasero/template

@@ -1,15 +1,14 @@
 # Template file for 'brasero'
 pkgname=brasero
-version=3.2.0
+version=3.4.0
-revision=7
 homepage="http://www.gnome.org/projects/brasero"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-caches"
 short_desc="Application to burn CD/DVD for the Gnome Desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=2e34309caefa9b2ca179e11c4501c5bfd2bcd5b8ed20bd959a249e034f54455c
+checksum=e35b739a7db54d21564232303bb9d12609a02976c36cdd8848ff4376a0809198
 long_desc="
  Features
     * Data CD/DVD: supports edition of discs contents (remove/move/rename
@@ -46,8 +45,3 @@ Add_dependency build nautilus-devel
 Add_dependency build tracker-devel
 Add_dependency build libisofs-devel
 Add_dependency build libburn-devel
-
-pre_configure() {
-	sed -i -e "s|tracker-sparql-0.12|tracker-sparql-0.14|g" \
-		-e "s|\(tracker_api=\)0.12|\10.14|g" configure
-}

srcpkgs/cairo/cairo-devel.rshlibs

@@ -1,5 +0,0 @@
-libpthread.so.0
-libz.so.1
-libdl.so.2
-libm.so.6
-libc.so.6

srcpkgs/cairo/cairo-devel.template

@@ -5,9 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=7
+revision=4
 
-Add_dependency run cairo
 Add_dependency run freetype-devel
 Add_dependency run fontconfig-devel
 Add_dependency run glib-devel
@@ -17,12 +16,12 @@ Add_dependency run libX11-devel
 Add_dependency run libXrender-devel
 Add_dependency run pixman-devel
 Add_dependency run MesaLib-devel
+Add_dependency run cairo ">=${version}"
 
-do_install()
+do_install() {
-{
+	vmove usr/include usr
-	mkdir -p ${DESTDIR}/usr/lib
+	vmove usr/share usr
-	mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr
+	vmove "usr/lib/*.a" usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	vmove "usr/lib/cairo/*.a" usr/lib/cairo
-	mv ${SRCPKGDESTDIR}/usr/lib/{cairo,pkgconfig} ${DESTDIR}/usr/lib
+	vmove usr/lib/pkgconfig usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
 }

srcpkgs/cairo/cairo.rshlibs

@@ -12,8 +12,8 @@ libX11.so.6
 libz.so.1
 libGL.so.1
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
 libm.so.6
 libc.so.6
+libdl.so.2

srcpkgs/cairo/template

@@ -1,17 +1,15 @@
 # Template build file for 'cairo'.
 pkgname=cairo
-version=1.10.2
+version=1.12.0
-revision=6
+revision=4
 homepage="http://cairographics.org"
 distfiles="${homepage}/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-configure_args="--enable-xlib --enable-xcb --enable-xlib-xcb=no
+configure_args="--enable-tee --enable-gl"
---enable-png --disable-directfb --enable-ft --enable-pdf --enable-tee
---enable-ps --enable-svg --disable-gcov --enable-gl --enable-xlib-xrender"
 short_desc="Vector graphics library with cross-device output support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1, MPL-1.1"
-checksum=32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
+checksum=af65b766dff11bcf3cba1f92d92a1bc28f78dc2944908a5930a026af06510099
 long_desc="
  Cairo is a vector graphics library with cross-device output support. Currently
  supported output targets include the X Window System and in-memory image

srcpkgs/cantarell-fonts/template

@@ -1,11 +1,11 @@
 # Template file for 'cantarell-fonts'
 pkgname=cantarell-fonts
-version=0.0.7
+version=0.0.8
 distfiles="${GNOME_SITE}/$pkgname/0.0/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="Cantarell family of TrueType fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6a21f841d28de444deee201a25e5cbc129fde14d633c547a7d36941437f72090
+checksum=e5468861cee84c034dfc53ed9836a360bea45767873dd7840fe403a06bcc61fb
 long_desc="
  The Cantarell typeface family is a contemporary Humanist
  sans serif, and is used by the GNOME project for its user
@@ -15,9 +15,8 @@ noarch=yes
 Add_dependency build pkg-config
 Add_dependency full fontconfig
 
-post_install()
+post_install() {
-{
+	vmkdir etc/fonts/conf.d
-	install -d ${DESTDIR}/etc/fonts/conf.d
 	mv ${DESTDIR}/usr/share/fontconfig/conf.avail \
 		${DESTDIR}/etc/fonts/conf.avail
 	rmdir ${DESTDIR}/usr/share/fontconfig

srcpkgs/caribou/caribou-devel.template

@@ -7,6 +7,8 @@ long_desc="${long_desc}
 
 Add_dependency run pygobject-devel
 
+noarch=yes
+
 do_install()
 {
 	vmove usr/include usr

srcpkgs/caribou/caribou.rshlibs

@@ -11,14 +11,8 @@ libxml2.so.2
 libgee.so.2
 libgio-2.0.so.0
 libgobject-2.0.so.0
-libgmodule-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
 libgtk-3.so.0
 libatk-1.0.so.0
-libpangoft2-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1

srcpkgs/caribou/template

@@ -1,14 +1,13 @@
 # Template file for 'caribou'
 pkgname=caribou
-version=0.4.1
+version=0.4.2
-revision=2
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static
 --disable-gtk2-module"
 short_desc="An alternative to the Gnome On-screen Keyboard"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1
+checksum=bcc64498b20c368747c3630d501a66ccf904db15d855f33fd4f963b5b19723ad
 long_desc="
  Caribou is a text entry and UI navigation application being developed as an
  alternative to the Gnome On-screen Keyboard. The overarching goal for Caribou

srcpkgs/cheese/cheese-devel.template

@@ -1,16 +1,19 @@
 # Template file for 'cheese-devel'.
 #
-short_desc="${sourcepkg} (development files)"
+short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 Add_dependency run gst-plugins-base-devel
 Add_dependency run libcanberra-devel
-Add_dependency run libcheese
+Add_dependency run clutter-gst-devel
+Add_dependency run clutter-gtk-devel
+Add_dependency run libcheese ">=${version}"
 
-do_install()
+noarch=yes
-{
+
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gir-1.0 usr/share

srcpkgs/cheese/cheese.rshlibs

@@ -1,9 +1,6 @@
-libcheese.so.1
-libcheese-gtk.so.20
 libgstreamer-0.10.so.0
 libgnome-desktop-3.so.2
 libclutter-gtk-1.0.so.0
-libclutter-glx-1.0.so.0
 libgee.so.2
 libcanberra-gtk3.so.0
 libgtk-3.so.0
@@ -15,3 +12,6 @@ libgthread-2.0.so.0
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
+libcheese.so.3
+libcheese-gtk.so.21
+libclutter-1.0.so.0

srcpkgs/cheese/depends

@@ -1,3 +1,2 @@
-abi_depends=">=3.0.2"
+abi_depends=">=3.3.92"
-# libcheese appeared in 3.2.1
+api_depends=">=3.3.92_1"
-api_depends=">=3.2.1"

srcpkgs/cheese/libcheese.rshlibs

@@ -8,12 +8,9 @@ libgnome-desktop-3.so.2
 librsvg-2.so.2
 libm.so.6
 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
@@ -27,14 +24,11 @@ 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
 libgmodule-2.0.so.0
 libgudev-1.0.so.0
 libgobject-2.0.so.0
@@ -43,3 +37,5 @@ librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
+libclutter-1.0.so.0
+libcogl.so.9

srcpkgs/cheese/libcheese.template

@@ -5,11 +5,9 @@ long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-revision=1
 replaces="cheese<=3.2.2" # for the typelib file
 
-do_install()
+do_install() {
-{
 	vmove "usr/lib/*.so*" usr/lib
 	vmove usr/lib/girepository-1.0 usr/lib
 }

srcpkgs/cheese/template

@@ -1,16 +1,14 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.2.2
+version=3.4.0
-revision=1
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper
+configure_args="--disable-static --disable-schemas-compile"
---disable-static --disable-schemas-compile"
 short_desc="GNOME tool to take pictures and videos from your webcam"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/cheese/"
 license="GPL-2"
-checksum=8f050b03365310d739c54e48c8c62f8e2d6d9a028fed3eb3c8da4c7654a9009a
+checksum=96b0eae8e366e4d44921e148239167fcb6965dbbcb40e406d6a118c75377b41a
 long_desc="
  A webcam application that supports image and video capture. Makes it easy to
  take photos and videos of you, your friends, pets or whatever you want. Allows
@@ -20,15 +18,11 @@ long_desc="
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="lib${pkgname} ${pkgname}-devel"
 
-Add_dependency run gst-plugins-good
+Add_dependency build which
-Add_dependency run gst-plugins-bad
-Add_dependency run desktop-file-utils
-Add_dependency run hicolor-icon-theme
-Add_dependency run gsettings-desktop-schemas
-
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
+Add_dependency build itstool
 Add_dependency build gobject-introspection
 Add_dependency build gst-plugins-base-devel
 Add_dependency build clutter-gtk-devel
@@ -39,4 +33,11 @@ Add_dependency build libcanberra-devel
 Add_dependency build librsvg-devel
 Add_dependency build gnome-desktop-devel
 
+Add_dependency run desktop-file-utils
+Add_dependency run hicolor-icon-theme
+Add_dependency run nautilus-sendto
+
+Add_dependency full gst-plugins-good
+Add_dependency full gst-plugins-bad
 Add_dependency full gnome-video-effects
+Add_dependency full gsettings-desktop-schemas

srcpkgs/clutter-gst/clutter-gst-devel.template

@@ -7,10 +7,11 @@ long_desc="${long_desc}
 
 Add_dependency run clutter-devel
 Add_dependency run gst-plugins-base-devel
-Add_dependency run clutter-gst
+Add_dependency run clutter-gst ">=${version}"
 
-do_install()
+noarch=yes
-{
+
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gir-1.0 usr/share

srcpkgs/clutter-gst/clutter-gst.rshlibs

@@ -1,14 +1,10 @@
-libclutter-glx-1.0.so.0
 libcairo-gobject.so.2
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
-libGL.so.1
-libpangoft2-1.0.so.0
 libXi.so.6
 libcairo.so.2
-libcogl.so.5
 libgdk_pixbuf-2.0.so.0
 libdrm.so.2
 libX11.so.6
@@ -16,8 +12,6 @@ libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
 libpango-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
 libXfixes.so.3
 libgio-2.0.so.0
 libgstvideo-0.10.so.0
@@ -34,3 +28,5 @@ librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
+libclutter-1.0.so.0
+libcogl.so.9

srcpkgs/clutter-gst/depends

@@ -1,2 +1,2 @@
-abi_depends=">=1.3.12"
+abi_depends=">=1.5.4"
 api_depends="${abi_depends}"

srcpkgs/clutter-gst/template

@@ -1,14 +1,14 @@
 # Template file for 'clutter-gst'
 pkgname=clutter-gst
-version=1.4.6
+version=1.5.4
-distfiles="http://clutter-project.org/sources/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-debug"
 short_desc="GStreamer bindings for the Clutter Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="GPL-2"
-checksum=5368ded143b2f73c3128315dab7b45c5dd8d681341cbae8f83664d2f9bbba3c3
+checksum=a137313ad134cd3737c018cc8f725ed1a4d1cf7d276012d75467b55f1f9859d7
 long_desc="
  This packages contains the GStreamer bindings for the Clutter Toolkit."
 

srcpkgs/clutter-gtk/clutter-gtk-devel.template

@@ -7,10 +7,11 @@ long_desc="${long_desc}
 
 Add_dependency run gtk+3-devel
 Add_dependency run clutter-devel
-Add_dependency run clutter-gtk
+Add_dependency run clutter-gtk ">=${version}"
 
-do_install()
+noarch=yes
-{
+
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gir-1.0 usr/share

srcpkgs/clutter-gtk/clutter-gtk.rshlibs

@@ -1,9 +1,6 @@
-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
@@ -14,19 +11,17 @@ 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
 libm.so.6
 libpthread.so.0
 libc.so.6
+libclutter-1.0.so.0
+libcogl.so.9

srcpkgs/clutter-gtk/depends

@@ -1,2 +1,2 @@
-abi_depends=">=0.91.8"
+abi_depends=">=1.1.2"
 api_depends="${abi_depends}"

srcpkgs/clutter-gtk/template

@@ -1,12 +1,11 @@
 # Template file for 'clutter-gtk'
 pkgname=clutter-gtk
-version=1.0.4
+version=1.2.0
-revision=3
+distfiles="${GNOME_SITE}/$pkgname/1.2/$pkgname-$version.tar.xz"
-distfiles="${GNOME_SITE}/$pkgname/1.0/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="GTK+3 bindings for the Clutter Tolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0741fd2feb7d065dd5949a0b47f9cd740272c1428ca93431dea677acb6de464e
+checksum=8be5deb0fa2f318e5f5e888b8ace3371c516464472a48f25c8b42ccc298af59a
 long_desc="
  This packages contains the GTK+3 bindings for the Clutter Toolkit."
 

srcpkgs/clutter/clutter-devel.template

@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run cogl-devel
 Add_dependency run cairo-devel
 Add_dependency run atk-devel
@@ -20,7 +18,9 @@ Add_dependency run libXfixes-devel
 Add_dependency run libXdamage-devel
 Add_dependency run libXcomposite-devel
 Add_dependency run libXi-devel
-Add_dependency run clutter
+Add_dependency run clutter ">=${version}"
+
+noarch=yes
 
 do_install() {
 	vmove usr/include usr

srcpkgs/clutter/clutter.rshlibs

@@ -4,11 +4,9 @@ libatk-1.0.so.0
 libpangocairo-1.0.so.0
 libcairo.so.2
 libcogl-pango.so.0
-libcogl.so.5
 libgdk_pixbuf-2.0.so.0
 libjson-glib-1.0.so.0
 libgio-2.0.so.0
-libGL.so.1
 libdrm.so.2
 libpangoft2-1.0.so.0
 libpango-1.0.so.0
@@ -27,3 +25,4 @@ librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
+libcogl.so.9

srcpkgs/clutter/depends

@@ -1,2 +1,2 @@
-abi_depends=">=1.0.8"
+abi_depends=">=1.9.16"
-api_depends=">=1.8.4_1" # fixed rundeps for -devel subpkg.
+api_depends="${abi_depends}"

srcpkgs/clutter/template

@@ -1,15 +1,14 @@
 # Template file for 'clutter'
 pkgname=clutter
-version=1.8.4
+version=1.10.0
-revision=1
+distfiles="${GNOME_SITE}/clutter/1.10/clutter-$version.tar.xz"
-distfiles="${GNOME_SITE}/clutter/1.8/clutter-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-introspection"
 short_desc="OpenGL based interactive canvas library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
 license="LGPL-2.1"
-checksum=6fedb4c344b4cab37e249b8a5ffeccff2f384f11335dee25c6466927461e1345
+checksum=51659837c77009cd04d069e480e9131328d6557ad67d1ffdc0dc4ae65a73ee45
 long_desc="
  Clutter is an open source software library for creating fast, visually
  rich and animated graphical user interfaces."

srcpkgs/cogl/cogl-devel.template

@@ -1,6 +1,6 @@
 # Template file for 'cogl-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
@@ -10,12 +10,12 @@ Add_dependency run libXcomposite-devel
 Add_dependency run libXdamage-devel
 Add_dependency run gdk-pixbuf-devel
 Add_dependency run glib-devel
-Add_dependency run cogl
+Add_dependency run cogl ">=${version}"
 
-do_install()
+noarch=yes
-{
+
-	mkdir -p ${DESTDIR}/usr/{lib,share}
+do_install() {
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/include usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove usr/lib/pkgconfig usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
+	vmove usr/share/gir-1.0 usr/share
 }

srcpkgs/cogl/cogl.rshlibs

@@ -7,7 +7,6 @@ libXdamage.so.1
 libXfixes.so.3
 libXcomposite.so.1
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libgmodule-2.0.so.0
 librt.so.1
 libglib-2.0.so.0

srcpkgs/cogl/depends

@@ -1,2 +1,2 @@
-abi_depends=">=1.8.0"
+abi_depends=">=1.10.0"
 api_depends="${abi_depends}"

srcpkgs/cogl/template

@@ -1,15 +1,14 @@
 # Template file for 'cogl'
 pkgname=cogl
-version=1.8.2
+version=1.10.0
-distfiles="${GNOME_SITE}/$pkgname/1.8/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/1.10/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-introspection"
-revision=1
 short_desc="Library for using 3D graphics hardware for rendering"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
 license="LGPL-2.1"
-checksum=ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7
+checksum=544b648cd5dc0a0ea438acd89d83727d82d6c29927db33a519ce2b28dc1ad07d
 long_desc="
  cogl is a small open source library for using 3D graphics hardware for
  rendering. The API departs from the flat state machine style of OpenGL and is
@@ -29,7 +28,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gobject-introspection

srcpkgs/dconf/dconf-devel.template

@@ -5,15 +5,15 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
 Add_dependency run glib-devel
 Add_dependency run vala-devel
-Add_dependency run dconf
+Add_dependency run dconf ">=${version}"
 
-do_install()
+noarch=yes
-{
+
-	mkdir -p ${DESTDIR}/usr/{lib,share}
+do_install() {
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/include usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove usr/lib/pkgconfig usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,vala} ${DESTDIR}/usr/share
+	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/vala usr/share
 }

srcpkgs/dconf/dconf-editor.template

@@ -1,6 +1,5 @@
 # Template file for 'dconf-editor'.
 #
-revision=2
 short_desc="${sourcepkg} - GTK+ editor"
 long_desc="${long_desc}
 

srcpkgs/dconf/template

@@ -1,14 +1,13 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.10.0
+version=0.12.0
-distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-revision=1
 short_desc="A low-level configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/dconf"
 licenses="LGPL-2.1"
-checksum=9f744ccfb3da20163a4bb27916c960f6bf56048b3ec1112862c85414fc064ee2
+checksum=9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af
 long_desc="
  dconf is a low-level configuration system. Its main purpose is to provide a
  backend to GSettings on platforms that don't already have configuration
@@ -17,7 +16,6 @@ long_desc="
 subpackages="dconf-devel dconf-editor"
 
 Add_dependency run dbus
-
 Add_dependency build pkg-config
 Add_dependency build vala-devel
 Add_dependency build dbus-devel

srcpkgs/empathy/empathy.rshlibs

@@ -2,18 +2,14 @@ libenchant.so.1
 libchamplain-gtk-0.12.so.0
 libclutter-gtk-1.0.so.0
 libchamplain-0.12.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
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
 libXfixes.so.3
-libcheese-gtk.so.20
 libfolks-telepathy.so.25
 libfolks.so.25
 libgee.so.2
@@ -28,7 +24,6 @@ libcanberra-gtk3.so.0
 libcanberra.so.0
 libnotify.so.4
 libgcr-3.so.1
-libtasn1.so.3
 libgck-1.so.0
 libp11-kit.so.0
 libpulse-mainloop-glib.so.0
@@ -38,14 +33,11 @@ libgtk-3.so.0
 libsoup-2.4.so.1
 libgdk-3.so.0
 libatk-1.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
 libgio-2.0.so.0
 libgmodule-2.0.so.0
 libgeoclue.so.0
@@ -63,7 +55,14 @@ libm.so.6
 libc.so.6
 libmission-control-plugins.so.0
 libgoa-1.0.so.0
-libebook-1.2.so.12
-libgstfarsight-0.10.so.0
-libtelepathy-farsight.so.0
 libjavascriptcoregtk-3.0.so.0
+libclutter-1.0.so.0
+libcogl.so.9
+libcheese-gtk.so.21
+libebook-1.2.so.13
+libedataserver-1.2.so.16
+libgconf-2.so.4
+libgcr-base-3.so.1
+libfarstream-0.1.so.0
+libtelepathy-farstream.so.2
+libclutter-gst-1.0.so.0

srcpkgs/empathy/template

@@ -1,16 +1,14 @@
 # Template file for 'empathy'
 pkgname=empathy
-version=3.2.2
+version=3.4.0
-revision=1
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper --disable-schemas-compile
+configure_args="--disable-schemas-compile --disable-static"
---disable-static"
 short_desc="GNOME instant messaging client using the Telepathy framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Empathy"
 license="GPL-2"
-checksum=d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1
+checksum=dd04344638a5496fd108c4d299a6f6d2272dc521dc353de85f13995f399f8f1a
 long_desc="
  Instant messaging program supporting text, voice, video, file transfers and
  inter-application communication over many different protocols, including:
@@ -23,9 +21,10 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
+Add_dependency build itstool
 Add_dependency build telepathy-glib-devel	">=0.15.5"
 Add_dependency build telepathy-logger-devel
-Add_dependency build telepathy-farsight-devel
+Add_dependency build telepathy-farstream-devel
 Add_dependency build telepathy-mission-control-devel
 Add_dependency build evolution-data-server-devel
 Add_dependency build geoclue-devel
@@ -35,7 +34,7 @@ Add_dependency build libnotify-devel
 Add_dependency build clutter-gtk-devel
 Add_dependency build clutter-gst-devel
 Add_dependency build webkit-gtk3-devel
-Add_dependency build gnome-keyring-devel
+Add_dependency build gcr-devel
 Add_dependency build pulseaudio-devel
 Add_dependency build enchant-devel
 Add_dependency build NetworkManager-devel
@@ -43,6 +42,7 @@ Add_dependency build gnome-online-accounts-devel
 Add_dependency build libchamplain-devel
 Add_dependency build nautilus-sendto-devel
 Add_dependency build cheese-devel
+Add_dependency build gnutls-devel
 
 Add_dependency full iso-codes
 # XXX add telepathy-{sofiasip,haze}

srcpkgs/eog-plugins/eog-plugins.rshlibs

@@ -5,14 +5,11 @@ 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
@@ -24,12 +21,9 @@ libc.so.6
 libchamplain-gtk-0.12.so.0
 libchamplain-0.12.so.0
 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
@@ -39,3 +33,5 @@ libXfixes.so.3
 libgdata.so.13
 libsoup-2.4.so.1
 libxml2.so.2
+libclutter-1.0.so.0
+libcogl.so.9

srcpkgs/eog-plugins/template

@@ -1,13 +1,13 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.2.2
+version=3.4.0
-distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="Eye of GNOME plugins"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=123e50be69c33bddc5d6def0a1f618970e01207c2e959edbaf0afc56717d8975
+checksum=21a63f8f6e3a5b30f2f05133edc46becd4c83343c0f462a345204326071bc139
 long_desc="
  eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop
  which uses the gdk-pixbuf library. It can deal with large images, and zoom
@@ -19,7 +19,7 @@ long_desc="
 pycompile_dirs="usr/lib/eog/plugins"
 
 # XXX postr plugin.
-Add_dependency run eog
+Add_dependency run eog ">=${version}"
 
 Add_dependency build pkg-config
 Add_dependency build intltool

srcpkgs/eog/depends

@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=3.3.92"
 api_depends="${abi_depends}"

srcpkgs/eog/eog-devel.template

@@ -7,6 +7,8 @@ long_desc="${long_desc}
 
 Add_dependency run gtk+3-devel
 
+noarch=yes
+
 do_install()
 {
 	vmove usr/include usr

srcpkgs/eog/eog.rshlibs

@@ -22,12 +22,9 @@ libglib-2.0.so.0
 libz.so.1
 libpthread.so.0
 libc.so.6
-libpangoft2-1.0.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
 libpango-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
 libffi.so.5
 libgmodule-2.0.so.0
 librt.so.1

srcpkgs/eog/template

@@ -1,14 +1,14 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.2.2
+version=3.4.0
-distfiles="${GNOME_SITE}/eog/3.2/eog-$version.tar.xz"
+distfiles="${GNOME_SITE}/eog/3.4/eog-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=315625babf04293341bd0b3ae26337d11c8696422d5dc4442ad551b25db42530
+checksum=0710479642078aebb576d07ccc599e9f5ae83f4c738b182867fda59aea359dd2
 long_desc="
  eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop
  which uses the gdk-pixbuf library. It can deal with large images, and zoom
@@ -21,6 +21,7 @@ subpackages="eog-devel"
 Add_dependency run hicolor-icon-theme
 Add_dependency run desktop-file-utils
 
+Add_dependency build which
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils

srcpkgs/evince/depends

@@ -1,2 +1,2 @@
-abi_depends=">=3.2.1"
+abi_depends=">=3.3.92"
 api_depends="${abi_depends}"

srcpkgs/evince/evince-devel.template

@@ -6,10 +6,11 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 Add_dependency run gtk+3-devel
-Add_dependency run libevince
+Add_dependency run libevince ">=${version}"
 
-do_install()
+noarch=yes
-{
+
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gir-1.0 usr/share

srcpkgs/evince/evince.rshlibs

@@ -1,16 +1,11 @@
-libevdocument3.so.3
 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
 libpango-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
-libgmodule-2.0.so.0
 libpoppler-glib.so.8
 libgobject-2.0.so.0
 libgthread-2.0.so.0
@@ -32,3 +27,6 @@ libgnome-keyring.so.0
 libgxps.so.2
 libarchive.so.12
 libtiff.so.5
+libevdocument3.so.4
+libSM.so.6
+libICE.so.6

srcpkgs/evince/libevince.rshlibs

@@ -1,14 +1,11 @@
 libgtk-3.so.0
 libgdk-3.so.0
 libatk-1.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
 libgio-2.0.so.0
 libgobject-2.0.so.0
 libgmodule-2.0.so.0

srcpkgs/evince/libevince.template

@@ -1,13 +1,11 @@
 # Template file for 'libevince'.
 #
-revision=1
 short_desc="${short_desc} - runtime libraries"
 long_desc="${long_desc}
 
  This package contains the runtime libraries."
 
-do_install()
+do_install() {
-{
 	vmove "usr/lib/*.so*" usr/lib
 	vmove usr/lib/girepository-1.0 usr/lib
 }

srcpkgs/evince/template

@@ -1,17 +1,16 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.2.1
+version=3.4.0
-distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-introspection --disable-schemas-compile
 --enable-comics --disable-scrollkeeper --enable-xps --disable-t1lib
 --disable-tests --disable-static"
-revision=6
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/evince/"
 license="GPL-2"
-checksum=9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35
+checksum=02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129
 long_desc="
  Evince is specifically designed to support the file following formats:
   * PDF
@@ -27,6 +26,7 @@ long_desc="
 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
@@ -39,8 +39,11 @@ Add_dependency build libgnome-keyring-devel
 Add_dependency build libxml2-devel
 Add_dependency build djvulibre-devel
 Add_dependency build libgxps-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build gtk+3-devel
 
-Add_dependency full desktop-file-utils
+Add_dependency run desktop-file-utils
-Add_dependency full hicolor-icon-theme
+Add_dependency run hicolor-icon-theme
 Add_dependency full gnome-icon-theme
 Add_dependency full gsettings-desktop-schemas

srcpkgs/evolution-data-server/depends

@@ -1,2 +1,2 @@
-abi_depends=">=3.2.0"
+abi_depends=">=3.3.92"
 api_depends="${abi_depends}"

srcpkgs/evolution-data-server/evolution-data-server-devel.template

@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run sqlite-devel
 Add_dependency run GConf-devel
 Add_dependency run mit-krb5-devel
 Add_dependency run nss-devel
@@ -14,12 +15,14 @@ Add_dependency run libldap-devel
 Add_dependency run libgdata-devel
 Add_dependency run gnome-online-accounts-devel
 Add_dependency run vala-devel
-Add_dependency run evolution-data-server
+Add_dependency run evolution-data-server ">=${version}"
 
-do_install()
+noarch=yes
-{
+
-	mkdir -p ${DESTDIR}/usr/{lib,share}
+do_install() {
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/include usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove usr/lib/pkgconfig usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc,vala} ${DESTDIR}/usr/share
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/vala usr/share
 }

srcpkgs/evolution-data-server/evolution-data-server.rshlibs

@@ -8,7 +8,6 @@ libsoup-2.4.so.1
 libgio-2.0.so.0
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
-libgthread-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
@@ -37,12 +36,10 @@ libgweather-3.so.0
 libgtk-3.so.0
 libgdk-3.so.0
 libatk-1.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
 libgnome-keyring.so.0
+libdbus-glib-1.so.2

srcpkgs/evolution-data-server/template

@@ -1,8 +1,8 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.2.3
+version=3.4.0
 homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-openldap
 --with-krb5=/usr --with-nspr-includes=/usr/include/nspr
@@ -10,7 +10,7 @@ configure_args="--with-openldap
 short_desc="Evolution data server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
+checksum=7132aee89b73187155c8afec43b9b3cc5c97098a488aad3872f7fedd0552a6ac
 long_desc="
  Evolution Data Server is responsible for managing calendar and addressbook
  information within the GNOME desktop."
@@ -22,6 +22,8 @@ Add_dependency build intltool
 Add_dependency build flex
 Add_dependency build gperf
 Add_dependency build gobject-introspection
+Add_dependency build sqlite-devel
+Add_dependency build dbus-glib-devel
 Add_dependency build GConf-devel
 Add_dependency build mit-krb5-devel
 Add_dependency build nss-devel
@@ -31,3 +33,5 @@ Add_dependency build libldap-devel
 Add_dependency build libgdata-devel
 Add_dependency build gnome-online-accounts-devel
 Add_dependency build vala-devel
+Add_dependency build liboauth-devel
+Add_dependency build libgnome-keyring-devel

srcpkgs/evolution-devel

@@ -1 +0,0 @@
-evolution

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

srcpkgs/evolution/libevolution.rshlibs

@@ -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

srcpkgs/evolution/libevolution.template

@@ -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
-}

srcpkgs/evolution/template

@@ -1,8 +1,8 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.2.3
+version=3.4.0.1
 homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/3.4/$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 <davehome@redthumb.info.tm>"
 license="GPL-2"
-checksum=a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d
+checksum=364eacfc54912ba26738729d0f662a821140a712e3607cf569eb342f1dab4f7a
 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-mail-notification.schemas
-apps_evolution_eplugin_face.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,8 @@ 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
+	rm -rf ${DESTDIR}/usr/lib/pkgconfig
+	rm -rf ${DESTDIR}/usr/share/gtk-doc
 }

srcpkgs/farstream-devel

@@ -0,0 +1 @@
+farstream

srcpkgs/farstream/depends

@@ -1,2 +1,2 @@
-abi_depends=">=3.0.0"
+abi_depends=">=0.1.1"
 api_depends="${abi_depends}"

srcpkgs/farstream/farstream-devel.template

@@ -1,15 +1,21 @@
-# Template file for 'evolution-devel'.
+# Template file for 'farstream-devel'.
 #
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libevolution
+revision=1
+replaces="farsight2-devel>=0"
 
-do_install()
+Add_dependency run gst-plugins-base-devel
-{
+Add_dependency run farstream ">=${version}"
+
+noarch=yes
+
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/gir-1.0 usr/share
 }

srcpkgs/farstream/farstream.rshlibs

@@ -0,0 +1,19 @@
+libgstbase-0.10.so.0
+libgstreamer-0.10.so.0
+libgobject-2.0.so.0
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libxml2.so.2
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libgstrtp-0.10.so.0
+libm.so.6
+libnice.so.10
+libgupnp-igd-1.0.so.3
+libgupnp-1.0.so.4
+libgssdp-1.0.so.3
+libsoup-2.4.so.1
+libgio-2.0.so.0
+libgstnetbuffer-0.10.so.0

srcpkgs/farstream/template

@@ -0,0 +1,36 @@
+# Template file for 'farstream'
+pkgname=farstream
+version=0.1.1
+revision=1
+homepage="http://www.freedesktop.org/wiki/Software/Farstream"
+distfiles="http://freedesktop.org/software/farstream/releases/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu-configure
+configure_args="--disable-valgrind --disable-debug --disable-static"
+short_desc="GStreamer modules and libraries for videoconferencing"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="LGPL-2.1"
+checksum=7b88a0730fbdd03297295574a613409790bf751d578690d7072cbf2be3f9ad52
+long_desc="
+ The Farsight project is an effort to create a framework to deal with all
+ known audio/video conferencing protocols. On one side it offers a generic API
+ that makes it possible to write plugins for different streaming protocols, on
+ the other side it offers an API for clients to use those plugins."
+
+replaces="farsight2>=0"
+subpackages="$pkgname-devel"
+
+Add_dependency run gst-python
+Add_dependency run pygobject2
+Add_dependency run pygtk
+Add_dependency run gst-plugins-good
+Add_dependency run gst-plugins-bad
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build libnice-devel
+Add_dependency build gst-plugins-base-devel
+Add_dependency build python-devel
+Add_dependency build gst-python-devel
+Add_dependency build pygobject2-devel
+Add_dependency build gupnp-devel
+Add_dependency build gobject-introspection

srcpkgs/file-roller/file-roller.rshlibs

@@ -12,11 +12,5 @@ libmagic.so.1
 libm.so.6
 libnautilus-extension.so.1
 libatk-1.0.so.0
-libpangoft2-1.0.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
-libfreetype.so.6
-libfontconfig.so.1
-libgmodule-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1

srcpkgs/file-roller/template

@@ -1,7 +1,7 @@
 # Template file for 'file-roller'
 pkgname=file-roller
-version=3.2.2
+version=3.4.0
-distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --enable-magic
 --disable-schemas-compile --disable-static"
@@ -9,7 +9,7 @@ short_desc="GNOME Front-end to archiving programs like tar and zip"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=de2c93e947f7aabf46124d6384b358c162a7ee1236e4930f2486684979d5ebe5
+checksum=79dfb3bc2e0fb68094180ae1845e4b6c253d5f231e3cf355521193848610c5dc
 long_desc="
  File Roller is an archive manager for the GNOME environment. This means
  that you can:
@@ -37,6 +37,7 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 Add_dependency run desktop-file-utils
 Add_dependency run hicolor-icon-theme
 
+Add_dependency build which
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils

srcpkgs/folks/folks-devel.template

@@ -9,10 +9,11 @@ Add_dependency run telepathy-glib-devel
 Add_dependency run libgee-devel ">=0.6.2.1_1" # introspection fix
 Add_dependency run libsocialweb-devel
 Add_dependency run evolution-data-server-devel
-Add_dependency run folks
+Add_dependency run folks ">=${version}"
 
-do_install()
+noarch=yes
-{
+
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gir-1.0 usr/share

srcpkgs/folks/folks.rshlibs

@@ -3,7 +3,6 @@ libgmodule-2.0.so.0
 libgconf-2.so.4
 libgee.so.2
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
@@ -12,18 +11,9 @@ libtelepathy-glib.so.0
 libsocialweb-client.so.2
 libdbus-glib-1.so.2
 libdbus-1.so.3
-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
-libsqlite3.so.0
-libedataserver-1.2.so.15
 libsoup-2.4.so.1
 libxml2.so.2
 libreadline.so.6
 libtracker-sparql-0.14.so.0
+libebook-1.2.so.13
+libedataserver-1.2.so.16

srcpkgs/folks/template

@@ -1,7 +1,6 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.6.6
+version=0.6.8
-revision=1
 homepage="http://telepathy.freedesktop.org/wiki/Folks"
 distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
 build_style=gnu-configure
@@ -9,7 +8,7 @@ configure_args="--enable-vala --enable-tracker-backend"
 short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
-checksum=3dd6a2983969a6369c6b0e25f28ec92415b5570dd6c89b25385807ecc4aeb0a8
+checksum=4ee18ce808315f27ab6bf9f7d2b438dd4c1042a8ab6836bb5058b6dce167e0b1
 long_desc="
  libfolks is a library that aggregates people from multiple sources (eg,
  Telepathy connection managers and eventually evolution data server, Facebook,

srcpkgs/fontconfig/fontconfig-devel.template

@@ -5,23 +5,16 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=3
-
 Add_dependency run expat-devel
 Add_dependency run freetype-devel
 Add_dependency run zlib-devel
 Add_dependency run bzip2-devel
-Add_dependency run fontconfig
+Add_dependency run fontconfig ">=${version}"
 
-do_install()
+do_install() {
-{
+	vmove usr/include usr
-	mkdir -p ${DESTDIR}/usr/lib
+	vmove "usr/lib/*.a" usr/lib
-	mkdir -p ${DESTDIR}/usr/share/man
+	vmove usr/lib/pkgconfig usr/lib
-	mkdir -p ${DESTDIR}/usr/share/doc/fontconfig
+	vmove usr/share/man/man3 usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/share/doc usr/share
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/doc/fontconfig/$pkgname* \
-		${DESTDIR}/usr/share/doc/fontconfig
 }

srcpkgs/fontconfig/patches/dont_run_fccache.diff

@@ -1,19 +0,0 @@
---- Makefile.in.orig	2008-06-01 04:31:00.000000000 +0200
-+++ Makefile.in	2008-10-02 09:06:19.000000000 +0200
-@@ -801,16 +801,6 @@
- 	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
- 	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
- 	fi; fi
--	@(if $(RUN_FC_CACHE_TEST); then \
--	    echo " $(bindir)/fc-cache -s -f -v"; \
--	    $(bindir)/fc-cache -s -f -v; \
--	else \
--	    echo "***"; \
--	    echo "*** Warning: fonts.cache not built"; \
--	    echo "***"; \
--	    echo "*** Generate this file manually on host system using fc-cache"; \
--	    echo "***"; \
--	fi)
- 
- uninstall-local:
- 	if [ -f $(srcdir)/fonts.conf ]; then \

srcpkgs/fontconfig/template

@@ -1,13 +1,14 @@
 # Template build file for 'fontconfig'.
 pkgname=fontconfig
-version=2.8.0
+version=2.9.0
-revision=4
+homepage="http://www.fontconfig.org"
-distfiles="ftp://mirror.ovh.net/gentoo-distfiles/distfiles/$pkgname-$version.tar.gz"
+license="MIT"
+distfiles="http://www.freedesktop.org/software/fontconfig/release/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-docs --with-cache-dir=/var/cache/$pkgname"
 short_desc="Library for configuring and customizing font access"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
+checksum=ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
 long_desc="
  Fontconfig is a library for configuring and customizing font access.
 
@@ -36,6 +37,7 @@ long_desc="
 
 conf_files="/etc/fonts/fonts.conf"
 subpackages="$pkgname-devel"
+
 Add_dependency build pkg-config
 Add_dependency build expat-devel
 Add_dependency build freetype-devel

srcpkgs/gcalctool/template

@@ -1,15 +1,14 @@
 # Template file for 'gcalctool'
 pkgname=gcalctool
-version=6.2.0
+version=6.4.0
-distfiles="${GNOME_SITE}/$pkgname/6.2/$pkgname-$version.tar.xz"
+distfiles="${GNOME_SITE}/$pkgname/6.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-scrollkeeper"
+configure_args="--disable-schemas-compile"
-revision=1
 short_desc="GNOME Scientific calculator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Gcalctool"
 license="GPL-2"
-checksum=ddc2efe25220e9341832304dfd9e5e2390a70bb6bd70d1afeb49da88023cdffb
+checksum=cfc30d6002dc9c04598a17f729b60f2d6d37a500e88f10905c817da739fa2a85
 long_desc="
  The package contains the GNOME scientific calculator."
 
@@ -19,6 +18,7 @@ Add_dependency run desktop-file-utils
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
+Add_dependency build itstool
 Add_dependency build flex
 Add_dependency build gtk+3-devel
 Add_dependency build libxml2-devel

srcpkgs/gcr-devel

@@ -0,0 +1 @@
+gcr

srcpkgs/gcr/depends

@@ -1,2 +1,2 @@
-abi_depends=">=2.91.6"
+abi_depends=">=3.3.92"
 api_depends="${abi_depends}"

srcpkgs/gcr/gcr-devel.template

@@ -0,0 +1,22 @@
+# Template file for 'gcr-devel'.
+#
+short_desc="${sourcepkg} -- development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+replaces="gnome-keyring-devel<3.3.92"
+
+Add_dependency run glib-devel
+Add_dependency run p11-kit-devel
+Add_dependency run gtk+3-devel
+Add_dependency run gcr ">=${version}"
+
+noarch=yes
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/gir-1.0 usr/share
+}

srcpkgs/gcr/gcr.rshlibs

@@ -0,0 +1,19 @@
+libgtk-3.so.0
+libgdk-3.so.0
+libatk-1.0.so.0
+libpangocairo-1.0.so.0
+libgdk_pixbuf-2.0.so.0
+libcairo-gobject.so.2
+libpango-1.0.so.0
+libcairo.so.2
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libgio-2.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libgcrypt.so.11
+libgpg-error.so.0
+libp11-kit.so.0
+libpthread.so.0
+libc.so.6

srcpkgs/gcr/template

@@ -0,0 +1,37 @@
+# Template file for 'gcr'
+pkgname=gcr
+version=3.4.0
+homepage="http://www.gnome.org"
+distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+build_style=gnu-configure
+configure_args="--disable-debug --disable-update-mime
+--disable-update-icon-cache --disable-schemas-compile"
+short_desc="GNOME crypto package"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+checksum=6cb92178a04b5ea335102b43027420c200fe6a053e5e2009ffae91914a268106
+long_desc="
+ GCR is a library for displaying certificates, and crypto UI, accessing
+ key stores. It also provides the viewer for crypto files on the GNOME
+ desktop.
+
+ GCK is a library for accessing PKCS#11 modules like smart cards, in a
+ (G)object oriented way."
+
+replaces="gnome-keyring<3.3.92"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+subpackages="$pkgname-devel"
+
+Add_dependency build which
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build gnome-doc-utils
+Add_dependency build gobject-introspection
+Add_dependency build gtk+3-devel
+Add_dependency build p11-kit-devel
+Add_dependency build libgcrypt-devel
+Add_dependency build libtasn1-tools
+
+Add_dependency run hicolor-icon-theme
+Add_dependency run desktop-file-utils
+Add_dependency full gnupg

srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template

@@ -6,15 +6,11 @@ long_desc="
 
  This package contains development files: headers, static libs, etc."
 
-replaces="gtk+-devel<2.22"
-revision=2
-
 Add_dependency run perl		">=0"
 Add_dependency run libpng-devel
 Add_dependency run shared-mime-info
 
-do_install()
+do_install() {
-{
 	install -d ${DESTDIR}/usr/{bin,include,lib}
 	install -d ${DESTDIR}/usr/share/man/man1