more has_version perl fixes

Package-Manager: portage-2.1.2_pre3-r4

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 456b1fe2cd20b73d744ca913881df901c7c0116f..349f0befd07d0ae5ac6787615a72d7880c228677 100644 (file)
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.216 2006/10/15 23:14:06 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.217 2006/10/18 23:02:30 jokey Exp $
+
+  18 Oct 2006; Markus Ullmann <jokey@gentoo.org> openldap-2.1.30-r6.ebuild,
+  openldap-2.2.28-r3.ebuild:
+  more has_version perl fixes
 
   15 Oct 2006; Thomas Cort <tcort@gentoo.org> openldap-2.3.27-r2.ebuild:
   Stable on alpha wrt security Bug #144862.

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index f7eda763da3a48bce629b53320c85b4eecb7e531..4d6e6cf5a02a9fa241c87ffb2936d21c4a9aa28f 100644 (file)
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.0/slapd 584 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 SHA1 5b9b3418b433c15df1a0cb72d2c7f8f361cf33e1 SHA256 25e592f3e3c163dacab29bfa9e4e0dda03ada5ae9cbda9440e148f5f29f10db4
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 files/2.0/slapd 584
@@ -114,18 +117,18 @@ DIST openldap-2.1.30.tgz 2044673 RMD160 431aa798c6197530c17611b931f0169d7a53e831
 DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c SHA1 0b3a3b9b61f6f033685218957fb84ba1d58887de SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba
 DIST openldap-2.3.24.tgz 3756405 RMD160 8b4be685de2c2a7ace1debe97d5bda2354b57a06 SHA1 e00f7a017d9223708b77b0df3a612d236789b380 SHA256 e5247204dc0a41fa9b14ec1110fd2c179210b2288b27ebdee0a465b9e8e100cf
 DIST openldap-2.3.27.tgz 3757519 RMD160 8c25c39689daa515f14e88611490ae6d8df0911c SHA1 c2b6ac3ec89d0f58d079592946d045dba45edafe SHA256 6ddf211d65aa62bb2165a612f96545d5dc8baf01d269e0f7945ebe066c282ed7
-EBUILD openldap-2.1.30-r6.ebuild 8137 RMD160 dfacbe171a40150594b2dd6089b3d21fa388b019 SHA1 4ff56a43f98aea74b9608b5b1367360a73f1d85f SHA256 6a94fa3ef332a2425b87dbe4b44227d7194eaf2ff50bd688e532afebb34c4f3a
-MD5 cf3459ef7f70916905138caeed991715 openldap-2.1.30-r6.ebuild 8137
-RMD160 dfacbe171a40150594b2dd6089b3d21fa388b019 openldap-2.1.30-r6.ebuild 8137
-SHA256 6a94fa3ef332a2425b87dbe4b44227d7194eaf2ff50bd688e532afebb34c4f3a openldap-2.1.30-r6.ebuild 8137
+EBUILD openldap-2.1.30-r6.ebuild 8181 RMD160 9ac037f40d1c35c3ba4b43602158642dd8767039 SHA1 88128e6b096d6522e13ec444fb60c43b7655271a SHA256 c41c425dc70d39326a52df9dbfe4416d9ac3940132fdd7f601fa89cedf6f749d
+MD5 547923b0d75852454a8817c193904a1d openldap-2.1.30-r6.ebuild 8181
+RMD160 9ac037f40d1c35c3ba4b43602158642dd8767039 openldap-2.1.30-r6.ebuild 8181
+SHA256 c41c425dc70d39326a52df9dbfe4416d9ac3940132fdd7f601fa89cedf6f749d openldap-2.1.30-r6.ebuild 8181
 EBUILD openldap-2.1.30-r7.ebuild 8932 RMD160 cef414707aea66c2b9161020087e2b1fbca31377 SHA1 e27590bead0190eacdacbe0798bc53ac1d2ddbe6 SHA256 72af57c54696c77c32e6c0b75674feff6bb313035fad8c83d00220aef973d20e
 MD5 7e336278947df5aac46b8bbff0eb29b8 openldap-2.1.30-r7.ebuild 8932
 RMD160 cef414707aea66c2b9161020087e2b1fbca31377 openldap-2.1.30-r7.ebuild 8932
 SHA256 72af57c54696c77c32e6c0b75674feff6bb313035fad8c83d00220aef973d20e openldap-2.1.30-r7.ebuild 8932
