Merge remote-tracking branch 'x/master'

* x/master:
  network-manager-applet: libnm SONAME is x86_64 specific.
  mpeg4ip: libm SONAME is x86_64 specific.
  enca: libm SONAME is x86_64 specific.
  xbps-src: added an optional arg to rshlibs, to make SONAME arch specific.
  lcms: needs jpeg rundep, revbump.
  libcdio: needs pkg-config for CDDB support, revbump.
  libgsf: add missing GConf-devel builddep, updated shlibs, revbump.
  libsamplerate: enable fftw and sndfile support, revbump.
  libvdpau: add missing dri2proto builddep, revbump.
  tracker: add missing libexif support, revbump.
  vino: add missing libXtst-devel builddep, revbump.
  rygel: build the preferences ui, revbump.
  nautilus-sendto: dbus-glib-devel is required for some plugins, revbump.
  libmpeg2: added missing builddeps for mpeg2dec.

srcpkgs/enca/enca.rshlibs

@@ -1,4 +1,4 @@
 librecode.so.0
 libenca.so.0
-libm.so.6
+libm.so.6	x86_64
 libc.so.6

srcpkgs/lcms/lcms.rshlibs

@@ -1,3 +1,4 @@
 libm.so.6
 libc.so.6
 libtiff.so.3
+libjpeg.so.8

srcpkgs/lcms/template

@@ -1,7 +1,7 @@
 # Template build file for 'lcms'.
 pkgname=lcms
 version=1.19
-revision=3
+revision=4
 wrksrc=${pkgname}-${version%[a-z]*}
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure

srcpkgs/libcdio/libcdio.rshlibs

@@ -3,3 +3,4 @@ libncursesw.so.6
 libm.so.6
 libstdc++.so.6
 libgcc_s.so.1
+libcddb.so.2

srcpkgs/libcdio/template

@@ -1,7 +1,7 @@
 # Template file for 'libcdio'
 pkgname=libcdio
 version=0.82
-revision=5
+revision=6
 distfiles="http://ftp.gnu.org/gnu/libcdio/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="CD-ROM access library"
@@ -17,5 +17,6 @@ long_desc="
  disc images as though they were CDs."
 
 subpackages="$pkgname-devel"
+Add_dependency build pkg-config
 Add_dependency build ncurses-devel
 Add_dependency build libcddb-devel

srcpkgs/libgsf/libgsf.rshlibs

@@ -9,3 +9,4 @@ libgio-2.0.so.0
 libgmodule-2.0.so.0
 libgthread-2.0.so.0
 librt.so.1
+libgdk_pixbuf-2.0.so.0

srcpkgs/libgsf/template

@@ -4,8 +4,8 @@ version=1.14.20
 distfiles="${GNOME_SITE}/libgsf/1.14/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-schemas-install
- --without-gnome-vfs --without-bonobo"
+--without-gnome-vfs --without-bonobo"
-revision=2
+revision=3
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=df82cd86e472a6f8e566976eb7eb8f587aac2639c1448b14b4dbf4db7da1ada6
@@ -26,4 +26,5 @@ Add_dependency build glibc-devel
 Add_dependency build zlib-devel
 Add_dependency build bzip2-devel
 Add_dependency build gdk-pixbuf-devel
+Add_dependency build GConf-devel
 Add_dependency build pygtk-devel

srcpkgs/libmp4v2/mpeg4ip.rshlibs

@@ -2,4 +2,4 @@ libmp4v2.so.1
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
-libm.so.6
+libm.so.6	x86_64

srcpkgs/libmpeg2/mpeg2dec.rshlibs

@@ -1,3 +1,8 @@
 libmpeg2.so.0
 libmpeg2convert.so.0
 libc.so.6
+libXext.so.6
+libX11.so.6
+libXv.so.1
+libSDL-1.2.so.0
+libpthread.so.0

srcpkgs/libmpeg2/mpeg2dec.template

@@ -5,7 +5,7 @@ long_desc="
  Simple libmpeg2 application which can decode and play ES, PS, and TS
  video streams. Includes extract_mpeg2 demuxer and various output drivers." 
 
