From c139f5542042a29d97b241adfc8b04c74f1ec2ad Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:36:34 -0600
Subject: [PATCH 01/24] adobe-flash-plugin: adjust rshlibs for arch-specific
 linkage

---
 srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs | 6 +++---
 srcpkgs/adobe-flash-plugin/template                   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs b/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs
index ef9c919f53c..76ab9520245 100644
--- a/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs
+++ b/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs
@@ -28,6 +28,6 @@ libm.so.6
 libc.so.6
 ld-linux-x86-64.so.2
 ld-linux.so.2
-libgthread-2.0.so.0
-libXcursor.so.1
-libXrender.so.1
+libgthread-2.0.so.0 x86_64
+libXcursor.so.1 x86_64
+libXrender.so.1 x86_64
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index 9f8b56567e0..939faa68e98 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,6 +1,7 @@
 # Template file for 'adobe-flash-plugin'
 pkgname=adobe-flash-plugin
 version=11.2.202.228
+revision=1
 # The EULA file
 _eula="http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf"
 _eulacksum=3cb0a5f4576be735abcff7189ed18eda17c70b762c3a78a3379b6f44395fbc10
@@ -10,7 +11,7 @@ if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	_distcksum=92c9758d347d05c284dcafccbc8370d8ba9a52f039ce1dbe558be66560476681
 else
 	_disttarball="${_url}/install_flash_player_11_linux.i386.tar.gz"
-	_distcksum=20a806eaf508aa8bf22d9803e94b9f942a548da87cd0a59712c7bcd1df0d44e6
+	_distcksum=dff9d475b3e8900e5c9a5d1d69ba766d0cdf9471217ef35c931ccefdf7b68246
 fi
 distfiles="${_eula} ${_disttarball}"
 checksum="${_eulacksum} ${_distcksum}"

From e41c5100df72a29387eaeb5620271991f805b350 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:37:27 -0600
Subject: [PATCH 02/24] brasero: bump api_depends, revbump

---
 srcpkgs/brasero/depends  | 2 +-
 srcpkgs/brasero/template | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/depends b/srcpkgs/brasero/depends
index 6e8d7e9a547..e7e77019f36 100644
--- a/srcpkgs/brasero/depends
+++ b/srcpkgs/brasero/depends
@@ -1,2 +1,2 @@
 abi_depends=">=2.91.90"
-api_depends="${abi_depends}"
+api_depends=">=3.4.0"
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 57126d9e321..a2efaa8b70a 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,6 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.4.0
+revision=1
 homepage="http://www.gnome.org/projects/brasero"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"

From 6e2cabbd7dd2aae611dc959fb6779ee3a38d7928 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:38:08 -0600
Subject: [PATCH 03/24] caribou: bump api_depends, revbump

---
 srcpkgs/caribou/depends  | 2 +-
 srcpkgs/caribou/template | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/caribou/depends b/srcpkgs/caribou/depends
index 7855591013a..ff533ec2ccb 100644
--- a/srcpkgs/caribou/depends
+++ b/srcpkgs/caribou/depends
@@ -1,2 +1,2 @@
 abi_depends=">=0.4.0"
-api_depends="${abi_depends}"
+api_depends=">=0.4.2"
diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
index 2645101978d..6e7522fd3fe 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -1,6 +1,7 @@
 # Template file for 'caribou'
 pkgname=caribou
 version=0.4.2
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static

From 72e65df1b7a8ed3c638217e0a8990e13b456a995 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:38:27 -0600
Subject: [PATCH 04/24] cheese: bump api_depends, revbump

---
 srcpkgs/cheese/depends  | 2 +-
 srcpkgs/cheese/template | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cheese/depends b/srcpkgs/cheese/depends
index ced6b7492ed..46f353795bf 100644
--- a/srcpkgs/cheese/depends
+++ b/srcpkgs/cheese/depends
@@ -1,2 +1,2 @@
 abi_depends=">=3.3.92"
