Merge remote-tracking branch 'dave/master'

* dave/master: (24 commits) xbmc: -ld-linux.so.2 metacity: revert the rshlib thing libgnomekbd: revert the rshlib thing gtksourceview: bump api_depends, revbump gtkmm: revert the rshlib thing gnome-themes-standard: revert the rshlib thing gnome-power-manager: revbump to rebuild gnome-panel: revert the rshlib thing gnome-desktop: revert the rshlib thing nautilus-sendto: bump api_depends, revbump nautilus: remove gmodule/libpthread SONAME, revbump notification-daemon: remove libpthread SONAME, revbump yelp: remove gmodule SONAME; revbump, bump api_depends libwnck: revbump, bump api_depends librsvg: remove libgmodule SONAME, revbump gnome-online-accounts: remove libgmodule-2.0.so.0, librt.so.1, revbump gdm: remove libgmodule SONAME, revbump, bump api_depends file-roller: revbump evince: bump api_depends, revbump eog-plugins: revbump ...
2012-03-29 15:36:46 +02:00 · 2012-03-29 15:36:46 +02:00 · 7665e8b2db
commit 7665e8b2db
parent 6a61184b4e 312c7f0ef0
54 changed files with 44 additions and 52 deletions
--- 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
--- 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}"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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}

--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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"
--- 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
--- 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"
--- 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"
--- 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
--- 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)"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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}

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

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