-revision=3
+revision=4
 
 do_install()
 {

srcpkgs/libmpeg2/template

@@ -14,8 +14,7 @@ long_desc="
 
 subpackages="$pkgname-devel mpeg2dec"
 Add_dependency build pkg-config
-Add_dependency build libICE
+Add_dependency build libX11-devel
-Add_dependency build libSM
+Add_dependency build libXext-devel
-Add_dependency build libX11
+Add_dependency build libXv-devel
-Add_dependency build libXext
+Add_dependency build SDL-devel
-Add_dependency build libXv

srcpkgs/libsamplerate/libsamplerate.rshlibs

@@ -1,2 +1,3 @@
 libm.so.6
 libc.so.6
+libsndfile.so.1

srcpkgs/libsamplerate/template

@@ -1,7 +1,7 @@
 # Template file for 'libsamplerate'
 pkgname=libsamplerate
 version=0.1.7
-revision=3
+revision=4
 distfiles="http://www.mega-nerd.com/SRC/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="CFLAGS=-fPIC"
@@ -19,4 +19,6 @@ long_desc="
  slowing down effects."
 
 subpackages="$pkgname-devel"
+Add_dependency build pkg-config
 Add_dependency build libsndfile-devel
+Add_dependency build fftw-devel

srcpkgs/libvdpau/libvdpau.rshlibs

@@ -3,3 +3,4 @@ libc.so.6
 libstdc++.so.6
 libm.so.6
 libgcc_s.so.1
+libXext.so.6

srcpkgs/libvdpau/template

@@ -1,7 +1,7 @@
 # Template file for 'libvdpau'
 pkgname=libvdpau
 version=0.4.1
-revision=2
+revision=3
 distfiles="http://people.freedesktop.org/~aplattner/vdpau/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="The Video Decode and Presentation API for UNIX"
@@ -18,11 +18,10 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency run libXext
-
 Add_dependency build pkg-config
-Add_dependency build libXext-devel
+Add_dependency build dri2proto
 Add_dependency build libX11-devel
+Add_dependency build libXext-devel
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}

srcpkgs/nautilus-sendto/nautilus-sendto.rshlibs

@@ -34,3 +34,5 @@ libc.so.6
 libgupnp-1.0.so.4
 libgssdp-1.0.so.3
 libnautilus-extension.so.1
+libdbus-glib-1.so.2
+libdbus-1.so.3

srcpkgs/nautilus-sendto/template

@@ -1,7 +1,7 @@
 # Template file for 'nautilus-sendto'
 pkgname=nautilus-sendto
 version=3.0.1
-revision=4
+revision=5
 distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
@@ -24,6 +24,7 @@ subpackages="${pkgname}-devel"
 # XXX: add pidgin and gajim depends for plugins to work.
 Add_dependency build pkg-config
 Add_dependency build intltool
+Add_dependency build dbus-glib-devel
 Add_dependency build evolution-data-server-devel
 Add_dependency build GConf-devel
 Add_dependency build gupnp-devel

srcpkgs/network-manager-applet/network-manager-applet.rshlibs

@@ -26,5 +26,5 @@ libgthread-2.0.so.0
 librt.so.1
 libglib-2.0.so.0
 libc.so.6
-libm.so.6
+libm.so.6		x86_64
 libnotify.so.4

srcpkgs/rygel/rygel.rshlibs

@@ -20,3 +20,4 @@ librt.so.1
 libgsttag-0.10.so.0
 libgstapp-0.10.so.0
 libsqlite3.so.0
+libgtk-3.so.0

srcpkgs/rygel/template

@@ -1,7 +1,7 @@
 # Template file for 'rygel'
 pkgname=rygel
 version=0.12.4
-revision=3
+revision=4
 distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-gst-launch-plugin"
@@ -28,6 +28,7 @@ Add_dependency full desktop-file-utils
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build vala-devel
+Add_dependency build gtk+3-devel
 Add_dependency build libgee-devel
 Add_dependency build gssdp-devel	">=0.12.0"
 Add_dependency build gupnp-av-devel

srcpkgs/tracker/libtracker.rshlibs

@@ -20,3 +20,4 @@ libnm-glib.so.4
 libdbus-glib-1.so.2
 libdbus-1.so.3
 libpthread.so.0