-api_depends=">=3.3.92_1"
+api_depends=">=3.4.0"
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 5fcf5a7e6ea..c893b5c9e4e 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,7 @@
 # Template file for 'cheese'
 pkgname=cheese
 version=3.4.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile"

From 66713f980b218699f3b83628a4ed7f0c64c9b6b7 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:39:01 -0600
Subject: [PATCH 05/24] eog-plugins: revbump

---
 srcpkgs/eog-plugins/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 2b1dab8927f..e0412c785eb 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,7 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
 version=3.4.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="Eye of GNOME plugins"

From 06ab8e143eaa7f612deefac18f85020dc61aede6 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:39:30 -0600
Subject: [PATCH 06/24] evince: bump api_depends, revbump

---
 srcpkgs/evince/depends            | 2 +-
 srcpkgs/evince/libevince.template | 1 +
 srcpkgs/evince/template           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/evince/depends b/srcpkgs/evince/depends
index 88592da7496..46f353795bf 100644
--- a/srcpkgs/evince/depends
+++ b/srcpkgs/evince/depends
@@ -1,2 +1,2 @@
 abi_depends=">=3.3.92"
-api_depends="${abi_depends}"
+api_depends=">=3.4.0"
diff --git a/srcpkgs/evince/libevince.template b/srcpkgs/evince/libevince.template
index 1b2af0e1c8d..694646a88b7 100644
--- a/srcpkgs/evince/libevince.template
+++ b/srcpkgs/evince/libevince.template
@@ -1,5 +1,6 @@
 # Template file for 'libevince'.
 #
+revision=1
 short_desc="${short_desc} - runtime libraries"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index e225bd94cff..85f4f18b84c 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=3.4.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-introspection --disable-schemas-compile

From c80aabd4b71bbfc738af5b5203e7bbd3e2d6d072 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:39:59 -0600
Subject: [PATCH 07/24] file-roller: revbump

---
 srcpkgs/file-roller/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index f8cf29e9f8a..c8a63f80433 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,6 +1,7 @@
 # Template file for 'file-roller'
 pkgname=file-roller
 version=3.4.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --enable-magic

From 8171983c9c774a57dcdfcc3aeac74e0af9f6a099 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:41:12 -0600
Subject: [PATCH 08/24] gdm: remove libgmodule SONAME, revbump, bump
 api_depends

---
 srcpkgs/gdm/depends     | 2 +-
 srcpkgs/gdm/gdm.rshlibs | 1 -
 srcpkgs/gdm/template    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gdm/depends b/srcpkgs/gdm/depends
index d6ddca4b412..c5b6d2ac54d 100644
--- a/srcpkgs/gdm/depends
+++ b/srcpkgs/gdm/depends
@@ -1,2 +1,2 @@
 abi_depends=">=3.2.0"
-api_depends="${abi_depends}"
+api_depends=">=3.4.0.1"
diff --git a/srcpkgs/gdm/gdm.rshlibs b/srcpkgs/gdm/gdm.rshlibs
index a7e9cb41980..a78a33cd95a 100644
--- a/srcpkgs/gdm/gdm.rshlibs
+++ b/srcpkgs/gdm/gdm.rshlibs
@@ -29,4 +29,3 @@ librt.so.1
 libfontconfig.so.1
 libcanberra-gtk3.so.0
 libcanberra.so.0
-libgmodule-2.0.so.0
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index cd2a59f91ec..89ff76afc31 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=3.4.0.1
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-scrollkeeper

From 8ecd948e0670d35609d1a4bae953438b9ef7f6da Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:44:05 -0600
Subject: [PATCH 09/24] gnome-online-accounts: remove libgmodule-2.0.so.0,
 librt.so.1, revbump

---
 srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs | 2 --
 srcpkgs/gnome-online-accounts/template                      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs b/srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs
index ee966752686..09272c9fd2b 100644
--- a/srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs
+++ b/srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs
@@ -20,5 +20,3 @@ libsoup-gnome-2.4.so.1
 libsoup-2.4.so.1
 libnotify.so.4
 libjavascriptcoregtk-3.0.so.0
-libgmodule-2.0.so.0
-librt.so.1
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index fbeb6832109..184234faf13 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
 version=3.4.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-google --enable-twitter

From 20bc176beb0377c309df28f31646f9aab49a78d4 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:45:15 -0600
Subject: [PATCH 10/24] librsvg: remove libgmodule SONAME, revbump

---
 srcpkgs/librsvg/librsvg.rshlibs | 2 --
 srcpkgs/librsvg/template        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/librsvg/librsvg.rshlibs b/srcpkgs/librsvg/librsvg.rshlibs
index ff51a4ee3a1..71a6aa61586 100644
--- a/srcpkgs/librsvg/librsvg.rshlibs
+++ b/srcpkgs/librsvg/librsvg.rshlibs
@@ -19,5 +19,3 @@ libcroco-0.6.so.3
 libxml2.so.2
 libm.so.6
 libatk-1.0.so.0
-libgmodule-2.0.so.0
-librt.so.1
diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 04226413a37..a76390a08a3 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,7 +1,7 @@
 # Template build file for 'librsvg'.
 pkgname=librsvg
 version=2.36.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/2.36/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-introspection"

From 5c421e80f938245b53192abada897b10fed9f5b5 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 04:46:02 -0600
Subject: [PATCH 11/24] libwnck: revbump, bump api_depends

---
 srcpkgs/libwnck/depends  | 2 +-
 srcpkgs/libwnck/template | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck/depends b/srcpkgs/libwnck/depends
index 6e8d7e9a547..e7e77019f36 100644
--- a/srcpkgs/libwnck/depends
+++ b/srcpkgs/libwnck/depends
@@ -1,2 +1,2 @@
 abi_depends=">=2.91.90"
-api_depends="${abi_depends}"
+api_depends=">=3.4.0"
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index d74fa363f0b..2182d2011ca 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,6 +1,7 @@
 # Template build file for 'libwnck'.
 pkgname=libwnck
 version=3.4.0
+revision=1
 distfiles="${GNOME_SITE}/libwnck/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="Library for layout and rendering of text"

From 7184b2f057880ece7c220a1989e8617ece62bb3e Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:19:31 -0600
Subject: [PATCH 12/24] yelp: remove gmodule SONAME; revbump, bump api_depends

---
 srcpkgs/yelp/depends      | 2 +-
 srcpkgs/yelp/template     | 2 +-
 srcpkgs/yelp/yelp.rshlibs | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yelp/depends b/srcpkgs/yelp/depends
index 6e8d7e9a547..e7e77019f36 100644
--- a/srcpkgs/yelp/depends
+++ b/srcpkgs/yelp/depends
@@ -1,2 +1,2 @@
 abi_depends=">=2.91.90"
-api_depends="${abi_depends}"
+api_depends=">=3.4.0"
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 47ab8ab1435..58aa9c79d9a 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp'
 pkgname=yelp
 version=3.4.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
diff --git a/srcpkgs/yelp/yelp.rshlibs b/srcpkgs/yelp/yelp.rshlibs
index 6144fecd864..19fca92686a 100644
--- a/srcpkgs/yelp/yelp.rshlibs
+++ b/srcpkgs/yelp/yelp.rshlibs
@@ -24,5 +24,3 @@ libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
 libjavascriptcoregtk-3.0.so.0
-libgmodule-2.0.so.0
-librt.so.1

From 44511bed18fb1eeb9040297a5ca19791e16edcfd Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:20:04 -0600
Subject: [PATCH 13/24] notification-daemon: remove libpthread SONAME, revbump

