Changed $replaces to accept pkg patterns, like Add_dependency().

Changed all packages using $replaces to the new format and bump the revision. Require XBPS utils >= 20100121 for this to work. --HG-- extra : convert_revision : 7593b3cb7465f7613f48aba0f2e86cdcd5430ac0
2010-01-21 03:33:26 +01:00 · 2010-01-21 03:33:26 +01:00 · 0da86577ab
parent 8a50cd385f
commit 0da86577ab
20 changed files with 37 additions and 43 deletions
--- a/srcpkgs/gcc/libgcc.template
+++ b/srcpkgs/gcc/libgcc.template
@ -5,8 +5,8 @@ long_desc="${long_desc}

 This package contains the GCC shared library."

-replaces="gcc-libgcc"
-revision=1
+replaces="gcc-libgcc>=0"
+revision=2

 do_install()
 {
--- a/srcpkgs/gcc/libgomp.template
+++ b/srcpkgs/gcc/libgomp.template
@ -9,8 +9,8 @@ long_desc="${long_desc}
 Add_dependency run glibc
 Add_dependency run libgcc

-replaces="gcc-libgomp"
-revision=1
+replaces="gcc-libgomp>=0"
+revision=2

 do_install()
 {
--- a/srcpkgs/gcc/libmudflap-devel.template
+++ b/srcpkgs/gcc/libmudflap-devel.template
@ -8,8 +8,8 @@ long_desc="${long_desc}

 Add_dependency run libmudflap

-replaces="gcc-libmudflap-devel"
-revision=1
+replaces="gcc-libmudflap-devel>=0"
+revision=2

 do_install()
 {
--- a/srcpkgs/gcc/libmudflap.template
+++ b/srcpkgs/gcc/libmudflap.template
@ -9,8 +9,8 @@ long_desc="${long_desc}
 Add_dependency run glibc
 Add_dependency run libgcc

-replaces="gcc-libmudflap"
-revision=1
+replaces="gcc-libmudflap>=0"
+revision=2

 do_install()
 {
--- a/srcpkgs/gcc/libobjc-devel.template
+++ b/srcpkgs/gcc/libobjc-devel.template
@ -8,8 +8,8 @@ long_desc="${long_desc}

 Add_dependency run libobjc

-replaces="gcc-libobjc-devel"
-revision=1
+replaces="gcc-libobjc-devel>=0"
+revision=2

 do_install()
 {
--- a/srcpkgs/gcc/libobjc.template
+++ b/srcpkgs/gcc/libobjc.template
@ -9,8 +9,8 @@ long_desc="${long_desc}
 Add_dependency run glibc
 Add_dependency run libgcc

-replaces="gcc-libobjc"
-revision=1
+replaces="gcc-libobjc>=0"
+revision=2

 do_install()
 {
--- a/srcpkgs/gcc/libstdc++-devel.template
+++ b/srcpkgs/gcc/libstdc++-devel.template
@ -8,8 +8,8 @@ long_desc="${long_desc}

 Add_dependency run libstdc++

-replaces="gcc-libstdc++-devel"
-revision=1
+replaces="gcc-libstdc++-devel>=0"
+revision=2

 do_install()
 {
--- a/srcpkgs/gcc/libstdc++.template
+++ b/srcpkgs/gcc/libstdc++.template
@ -9,8 +9,8 @@ long_desc="${long_desc}
 Add_dependency run glibc
 Add_dependency run libgcc

-replaces="gcc-libstdc++"
-revision=1
+replaces="gcc-libstdc++>=0"
+revision=2

 do_install()
 {
--- a/srcpkgs/libtool/libltdl.template
+++ b/srcpkgs/libtool/libltdl.template
@ -10,7 +10,8 @@ long_desc="
 system-installed ltdl libraries; they are not needed by software built using the
 rest of the GNU Autotools (including GNU Autoconf and GNU Automake)."

-replaces="libtool-ltdl"
+revision=1
+replaces="libtool-ltdl>=0"
 Add_dependency run glibc
 
 do_install()
--- a/srcpkgs/lvm2/device-mapper.template
+++ b/srcpkgs/lvm2/device-mapper.template
@ -5,8 +5,8 @@ long_desc="
 This package contains the supporting userspace utility, dmsetup,
 for the kernel device-mapper and its required library, libdevmapper."

-replaces="lvm2-device-mapper"
-revision=3
+replaces="lvm2-device-mapper>=0"
+revision=4

 Add_dependency run glibc
 Add_dependency run readline
--- a/srcpkgs/polkit/polkit-devel.template
+++ b/srcpkgs/polkit/polkit-devel.template
@ -5,7 +5,8 @@ long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-replaces="PolicyKit-devel"
+revision=1
+replaces="PolicyKit-devel>=0"

 Add_dependency run pkg-config
 Add_dependency run gobject-introspection-devel
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@ -1,6 +1,7 @@
 # Template file for 'polkit'
 pkgname=polkit
 version=0.96
+revision=1
 distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-static --localstatedir=/var --with-os-type=gentoo"
@ -15,7 +16,7 @@ long_desc="
 to granting access to privileged operations (like calling the HAL Mount()
 method) for unprivileged (desktop) applications."

-replaces="PolicyKit"
+replaces="PolicyKit>=0"
 subpackages="$pkgname-devel"
 Add_dependency run glib
 Add_dependency run glibc
--- a/srcpkgs/udev/libgudev-devel.template
+++ b/srcpkgs/udev/libgudev-devel.template
@ -6,8 +6,8 @@ long_desc="${long_desc}
 This package contains the libgudev development files (static libs, headers,
 etc), a library to interact with udev through the GLib bindings."

-revision=1
-replaces="udev-glib-devel"
+revision=2
+replaces="udev-glib-devel>=0"

 Add_dependency run libudev-devel
 Add_dependency run glib-devel
--- a/srcpkgs/udev/libgudev.template
+++ b/srcpkgs/udev/libgudev.template
@ -6,8 +6,8 @@ long_desc="${long_desc}
 This package contains libgudev, a library to interact with udev through
 the GLib bindings."

-revision=1
-replaces="udev-glib"
+revision=2
+replaces="udev-glib>=0"

 Add_dependency run udev
 Add_dependency run glib
--- a/srcpkgs/udev/libudev-devel.template
+++ b/srcpkgs/udev/libudev-devel.template
@ -6,7 +6,8 @@ long_desc="${long_desc}
 This package contains the files needed for developing applications
 that use libudev."

-replaces="udev-devel"
+revision=1
+replaces="udev-devel>=0"

 Add_dependency run glibc-devel
 Add_dependency run libudev
--- a/srcpkgs/xorg-apps/template
+++ b/srcpkgs/xorg-apps/template
@ -8,7 +8,8 @@ long_desc="
 This is the Xorg applications meta-package for installing various
 applications from the modular Xorg project."

-replaces="xorg-server-utils"
+revision=1
+replaces="xorg-server-utils>=0"
 noarch=yes

 Add_dependency full iceauth	">=1.0.3"
--- a/srcpkgs/xz/template
+++ b/srcpkgs/xz/template
@ -1,7 +1,7 @@
 # Template file for 'xz'
 pkgname=xz
 version=4.999.9
-revision=1
+revision=2
 wrksrc=${pkgname}-${version}beta
 distfiles="http://tukaani.org/xz/xz-${version}beta.tar.bz2"
 build_style=gnu_configure
@ -32,7 +32,7 @@ long_desc="
  * A few shell scripts make diffing and grepping LZMA compressed
    files easy. The scripts were adapted from gzip and bzip2."

-replaces="lzma-utils lzma-utils-libs"
+replaces="lzma-utils>=0 lzma-utils-libs>=0"
 subpackages="xz-devel"
 Add_dependency run glibc
 Add_dependency run libstdc++
--- a/srcpkgs/xz/xz-devel.template
+++ b/srcpkgs/xz/xz-devel.template
@ -5,8 +5,8 @@ long_desc="${long_desc}

 This package contains files for development, headers, static libs, etc."

-replaces="lzma-utils-devel"
-revision=1
+replaces="lzma-utils-devel>=0"
+revision=2

 Add_dependency run glibc-devel
 Add_dependency run libstdc++-devel
--- a/xbps-src/shutils/pkgtarget_funcs.sh.in
+++ b/xbps-src/shutils/pkgtarget_funcs.sh.in
@ -121,17 +121,6 @@ install_pkg_with_binpkg()
 {
 	local pkgpattern="$1"

-	#
-	# Check that installed xbps utils version is recent enough.
-	#
-	instver=$(${XBPS_BIN_CMD} -V)
-	${XBPS_CMPVER_CMD} "${instver}" "20100114"
-	if [ $? -eq 255 ]; then
-		echo -n "Your xbps utilities are too old, "
-		echo "required version: 20100114"
-		return 1
-	fi
-
 	msg_normal "Installing binary pkg: $pkgpattern"
 	${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} \
 		-y install "$pkgpattern"
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@ -33,7 +33,7 @@ trap "echo && exit 1" INT QUIT
 : ${sudo_cmd:=sudo}
 : ${chroot_cmd:=chroot}
 : ${xbps_machine:=$(uname -m)}
-: ${XBPS_UTILS_REQVER:=20091124-1}
+: ${XBPS_UTILS_REQVER:=20100121}

 usage()
 {