-EBUILD openldap-2.2.28-r3.ebuild 13717 RMD160 841dd06f816c4d266a638ef9e056fe48ddacd698 SHA1 8f091fe7fc2e6e71d8da7bafd536f4b5d4ef1d22 SHA256 45465cbe50c9815d4bb251c90ce9fcd528774a3b7b7272c7a57e95c77b620a36
-MD5 d4c182a4f028e7ad79cfc127f3a2632d openldap-2.2.28-r3.ebuild 13717
-RMD160 841dd06f816c4d266a638ef9e056fe48ddacd698 openldap-2.2.28-r3.ebuild 13717
-SHA256 45465cbe50c9815d4bb251c90ce9fcd528774a3b7b7272c7a57e95c77b620a36 openldap-2.2.28-r3.ebuild 13717
+EBUILD openldap-2.2.28-r3.ebuild 13759 RMD160 45424c3b76cd0071c45afcd13d6cde0f19844b25 SHA1 097980f1f29cbb8eec2d657a5074e99759f75261 SHA256 10bf91774089fd4552d7dbaa108b6aaa290e3a49fb72a2290fcf555859f6e596
+MD5 6d7a94de921228452b007a3052055528 openldap-2.2.28-r3.ebuild 13759
+RMD160 45424c3b76cd0071c45afcd13d6cde0f19844b25 openldap-2.2.28-r3.ebuild 13759
+SHA256 10bf91774089fd4552d7dbaa108b6aaa290e3a49fb72a2290fcf555859f6e596 openldap-2.2.28-r3.ebuild 13759
 EBUILD openldap-2.2.28-r4.ebuild 15070 RMD160 5dd533cbad58ca63cf74e615d3e57e5cb6430ef1 SHA1 e8d13d78741ceeee5ef0d068789b40d4ac992b4b SHA256 3acdadb055a0a3128e347a4026aea869abed1151389f646e55af516dc3d5fdaa
 MD5 b4774b3a30167a67b0b6f69fabfa4c33 openldap-2.2.28-r4.ebuild 15070
 RMD160 5dd533cbad58ca63cf74e615d3e57e5cb6430ef1 openldap-2.2.28-r4.ebuild 15070
@@ -150,10 +153,10 @@ EBUILD openldap-2.3.27.ebuild 17369 RMD160 859df9b9b8573504279e6ef77e3a2d22f3c98
 MD5 73b37e4d08c002487a4bafa2722492ca openldap-2.3.27.ebuild 17369
 RMD160 859df9b9b8573504279e6ef77e3a2d22f3c9878f openldap-2.3.27.ebuild 17369
 SHA256 2f562d8dc4e20f8717361e1c50190038e8226ce7652f33857a82bc724e0ec67a openldap-2.3.27.ebuild 17369
-MISC ChangeLog 37191 RMD160 d48b2724e03d5e64272a8c0abece889b488caae4 SHA1 453050c1abf40e0c3e627b9995405301dc1e97e6 SHA256 706ac302370e58d2d7d79eef28d5f005ba94ab386c04937da88a9164c6ed6b43
-MD5 9bbc67efa5aed75a769ce5285d1e09a1 ChangeLog 37191
-RMD160 d48b2724e03d5e64272a8c0abece889b488caae4 ChangeLog 37191
-SHA256 706ac302370e58d2d7d79eef28d5f005ba94ab386c04937da88a9164c6ed6b43 ChangeLog 37191
+MISC ChangeLog 37327 RMD160 a3ab71f6709bb37b06971150a586cb468b7a72cf SHA1 1a3a87e59cf1ac8b9c7dac35ce5db55b2935fea6 SHA256 75ec868b970817b3f8875a84dcacbed4daecd408db362d6fed5874f379a7f3f6
+MD5 ea203c0b67b4258c502179601c288f28 ChangeLog 37327
+RMD160 a3ab71f6709bb37b06971150a586cb468b7a72cf ChangeLog 37327
+SHA256 75ec868b970817b3f8875a84dcacbed4daecd408db362d6fed5874f379a7f3f6 ChangeLog 37327
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -185,3 +188,10 @@ SHA256 5647879ba591b3ec35a04e87326cf4526f35239aa4c30434e4dc4b055fba7154 files/di
 MD5 11da1511848af420c24e05af22af0d36 files/digest-openldap-2.3.27-r2 241
 RMD160 6d2cb0114f4d36e4ab6901507bc8d2c075392344 files/digest-openldap-2.3.27-r2 241
 SHA256 5647879ba591b3ec35a04e87326cf4526f35239aa4c30434e4dc4b055fba7154 files/digest-openldap-2.3.27-r2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFNrKrz974XjDVpbkRAqoqAJ4r2Md9s2blx/TiZg8fx8JKUGbS1gCgjSnG
+C752ccgO0k/iaAw1A7/v4gg=
+=dg5L
+-----END PGP SIGNATURE-----

diff --git a/net-nds/openldap/openldap-2.1.30-r6.ebuild b/net-nds/openldap/openldap-2.1.30-r6.ebuild
index a73c4e2e431d1aeb7c8a0df71a39100fe2b9e3d6..2aac215835356ff1888274e38de0934d20a4a6a1 100644 (file)
--- a/net-nds/openldap/openldap-2.1.30-r6.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r6.ebuild,v 1.9 2006/05/06 13:18:56 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r6.ebuild,v 1.10 2006/10/18 23:02:30 jokey Exp $
 
 inherit eutils
 
@@ -52,7 +52,7 @@ pkg_preinst() {
 }
 
 pkg_setup() {
-       if built_with_use dev-lang/perl minimal ; then
+       if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
                die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
        fi
 }

diff --git a/net-nds/openldap/openldap-2.2.28-r3.ebuild b/net-nds/openldap/openldap-2.2.28-r3.ebuild
index edcefe4ee00eb8e635ad910dae7769615822e53b..709228fb6611bcd77185eab77eb04fdc6d404e74 100644 (file)
--- a/net-nds/openldap/openldap-2.2.28-r3.ebuild
+++ b/net-nds/openldap/openldap-2.2.28-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r3.ebuild,v 1.12 2006/04/29 22:47:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r3.ebuild,v 1.13 2006/10/18 23:02:30 jokey Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -113,7 +113,7 @@ pkg_setup() {
                die "Warning direct upgrade unsafe!"
        fi
        openldap_upgrade_warning
-       if built_with_use dev-lang/perl minimal ; then
+       if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
                die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
        fi
 }