Added support for extended pkgdep version matching.

xbps from launchpad head branch has gained support for extended
pkg version matching, as specified in:

https://blueprints.launchpad.net/xbps/+spec/improved-version-matching

Now it's required to specify the operator(s) for required versions
in the depends files and "Add_dependency" option in build templates.

xbps-src now requires xbps utils 20091107.

--HG--
extra : convert_revision : fc09fa707483a75e0b6f68445721fc1a9166cdad

templates/ConsoleKit/depends

@@ -1,2 +1,2 @@
-abi_depends=0.3.0
-api_depends=${abi_depends}
+abi_depends=">=0.3.0"
+api_depends="${abi_depends}"

templates/GConf/depends

@@ -1,2 +1,2 @@
-abi_depends=2.26.1
-api_depends=${abi_depends}
+abi_depends=">=2.26.1"
+api_depends="${abi_depends}"

templates/MesaLib/depends

@@ -1,2 +1,2 @@
-abi_depends=7.3
-api_depends=${abi_depends}
+abi_depends=">=7.3"
+api_depends="${abi_depends}"

templates/MesaLib/template

@@ -18,7 +18,7 @@ long_desc="
 subpackages="devel"
 Add_dependency build pkg-config
 Add_dependency build glproto
-Add_dependency build dri2proto 2.1
+Add_dependency build dri2proto	">=2.1"
 Add_dependency build makedepend
 Add_dependency full glibc
 Add_dependency full expat

templates/ORBit2/depends

@@ -1,2 +1,2 @@
-abi_depends=2.14.17
-api_depends=${abi_depends}
+abi_depends=">=2.14.17"
+api_depends="${abi_depends}"

templates/PolicyKit/depends

@@ -1,2 +1,2 @@
-abi_depends=0.9
-api_depends=${abi_depends}
+abi_depends=">=0.9"
+api_depends="${abi_depends}"

templates/Thunar/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.1
-api_depends=${abi_depends}
+abi_depends=">=1.0.1"
+api_depends="${abi_depends}"

templates/acl/depends

@@ -1,2 +1,2 @@
-abi_depends=2.2.47
-api_depends=${abi_depends}
+abi_depends=">=2.2.47"
+api_depends="${abi_depends}"

templates/alsa-lib/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.20
-api_depends=${abi_depends}
+abi_depends=">=1.0.20"
+api_depends="${abi_depends}"

templates/aspell/depends

@@ -1,2 +1,2 @@
-abi_depends=0.60
-api_depends=${abi_depends}
+abi_depends=">=0.60"
+api_depends="${abi_depends}"

templates/atk/depends

@@ -1,2 +1,2 @@
-abi_depends=1.26.0
-api_depends=${abi_depends}
+abi_depends=">=1.26.0"
+api_depends="${abi_depends}"

templates/attr/depends

@@ -1,2 +1,2 @@
-abi_depends=2.4.43
-api_depends=${abi_depends}
+abi_depends=">=2.4.43"
+api_depends="${abi_depends}"

templates/aufs2-kmod/template

@@ -11,8 +11,8 @@ long_desc="
  This packages provides the kernel module for aufs2, another unionfs
  implementation for the Linux kernel."
 
