From 0da86577aba6481ebaf4ba0c04229619671fca34 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 21 Jan 2010 03:33:26 +0100 Subject: [PATCH] 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 --- srcpkgs/gcc/libgcc.template | 4 ++-- srcpkgs/gcc/libgomp.template | 4 ++-- srcpkgs/gcc/libmudflap-devel.template | 4 ++-- srcpkgs/gcc/libmudflap.template | 4 ++-- srcpkgs/gcc/libobjc-devel.template | 4 ++-- srcpkgs/gcc/libobjc.template | 4 ++-- srcpkgs/gcc/libstdc++-devel.template | 4 ++-- srcpkgs/gcc/libstdc++.template | 4 ++-- srcpkgs/libtool/libltdl.template | 3 ++- srcpkgs/lvm2/device-mapper.template | 4 ++-- srcpkgs/polkit/polkit-devel.template | 3 ++- srcpkgs/polkit/template | 3 ++- srcpkgs/udev/libgudev-devel.template | 4 ++-- srcpkgs/udev/libgudev.template | 4 ++-- srcpkgs/udev/libudev-devel.template | 3 ++- srcpkgs/xorg-apps/template | 3 ++- srcpkgs/xz/template | 4 ++-- srcpkgs/xz/xz-devel.template | 4 ++-- xbps-src/shutils/pkgtarget_funcs.sh.in | 11 ----------- xbps-src/xbps-src.sh.in | 2 +- 20 files changed, 37 insertions(+), 43 deletions(-) diff --git a/srcpkgs/gcc/libgcc.template b/srcpkgs/gcc/libgcc.template index 01aa4ed7b73..5efdc1f01a2 100644 --- 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() { diff --git a/srcpkgs/gcc/libgomp.template b/srcpkgs/gcc/libgomp.template index 650c03e82f7..fad96f00b1e 100644 --- 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() { diff --git a/srcpkgs/gcc/libmudflap-devel.template b/srcpkgs/gcc/libmudflap-devel.template index c79b03a710b..c9de916dac5 100644 --- 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() { diff --git a/srcpkgs/gcc/libmudflap.template b/srcpkgs/gcc/libmudflap.template index 665f996303c..5025e140d4d 100644 --- 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() { diff --git a/srcpkgs/gcc/libobjc-devel.template b/srcpkgs/gcc/libobjc-devel.template index 16bce1489d4..44d62342c6d 100644 --- 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() { diff --git a/srcpkgs/gcc/libobjc.template b/srcpkgs/gcc/libobjc.template index 0c0dffe9fd5..3763e4b4e5d 100644 --- 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() { diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template index e444be524b3..f38ea557f59 100644 --- 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() { diff --git a/srcpkgs/gcc/libstdc++.template b/srcpkgs/gcc/libstdc++.template index 04eb79e8f3a..b46c23d4a67 100644 --- 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() { diff --git a/srcpkgs/libtool/libltdl.template b/srcpkgs/libtool/libltdl.template index 200911f45f3..55a2395c378 100644 --- 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() diff --git a/srcpkgs/lvm2/device-mapper.template b/srcpkgs/lvm2/device-mapper.template index 5841999400c..56b9a187c27 100644 --- 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 diff --git a/srcpkgs/polkit/polkit-devel.template b/srcpkgs/polkit/polkit-devel.template index 73bac85e328..1a5629e1efd 100644 --- 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 diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index a14763aae68..22945c1d847 100644 --- 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 diff --git a/srcpkgs/udev/libgudev-devel.template b/srcpkgs/udev/libgudev-devel.template index 719dbfd3a5f..57645fadc7d 100644 --- 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 diff --git a/srcpkgs/udev/libgudev.template b/srcpkgs/udev/libgudev.template index 7f655d29e9d..f2faba664cd 100644 --- 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 diff --git a/srcpkgs/udev/libudev-devel.template b/srcpkgs/udev/libudev-devel.template index 67635959743..686d67bf325 100644 --- 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 diff --git a/srcpkgs/xorg-apps/template b/srcpkgs/xorg-apps/template index 3c55c496c6d..96a0054a502 100644 --- 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" diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template index a57f8f6897f..b6c709c5b1e 100644 --- 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++ diff --git a/srcpkgs/xz/xz-devel.template b/srcpkgs/xz/xz-devel.template index d6348c48680..f669f6dd733 100644 --- 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 diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in index 88a23c75790..1cdbff065c9 100644 --- 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" diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in index 4a52686b3ab..8f56c9b49b5 100644 --- 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() {