---
 srcpkgs/notification-daemon/notification-daemon.rshlibs | 1 -
 srcpkgs/notification-daemon/template                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/notification-daemon/notification-daemon.rshlibs b/srcpkgs/notification-daemon/notification-daemon.rshlibs
index e1c2e5b7459..fb45fb78cb6 100644
--- a/srcpkgs/notification-daemon/notification-daemon.rshlibs
+++ b/srcpkgs/notification-daemon/notification-daemon.rshlibs
@@ -9,4 +9,3 @@ libgobject-2.0.so.0
 libglib-2.0.so.0
 libX11.so.6
 libc.so.6
-libpthread.so.0
diff --git a/srcpkgs/notification-daemon/template b/srcpkgs/notification-daemon/template
index 199d2a02f70..37106e91598 100644
--- a/srcpkgs/notification-daemon/template
+++ b/srcpkgs/notification-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'notification-daemon'
 pkgname=notification-daemon
 version=0.7.4
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"

From 1523f2cefa66efdabd51bbe946268644902d5a35 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:20:44 -0600
Subject: [PATCH 14/24] nautilus: remove gmodule/libpthread SONAME, revbump

---
 srcpkgs/nautilus/depends              | 2 +-
 srcpkgs/nautilus/libnautilus.rshlibs  | 3 ---
 srcpkgs/nautilus/libnautilus.template | 1 +
 srcpkgs/nautilus/template             | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/nautilus/depends b/srcpkgs/nautilus/depends
index 214cb4e13b8..b8f1f54cc60 100644
--- a/srcpkgs/nautilus/depends
+++ b/srcpkgs/nautilus/depends
@@ -1,2 +1,2 @@
 abi_depends=">=3.2.1"
-api_depends="${abi_depends}"
+api_depends=">=3.4.0"
diff --git a/srcpkgs/nautilus/libnautilus.rshlibs b/srcpkgs/nautilus/libnautilus.rshlibs
index a58c339663b..94b0e856475 100644
--- a/srcpkgs/nautilus/libnautilus.rshlibs
+++ b/srcpkgs/nautilus/libnautilus.rshlibs
@@ -11,6 +11,3 @@ libgobject-2.0.so.0
 libglib-2.0.so.0
 libm.so.6
 libc.so.6
-libgmodule-2.0.so.0
-librt.so.1
-libpthread.so.0
diff --git a/srcpkgs/nautilus/libnautilus.template b/srcpkgs/nautilus/libnautilus.template
index c64023fd683..77c06813598 100644
--- a/srcpkgs/nautilus/libnautilus.template
+++ b/srcpkgs/nautilus/libnautilus.template
@@ -1,5 +1,6 @@
 # Template file for 'libnautilus'.
 #
+revision=1
 short_desc="${sourcepkg} - shared libraries"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 6f3b4bee04e..1c6c49ba87f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,7 +1,7 @@
 # Template file for 'nautilus'
 pkgname=nautilus
 version=3.4.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-update-mimedb --disable-tracker

From e87ad269000b24254b83d5d707d6552c1580bfa9 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:21:26 -0600
Subject: [PATCH 15/24] nautilus-sendto: bump api_depends, revbump

---
 srcpkgs/nautilus-sendto/depends                        | 2 +-
 srcpkgs/nautilus-sendto/nautilus-sendto-devel.template | 1 +
 srcpkgs/nautilus-sendto/template                       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nautilus-sendto/depends b/srcpkgs/nautilus-sendto/depends
index 146f5503947..54d63056289 100644
--- a/srcpkgs/nautilus-sendto/depends
+++ b/srcpkgs/nautilus-sendto/depends
@@ -1,2 +1,2 @@
 abi_depends=">=3.0.2"
-api_depends="${abi_depends}"
+api_depends=">=3.0.2_1"
diff --git a/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template b/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
index f30cd4c44e9..bf000dd09c8 100644
--- a/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
+++ b/srcpkgs/nautilus-sendto/nautilus-sendto-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'nautilus-sendto-devel'.
 #