+libexif.so.12

srcpkgs/tracker/libtracker.template

@@ -1,6 +1,6 @@
 # Template file for 'libtracker'.
 #
-revision=2
+revision=3
 short_desc="${short_desc} - shared libraries"
 long_desc="${long_desc}
 

srcpkgs/tracker/template

@@ -6,7 +6,7 @@ distfiles="${GNOME_SITE}/$pkgname/0.12/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests
 --disable-static"
-revision=2
+revision=3
 short_desc="Personal search tool and storage system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -42,3 +42,4 @@ Add_dependency build taglib-devel
 Add_dependency build giflib-devel
 Add_dependency build totem-pl-parser-devel
 Add_dependency build gupnp-dlna-devel
+Add_dependency build libexif-devel

srcpkgs/tracker/tracker.rshlibs

@@ -53,3 +53,4 @@ libupower-glib.so.1
 librest-0.7.so.0
 libpanel-applet-4.so.0
 libgee.so.2
+libexif.so.12

srcpkgs/vino/template

@@ -4,6 +4,7 @@ version=3.2.2
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
+revision=1
 short_desc="VNC server for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -22,3 +23,4 @@ Add_dependency build libnotify-devel
 Add_dependency build avahi-glib-libs-devel
 Add_dependency build telepathy-glib-devel
 Add_dependency build libsoup-devel
+Add_dependency build libXtst-devel

srcpkgs/vino/vino.rshlibs

@@ -24,3 +24,4 @@ libXext.so.6
 libXdamage.so.1
 libXfixes.so.3
 libz.so.1
+libXtst.so.6

xbps-src/shutils/verify_rundeps.sh

@@ -154,7 +154,7 @@ verify_rundeps()
 	#
 	# Update package's rshlibs file.
 	#
-	unset broken
+	unset broken f
 	msg_normal "$pkgver: updating rshlibs file...\n"
 	rsonamef=${XBPS_SRCPKGDIR}/${pkgname}/${pkgname}.rshlibs
 	if [ ! -f $rsonamef ]; then
@@ -173,12 +173,16 @@ verify_rundeps()
 				broken=1
 			fi
 		done
+		unset f
 		exec 3<&0 # save stdin
 		exec < $rsonamef
 		# now check if any soname in the rshlibs file is unnecessary.
 		while read f; do
+			local _soname=$(echo "$f"|awk '{print $1}')
+			local _soname_arch=$(echo "$f"|awk '{print $2}')
+
 			for j in ${soname_list}; do
-				if [ "$f" = "$j" ]; then
+				if [ "${_soname}" = "$j" ]; then
 					found=1
 					continue
 				fi
@@ -187,15 +191,22 @@ verify_rundeps()
 				unset found
 				continue
 			fi
+			# Sometimes a required SONAME is arch dependent, so
+			# ignore it in such case.
+			if [ -n "${_soname_arch}" -a "${_soname_arch}" != "$XBPS_MACHINE" ]; then
+				continue
+			fi
+
 			# If SONAME is arch specific, only remove it if
 			# matching on the target arch.
-			soname_arch=$(grep "$f" $maplib|awk '{print $4}')
+			_soname_arch=$(grep "$f" $maplib|awk '{print $4}')
-			if [ -z "$soname_arch" ] || \
+			if [ -z "${_soname_arch}" ] || \
-			   [ -n "$soname_arch" -a "$soname_arch" = "$XBPS_MACHINE" ]; then
+			   [ -n "${_soname_arch}" -a "${_soname_arch}" = "$XBPS_MACHINE" ]; then
 				echo "   SONAME: $f (removed, not required)"
-				sed -i "/^${f}$/d" $rsonamef
+				sed -i "/^${_soname}$/d" $rsonamef
 				broken=1
 			fi
+			unset _soname _soname_arch
 		done
 		exec 0<&3 # restore stdin
 	fi

xbps-src/xbps-src.sh.in

@@ -23,7 +23,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #-
-readonly XBPS_SRC_BUILD_VERSION=20111115-2
+readonly XBPS_SRC_BUILD_VERSION=20111116
 XBPS_CONFIG_FILE=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf
 
 PROGNAME=$(basename $0)