-Add_dependency run	kernel		2.6.31.2_1
-Add_dependency build	kernel-headers	2.6.31.2_1
+Add_dependency run	kernel		"-2.6.31.2_1"
+Add_dependency build	kernel-headers	"-2.6.31.2_1"
 
 do_install()
 {
@@ -31,7 +31,7 @@ do_install()
 		config.mk || return 1
 
 	_kver=$(basename /usr/src/kernel-headers*)
-	kver=$(xbps-pkgdb getpkgversion ${_kver})
+	kver=$(${XBPS_PKGDB_CMD} getpkgversion ${_kver})
 	make KDIR=/usr/src/kernel-headers-${kver} || return 1
 	install -D -m644 fs/aufs/aufs.ko \
 		${DESTDIR}/lib/modules/${kver}/kernel/fs/aufs/aufs.ko \

templates/automake/template

@@ -15,6 +15,6 @@ long_desc="
  dependency tracking support, the use of GNU make is also required."
 
 noarch=yes
-Add_dependency full autoconf 2.60
+Add_dependency full autoconf	">=2.60"
 Add_dependency full libtool
 Add_dependency build texinfo

templates/babl/depends

@@ -1,2 +1,2 @@
-abi_depends=0.0.22
-api_depends=${abi_depends}
+abi_depends=">=0.0.22"
+api_depends="${abi_depends}"

templates/binutils/depends

@@ -1,2 +1,2 @@
-abi_depends=2.18
-api_depends=${abi_depends}
+abi_depends=">=2.18"
+api_depends="${abi_depends}"

templates/bzip2/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"

templates/cairo/depends

@@ -1,2 +1,2 @@
-abi_depends=1.8.6
-api_depends=${abi_depends}
+abi_depends=">=1.8.6"
+api_depends="${abi_depends}"

templates/cdparanoia/depends

@@ -1,2 +1,2 @@
-abi_depends=10.2
-api_depends=${abi_depends}
+abi_depends=">=10.2"
+api_depends="${abi_depends}"

templates/cracklib/depends

@@ -1,2 +1,2 @@
-abi_depends=2.8.0
-api_depends=${abi_depends}
+abi_depends=">=2.8.0"
+api_depends="${abi_depends}"

templates/curl/depends

@@ -1,2 +1,2 @@
-abi_depends=7.19
-api_depends=${abi_depends}
+abi_depends=">=7.19"
+api_depends="${abi_depends}"

templates/db/depends

@@ -1,2 +1,2 @@
-abi_depends=4.8.24
-api_depends=${abi_depends}
+abi_depends=">=4.8.24"
+api_depends="${abi_depends}"

templates/dbus-glib/depends

@@ -1,2 +1,2 @@
-abi_depends=0.80
-api_depends=${abi_depends}
+abi_depends=">=0.80"
+api_depends="${abi_depends}"

templates/dbus/depends

@@ -1,2 +1,2 @@
-abi_depends=1.2.10
-api_depends=${abi_depends}
+abi_depends=">=1.2.10"
+api_depends="${abi_depends}"

templates/e2fsprogs/depends

@@ -1,2 +1,2 @@
-abi_depends=1.41.5_1
-api_depends=${abi_depends}
+abi_depends=">=1.41.5_1"
+api_depends="${abi_depends}"

templates/enchant/depends

@@ -1,2 +1,2 @@
-abi_depends=1.4.2
-api_depends=${abi_depends}
+abi_depends=">=1.4.2"
+api_depends="${abi_depends}"

templates/exo/depends

@@ -1,2 +1,2 @@
-abi_depends=0.3.101
-api_depends=${abi_depends}
+abi_depends=">=0.3.101"
+api_depends="${abi_depends}"

templates/expat/depends

@@ -1,2 +1,2 @@
-abi_depends=2.0.0
-api_depends=${abi_depends}
+abi_depends=">=2.0.0"
+api_depends="${abi_depends}"

templates/file/depends

@@ -1,2 +1,2 @@
-abi_depends=4.90
-api_depends=${abi_depends}
+abi_depends=">=4.90"
+api_depends="${abi_depends}"

templates/fontconfig/depends

@@ -1,2 +1,2 @@
-abi_depends=2.6.0
-api_depends=${abi_depends}
+abi_depends=">=2.6.0"
+api_depends="${abi_depends}"

templates/freetype/depends

@@ -1,2 +1,2 @@
-abi_depends=2.3.9
-api_depends=${abi_depends}
+abi_depends=">=2.3.9"
+api_depends="${abi_depends}"

templates/gamin/depends

@@ -1,2 +1,2 @@
-abi_depends=0.1.9
-api_depends=${abi_depends}
+abi_depends=">=0.1.9"
+api_depends="${abi_depends}"

templates/gcc/depends

@@ -1,2 +1,2 @@
-abi_depends=4.4.0
-api_depends=${abi_depends}
+abi_depends=">=4.4.0"
+api_depends="${abi_depends}"

templates/gd/depends

@@ -1,2 +1,2 @@
-abi_depends=2.0.35
-api_depends=${abi_depends}
+abi_depends=">=2.0.35"
+api_depends="${abi_depends}"

templates/gdbm/depends

@@ -1,2 +1,2 @@
-abi_depends=1.8.0
-api_depends=${abi_depends}
+abi_depends=">=1.8.0"
+api_depends="${abi_depends}"

templates/gegl/depends

@@ -1,2 +1,2 @@
-abi_depends=0.0.22
-api_depends=${abi_depends}
+abi_depends=">=0.0.22"
+api_depends="${abi_depends}"

templates/gettext/depends

@@ -1,2 +1,2 @@
-abi_depends=0.17
-api_depends=${abi_depends}
+abi_depends=">=0.17"
+api_depends="${abi_depends}"

templates/gimp/depends

@@ -1,2 +1,2 @@
-abi_depends=2.6.6
-api_depends=${abi_depends}
+abi_depends=">=2.6.6"
+api_depends="${abi_depends}"

templates/glib/depends

@@ -1,2 +1,2 @@
-abi_depends=2.18.0
-api_depends=${abi_depends}
+abi_depends=">=2.18.0"
+api_depends="${abi_depends}"

templates/glibc/depends

@@ -1,2 +1,2 @@
-abi_depends=2.8
-api_depends=${abi_depends}
+abi_depends=">=2.8"
+api_depends="${abi_depends}"

templates/glitz/depends

@@ -1,2 +1,2 @@
-abi_depends=0.5.6
-api_depends=${abi_depends}
+abi_depends=">=0.5.6"
+api_depends="${abi_depends}"

templates/gmp/depends

@@ -1,2 +1,2 @@
-abi_depends=4.2.2
-api_depends=${abi_depends}
+abi_depends=">=4.2.2"
+api_depends="${abi_depends}"

templates/gnutls/depends

@@ -1,2 +1,2 @@
-abi_depends=2.6.6
-api_depends=${abi_depends}
+abi_depends=">=2.6.6"
+api_depends="${abi_depends}"

templates/grub2/devel.template

@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run grub2 ${version}
+Add_dependency run grub2 ">=${version}"
 
 do_install()
 {

templates/gst-plugins-base/depends

@@ -1,2 +1,2 @@
-abi_depends=0.10.22
-api_depends=${abi_depends}
+abi_depends=">=0.10.22"
+api_depends="${abi_depends}"

templates/gstreamer/depends

@@ -1,2 +1,2 @@
-abi_depends=0.10.22
-api_depends=${abi_depends}
+abi_depends=">=0.10.22"
+api_depends="${abi_depends}"

templates/gtk+/depends

@@ -1,2 +1,2 @@
-abi_depends=2.16.0
-api_depends=${abi_depends}
+abi_depends=">=2.16.0"
+api_depends="${abi_depends}"

templates/hal/depends

@@ -1,2 +1,2 @@
-abi_depends=0.5.11
-api_depends=${abi_depends}
+abi_depends=">=0.5.11"
+api_depends="${abi_depends}"

templates/hunspell/depends

@@ -1,2 +1,2 @@
-abi_depends=1.2.8
-api_depends=${abi_depends}
+abi_depends=">=1.2.8"
+api_depends="${abi_depends}"

templates/icu/depends

@@ -1,2 +1,2 @@
-abi_depends=4.2
-api_depends=${abi_depends}
+abi_depends=">=4.2"
+api_depends="${abi_depends}"

templates/jasper/depends

@@ -1,2 +1,2 @@
-abi_depends=1.900.1
-api_depends=${abi_depends}
+abi_depends=">=1.900.1"
+api_depends="${abi_depends}"

templates/jpeg/depends

@@ -1,2 +1,2 @@
-abi_depends=7
-api_depends=${abi_depends}
+abi_depends=">=7"
+api_depends="${abi_depends}"

templates/kernel/template

@@ -22,7 +22,7 @@ Add_dependency full dash
 Add_dependency full coreutils
 Add_dependency full module-init-tools
 Add_dependency run initramfs-tools
-Add_dependency run kernel-firmware ${_kernel_ver}
+Add_dependency run kernel-firmware ">=${_kernel_ver}"
 Add_dependency build perl
 
 do_install()

templates/klibc/depends

@@ -1,2 +1,2 @@
-abi_depends=1.5.14
-api_depends=${abi_depends}
+abi_depends=">=1.5.14"
+api_depends="${abi_depends}"

templates/klibc/template

@@ -21,7 +21,7 @@ Add_dependency build perl
 
 pre_build()
 {
-	local kver="$(xbps-pkgdb version kernel-headers)"
+	local kver="$(${XBPS_PKGDB_CMD} version kernel-headers)"
 
 	cd $wrksrc || return 1
 	ln -s /usr/src/kernel-headers-$kver linux

templates/lcms/depends

@@ -1,2 +1,2 @@
-abi_depends=1.18
-api_depends=${abi_depends}
+abi_depends=">=1.18"
+api_depends="${abi_depends}"

templates/libICE/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"

templates/libIDL/depends

@@ -1,2 +1,2 @@
-abi_depends=0.8.13
-api_depends=${abi_depends}
+abi_depends=">=0.8.13"
+api_depends="${abi_depends}"

templates/libSM/depends

@@ -1,2 +1,2 @@
-abi_depends=1.1.0
-api_depends=${abi_depends}
+abi_depends=">=1.1.0"
+api_depends="${abi_depends}"

templates/libX11/depends

@@ -1,2 +1,2 @@
-abi_depends=1.2
-api_depends=${abi_depends}
+abi_depends=">=1.2"
+api_depends="${abi_depends}"

templates/libXScrnSaver/depends

@@ -1,2 +1,2 @@
-abi_depends=1.1.3
-api_depends=${abi_depends}
+abi_depends=">=1.1.3"
+api_depends="${abi_depends}"

templates/libXau/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"

templates/libXaw/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"

templates/libXcomposite/depends

@@ -1,2 +1,2 @@
-abi_depends=0.4.0
-api_depends=${abi_depends}
+abi_depends=">=0.4.0"
+api_depends="${abi_depends}"

templates/libXcursor/depends

@@ -1,2 +1,2 @@
-abi_depends=1.1.9
-api_depends=${abi_depends}
+abi_depends=">=1.1.9"
+api_depends="${abi_depends}"

templates/libXdamage/depends

@@ -1,2 +1,2 @@
-abi_depends=1.1.1
-api_depends=${abi_depends}
+abi_depends=">=1.1.1"
+api_depends="${abi_depends}"

templates/libXdmcp/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"

templates/libXevie/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"

templates/libXext/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"

templates/libXfixes/depends

@@ -1,2 +1,2 @@
-abi_depends=4.0.3
-api_depends=${abi_depends}
+abi_depends=">=4.0.3"
+api_depends="${abi_depends}"

templates/libXfont/depends

@@ -1,2 +1,2 @@
-abi_depends=1.4.0
-api_depends=${abi_depends}
+abi_depends=">=1.4.0"
+api_depends="${abi_depends}"

templates/libXfontcache/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"

templates/libXft/depends

@@ -1,2 +1,2 @@
-abi_depends=2.1.13
-api_depends=${abi_depends}
+abi_depends=">=2.1.13"
+api_depends="${abi_depends}"

templates/libXi/depends

@@ -1,2 +1,2 @@
-abi_depends=1.2.1
-api_depends=${abi_depends}
+abi_depends=">=1.2.1"
+api_depends="${abi_depends}"

templates/libXinerama/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.3
-api_depends=${abi_depends}
+abi_depends=">=1.0.3"
+api_depends="${abi_depends}"

templates/libXmu/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"

templates/libXp/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.0
-api_depends=${abi_depends}
+abi_depends=">=1.0.0"
+api_depends="${abi_depends}"

templates/libXpm/depends

@@ -1,2 +1,2 @@
-abi_depends=3.5.7
-api_depends=${abi_depends}
+abi_depends=">=3.5.7"
+api_depends="${abi_depends}"

templates/libXrandr/depends

@@ -1,2 +1,2 @@
-abi_depends=1.3.0
-api_depends=${abi_depends}
+abi_depends=">=1.3.0"
+api_depends="${abi_depends}"

templates/libXrender/depends

@@ -1,2 +1,2 @@
-abi_depends=0.9.4
-api_depends=${abi_depends}
+abi_depends=">=0.9.4"
+api_depends="${abi_depends}"

templates/libXres/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.3
-api_depends=${abi_depends}
+abi_depends=">=1.0.3"
+api_depends="${abi_depends}"

templates/libXt/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"

templates/libXtst/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.3
-api_depends=${abi_depends}
+abi_depends=">=1.0.3"
+api_depends="${abi_depends}"

templates/libXv/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"

templates/libXvMC/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"

templates/libXxf86dga/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"

templates/libXxf86misc/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.1
-api_depends=${abi_depends}
+abi_depends=">=1.0.1"
+api_depends="${abi_depends}"

templates/libXxf86vm/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"

templates/libarchive/depends

@@ -1,2 +1,2 @@
-abi_depends=2.6.0
-api_depends=${abi_depends}
+abi_depends=">=2.6.0"
+api_depends="${abi_depends}"

templates/libart/depends

@@ -1,2 +1,2 @@
-abi_depends=2.3.20
-api_depends=${abi_depends}
+abi_depends=">=2.3.20"
+api_depends="${abi_depends}"

templates/libblkid/depends

@@ -1,2 +1,2 @@
-abi_depends=2.15
-api_depends=${abi_depends}
+abi_depends=">=2.15"
+api_depends="${abi_depends}"

templates/libcap/depends

@@ -1,2 +1,2 @@
-abi_depends=2.16
-api_depends=${abi_depends}
+abi_depends=">=2.16"
+api_depends="${abi_depends}"

templates/libcroco/depends

@@ -1,2 +1,2 @@
-abi_depends=0.6.2
-api_depends=${abi_depends}
+abi_depends=">=0.6.2"
+api_depends="${abi_depends}"

templates/libdmx/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"

templates/libdrm/depends

@@ -1,2 +1,2 @@
-abi_depends=2.4.6
-api_depends=${abi_depends}
+abi_depends=">=2.4.6"
+api_depends="${abi_depends}"

templates/libevent/depends

@@ -1,2 +1,2 @@
-abi_depends=1.4.9
-api_depends=${abi_depends}
+abi_depends=">=1.4.9"
+api_depends="${abi_depends}"

templates/libexif/depends

@@ -1,2 +1,2 @@
-abi_depends=0.6.17
-api_depends=${abi_depends}
+abi_depends=">=0.6.17"
+api_depends="${abi_depends}"

templates/libfontenc/depends

@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"

templates/libgcrypt/depends

@@ -1,2 +1,2 @@
-abi_depends=1.4.4
-api_depends=${abi_depends}
+abi_depends=">=1.4.4"
+api_depends="${abi_depends}"

templates/libglade/depends

@@ -1,2 +1,2 @@
-abi_depends=2.6.4
-api_depends=${abi_depends}
+abi_depends=">=2.6.4"
+api_depends="${abi_depends}"