+revision=1
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
index 600246d16e1..4cc36a0b3b8 100644
--- a/srcpkgs/nautilus-sendto/template
+++ b/srcpkgs/nautilus-sendto/template
@@ -1,6 +1,7 @@
 # Template file for 'nautilus-sendto'
 pkgname=nautilus-sendto
 version=3.0.2
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"

From 8ccd6b883b1c4bcb0a85b40c1ad71dfb29b4c755 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:22:13 -0600
Subject: [PATCH 16/24] gnome-desktop: revert the rshlib thing

---
 srcpkgs/gnome-desktop/gnome-desktop.rshlibs | 2 --
 srcpkgs/gnome-desktop/template              | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-desktop/gnome-desktop.rshlibs b/srcpkgs/gnome-desktop/gnome-desktop.rshlibs
index b7772810a76..e5554bcca14 100644
--- a/srcpkgs/gnome-desktop/gnome-desktop.rshlibs
+++ b/srcpkgs/gnome-desktop/gnome-desktop.rshlibs
@@ -15,5 +15,3 @@ libglib-2.0.so.0
 libXrandr.so.2
 libXext.so.6
 libc.so.6
-libgmodule-2.0.so.0
-libpthread.so.0
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 9f721e45b21..3a77b725d9e 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
 version=3.4.0
-revision=1
+revision=2
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure

From a37fe7e418d8e1d9104acde24d6a1329def5587c Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:22:36 -0600
Subject: [PATCH 17/24] gnome-panel: revert the rshlib thing

---
 srcpkgs/gnome-panel/depends             | 2 +-
 srcpkgs/gnome-panel/gnome-panel.rshlibs | 1 -
 srcpkgs/gnome-panel/template            | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-panel/depends b/srcpkgs/gnome-panel/depends
index 88592da7496..46f353795bf 100644
--- a/srcpkgs/gnome-panel/depends
+++ b/srcpkgs/gnome-panel/depends
@@ -1,2 +1,2 @@
 abi_depends=">=3.3.92"
-api_depends="${abi_depends}"
+api_depends=">=3.4.0"
diff --git a/srcpkgs/gnome-panel/gnome-panel.rshlibs b/srcpkgs/gnome-panel/gnome-panel.rshlibs
index c4cdcfcd2d8..38a584c342e 100644
--- a/srcpkgs/gnome-panel/gnome-panel.rshlibs
+++ b/srcpkgs/gnome-panel/gnome-panel.rshlibs
@@ -31,4 +31,3 @@ libXau.so.6
 libecal-1.2.so.11
 libedataserver-1.2.so.16
 libpolkit-gobject-1.so.0
-librt.so.1
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index da49af08b3d..893dc370579 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
 version=3.4.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper

From 8dab32937aadb3dd4cac58809fbd34c652e1f4fd Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:22:58 -0600
Subject: [PATCH 18/24] gnome-power-manager: revbump to rebuild

---
 srcpkgs/gnome-power-manager/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 8151047f2cc..b96c3d3a843 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -1,6 +1,7 @@
 # Template file for 'gnome-power-manager'
 pkgname=gnome-power-manager
 version=3.4.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"

From bd29057c197cab51c011e6f56187271a47457ded Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:23:26 -0600
Subject: [PATCH 19/24] gnome-themes-standard: revert the rshlib thing

---
 srcpkgs/gnome-themes-standard/gnome-themes-standard.rshlibs | 3 ---
 srcpkgs/gnome-themes-standard/template                      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-themes-standard/gnome-themes-standard.rshlibs b/srcpkgs/gnome-themes-standard/gnome-themes-standard.rshlibs
index 106d25e3bab..3526f7053a1 100644
--- a/srcpkgs/gnome-themes-standard/gnome-themes-standard.rshlibs
+++ b/srcpkgs/gnome-themes-standard/gnome-themes-standard.rshlibs
@@ -12,6 +12,3 @@ libcairo.so.2
 libgobject-2.0.so.0
 libglib-2.0.so.0
 libc.so.6
-libgmodule-2.0.so.0
-librt.so.1
-libpthread.so.0
diff --git a/srcpkgs/gnome-themes-standard/template b/srcpkgs/gnome-themes-standard/template
index a64972227ed..e09114ccc44 100644
--- a/srcpkgs/gnome-themes-standard/template
+++ b/srcpkgs/gnome-themes-standard/template
@@ -1,7 +1,7 @@
 # Template build file for 'gnome-themes-standard'.
 pkgname=gnome-themes-standard
 version=3.4.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="Standard gnome themes"

From e6f6ed00128758fe463c2ab7e0ad2db1745b783f Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:23:48 -0600
Subject: [PATCH 20/24] gtkmm: revert the rshlib thing

---
 srcpkgs/gtkmm/depends       | 2 +-
 srcpkgs/gtkmm/gtkmm.rshlibs | 2 --
 srcpkgs/gtkmm/template      | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtkmm/depends b/srcpkgs/gtkmm/depends
index ca4ae8296c4..a360f3fcebc 100644
--- a/srcpkgs/gtkmm/depends
+++ b/srcpkgs/gtkmm/depends
@@ -1,2 +1,2 @@
 abi_depends=">=2.99.5"
-api_depends="${abi_depends}"
+api_depends=">=3.3.20"
diff --git a/srcpkgs/gtkmm/gtkmm.rshlibs b/srcpkgs/gtkmm/gtkmm.rshlibs
index a20094aa4f5..0d0bb43de0f 100644
--- a/srcpkgs/gtkmm/gtkmm.rshlibs
+++ b/srcpkgs/gtkmm/gtkmm.rshlibs
@@ -8,13 +8,11 @@ libgio-2.0.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
 libpango-1.0.so.0
-libgmodule-2.0.so.0
 libcairomm-1.0.so.1
 libcairo.so.2
 libsigc-2.0.so.0
 libgdk_pixbuf-2.0.so.0
 libgobject-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libstdc++.so.6
 libm.so.6
diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index 9921e0f25a7..d847167c418 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,6 +1,7 @@
 # Template build file for 'gtkmm'.
 pkgname=gtkmm
 version=3.3.20
+revision=1
 distfiles="${GNOME_SITE}/gtkmm/3.3/gtkmm-$version.tar.xz"
 build_style=gnu-configure
 short_desc="C++ bindings for The GTK+ toolkit (v2)"

From 97117f0f20e383831c5a1afb687138d91d24124f Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:24:13 -0600
Subject: [PATCH 21/24] gtksourceview: bump api_depends, revbump

---
 srcpkgs/gtksourceview/depends  | 2 +-
 srcpkgs/gtksourceview/template | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gtksourceview/depends b/srcpkgs/gtksourceview/depends
index ab0d9627ad7..adf49ba812c 100644
--- a/srcpkgs/gtksourceview/depends
+++ b/srcpkgs/gtksourceview/depends
@@ -1,2 +1,2 @@
 abi_depends=">=3.0.0"
-api_depends="${abi_depends}"
+api_depends=">=3.4.0"
diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template
index 96f11c83de7..829b1d25d0a 100644
--- a/srcpkgs/gtksourceview/template
+++ b/srcpkgs/gtksourceview/template
@@ -1,6 +1,7 @@
 # Template file for 'gtksourceview'
 pkgname=gtksourceview
 version=3.4.0
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"

From 7f57ec0c403b5fe72cce4705760da80c9e26f8b7 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:24:34 -0600
Subject: [PATCH 22/24] libgnomekbd: revert the rshlib thing

---
 srcpkgs/libgnomekbd/depends             | 2 +-
 srcpkgs/libgnomekbd/libgnomekbd.rshlibs | 2 --
 srcpkgs/libgnomekbd/template            | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libgnomekbd/depends b/srcpkgs/libgnomekbd/depends
index e7e77019f36..95f6a615e7e 100644
--- a/srcpkgs/libgnomekbd/depends
+++ b/srcpkgs/libgnomekbd/depends
@@ -1,2 +1,2 @@
 abi_depends=">=2.91.90"
-api_depends=">=3.4.0"
+api_depends=">=3.4.0.2_2"
diff --git a/srcpkgs/libgnomekbd/libgnomekbd.rshlibs b/srcpkgs/libgnomekbd/libgnomekbd.rshlibs
index 4a28ec0d708..77ce26d56e1 100644
--- a/srcpkgs/libgnomekbd/libgnomekbd.rshlibs
+++ b/srcpkgs/libgnomekbd/libgnomekbd.rshlibs
@@ -14,5 +14,3 @@ libc.so.6
 libgtk-3.so.0
 libatk-1.0.so.0
 libm.so.6
-libgmodule-2.0.so.0
-librt.so.1
diff --git a/srcpkgs/libgnomekbd/template b/srcpkgs/libgnomekbd/template
index d2d059150fb..eb3ea34ead7 100644
--- a/srcpkgs/libgnomekbd/template
+++ b/srcpkgs/libgnomekbd/template
@@ -1,7 +1,7 @@
 # Template file for 'libgnomekbd'
 pkgname=libgnomekbd
 version=3.4.0.2
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"

From d0ea1d915d61208ac43f8804650d190a4a2ae8d5 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:24:55 -0600
Subject: [PATCH 23/24] metacity: revert the rshlib thing

---
 srcpkgs/metacity/depends          | 2 +-
 srcpkgs/metacity/metacity.rshlibs | 1 -
 srcpkgs/metacity/template         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/metacity/depends b/srcpkgs/metacity/depends
index e709dcbad4e..5a050260747 100644
--- a/srcpkgs/metacity/depends
+++ b/srcpkgs/metacity/depends
@@ -1,2 +1,2 @@
 abi_depends=">=2.30.1"
-api_depends="${abi_depends}"
+api_depends=">=2.34.3_2"
diff --git a/srcpkgs/metacity/metacity.rshlibs b/srcpkgs/metacity/metacity.rshlibs
index 74929a4a483..82905f82f9b 100644
--- a/srcpkgs/metacity/metacity.rshlibs
+++ b/srcpkgs/metacity/metacity.rshlibs
@@ -31,4 +31,3 @@ libpangoft2-1.0.so.0
 libfreetype.so.6
 libfontconfig.so.1
 librt.so.1
-libgmodule-2.0.so.0
diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template
index 7f679b341e1..2828e868c11 100644
--- a/srcpkgs/metacity/template
+++ b/srcpkgs/metacity/template
@@ -1,7 +1,7 @@
 # Template file for 'metacity'
 pkgname=metacity
 version=2.34.3
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --disable-scrollkeeper"

From 312c7f0ef0c75aca19270a18c296dbacdcf06252 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 29 Mar 2012 05:25:22 -0600
Subject: [PATCH 24/24] xbmc: -ld-linux.so.2

---
 srcpkgs/xbmc/xbmc.rshlibs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/xbmc/xbmc.rshlibs b/srcpkgs/xbmc/xbmc.rshlibs
index c858d20cdc3..acf1b3345e2 100644
--- a/srcpkgs/xbmc/xbmc.rshlibs
+++ b/srcpkgs/xbmc/xbmc.rshlibs
@@ -39,7 +39,6 @@ libXmu.so.6
 libcdio.so.13
 libcrypto.so.1
 libpython2.7.so.1.0
-ld-linux.so.2
 libavcodec.so.53
 libyajl.so.2
 libbluetooth.so.3