Removed dying on ldap use flag and completely disabled the flag, see bug #125435

(Portage version: 2.0.54)

3 files changed, 15 insertions, 70 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index a91fb87d6514..cdf995a472c6 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.66 2006/03/04 15:22:20 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.67 2006/03/22 03:25:04 tester Exp $
+
+  22 Mar 2006; Olivier Crête <tester@gentoo.org> jabberd-1.4.4-r2.ebuild:
+  Removed dying on ldap use flag and completely disabled the flag, see bug
+  #125435
 
 *jabberd-1.4.4-r2 (04 Mar 2006)
 
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index ada4ee35dce8..72905d250732 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,84 +1,28 @@
 MD5 3e41bdaf73a08739f564b59fe8704971 ChangeLog 10753
-RMD160 242ef8d7a02bff46e57135a7793cbd811a59933e ChangeLog 10753
-SHA256 544313fc7cd4a37508a66736b1a3d1d239648ad5d64ca95226fb139670f44be5 ChangeLog 10753
 MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
-RMD160 cbaac3ea99a614c2155baad18a0a364a33d01ca1 files/README.Gentoo 984
-SHA256 cb495c86769e5de3d070b98ba379f3a1d83936c3c509263bca34f2fdd78f3726 files/README.Gentoo 984
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
-RMD160 3f5222d7c706f069b3623ee2f5c7f5034869a741 files/digest-jabberd-1.4.3-r4 201
-SHA256 33c61cd470b9348e0670e1025620c251a2ace5e9581e6acba6dc4574f8f5586e files/digest-jabberd-1.4.3-r4 201
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
-RMD160 3f5222d7c706f069b3623ee2f5c7f5034869a741 files/digest-jabberd-1.4.3-r5 201
-SHA256 33c61cd470b9348e0670e1025620c251a2ace5e9581e6acba6dc4574f8f5586e files/digest-jabberd-1.4.3-r5 201
 MD5 2b34306b5a0ea105e676d8153ad5cffe files/digest-jabberd-1.4.4-r2 479
-RMD160 372a5404f4e693a24960ac5c16330fe9026614d6 files/digest-jabberd-1.4.4-r2 479
-SHA256 63ec9adfe431cd468b8cde2b364a2fd36a60657b8280c234d2c04e9bd2dd764a files/digest-jabberd-1.4.4-r2 479
 MD5 8524e0a5eec488ceb069462f4650cf1b files/digest-jabberd-2.0.10 66
-RMD160 8d772c60a5ef7ed469d9a2e9f33939427d64a4e2 files/digest-jabberd-2.0.10 66
-SHA256 aa25128fea5986576fe926dba3b8b1aaedd757e50d6af3a0fae73511bf4dad08 files/digest-jabberd-2.0.10 66
 MD5 4817e867644d7d7bd2e1a0724571fbe9 files/digest-jabberd-2.0.9 65
-RMD160 874879ba51467cf292812048ed04f5e71ab66b7a files/digest-jabberd-2.0.9 65
-SHA256 e0558a17b5746d48015656ba100b8c828968a785ad35c728696b79c54cd28922 files/digest-jabberd-2.0.9 65
 MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
-RMD160 0a1a0afdaf445d8202b86d009d02752ce07a8111 files/jabber-conf.d 525
-SHA256 63d86ba061bee5bd8777b6b5f5c558dc70af03999b10ca45b583cbc69eb68a0a files/jabber-conf.d 525
 MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
-RMD160 fcb220de2879550fa91cb3cfce7b45e818e2972b files/jabber.init.bundled 626
-SHA256 55cbd339b6c4112aeade836b363d62abe1f5e99f70bfc2d8dbc9dcc944378d61 files/jabber.init.bundled 626
 MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
-RMD160 c363c6cccd9671d6fb8484aebb4659665e51f138 files/jabber.init.gentoo 2118
-SHA256 636e1432955b6a09f2f6ceba8cd4a223a8e1840b4082e3615424cfeca4c93e51 files/jabber.init.gentoo 2118
 MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874
-RMD160 a5cc38b73d707f4cc6a74f6658d93987471ce2e9 files/jabber.rc6-r5 874
-SHA256 2a5b6f0e0045e1b0a179f45acf6dfdda3eafb07e9626c59ab9694091ad0059be files/jabber.rc6-r5 874
 MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953
-RMD160 2165b3119893f51e777b27972bc755c6390ac58f files/jabber.rc6-r6 953
-SHA256 03301c94ee862ffa7c31a9995ef9e3557f415fb299fad8a398f0d27588780712 files/jabber.rc6-r6 953
 MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
-RMD160 115b8e998e8cbab50a35e6450cde9ffee2d84077 files/jabber.rc6-r7 1842
-SHA256 d3fabcb90f65271a2fb5afc7384e6bbc45d55d17a0e208a011e682feeb00a624 files/jabber.rc6-r7 1842
 MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800
-RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 files/jabber.rc6-r8 800
-SHA256 1ee99a10af00a518cfd74fa0279fcb7937d00f4d24633b67ea6974a19e2a505a files/jabber.rc6-r8 800
 MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
-RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d files/multiple-xml-patch-00 5934
-SHA256 43287b8265631498e0e82dfd0b362ec2513ffc4f3ea4daf112a52f3be49795c7 files/multiple-xml-patch-00 5934
 MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
-RMD160 94a3d484e157f59f04ac2c7e5edf1d92eecd9edd files/multiple-xml-patch-01 303
-SHA256 9354ea516986fff0de1a1745a33323d5717753a1ef6a19a166da251faa2532a5 files/multiple-xml-patch-01 303
 MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
-RMD160 c2eb6c555adb1560426dc2f407b4044735a19ee8 files/multiple.xml 15387
-SHA256 4dc1cd47d7fd8157680cb67d5b0265f41dc225cf5717cd556d755d2ecab0ed9e files/multiple.xml 15387
 MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112
-RMD160 53b67e0c890d4939e92ea929d2daa589d0af4985 files/patch-c2s-buffers 12112
-SHA256 c9a2bfb0874aa335044ec79e5d1c1ae7ad929c6889e780976e114de223f2ecab files/patch-c2s-buffers 12112
 MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688
-RMD160 bdf07df3eac44c121947a2b53797bf38002aac2c files/self-cert.jabberd-2.sh 688
-SHA256 2b7bd52854a4dabc0ff08ac0c72c3f0c0355bf84d751fe2a266d3e987890089d files/self-cert.jabberd-2.sh 688
 MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
-RMD160 f9af6ce9cf396b6ae2697f66120060433514051a files/self-cert.sh 494
-SHA256 060756f5e3660d9e5c37f4c34e895b88a371c76fc1095ab49853e151c190e9b4 files/self-cert.sh 494
 MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
-RMD160 1fef53144712c90a1a8331f2dd33dde67e96d4da files/xdb-ldap.xml 985
-SHA256 b120ded22102e2f21f557c6da7914ca4174272a51b9ae48e9fb950bb529c4e32 files/xdb-ldap.xml 985
 MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
-RMD160 52bd65c728666be7f6ad48508748d1a4f0b47f3a files/xml-stream-patch-00 726
-SHA256 c6b447658281c5136b63cc2bdcd1d38463dae57a0dc701b7d90fecacc409f0c4 files/xml-stream-patch-00 726
 MD5 910a3e146346e8d123c3cee270e3a920 jabberd-1.4.3-r4.ebuild 5809
-RMD160 9d0394ae66ac90ac9508936597979de862887487 jabberd-1.4.3-r4.ebuild 5809
-SHA256 0e32280f8d04636ab8c1f65258ee3aafeeb6f768a6ef8694b5c01aaefa70cf45 jabberd-1.4.3-r4.ebuild 5809
 MD5 798d2dd93ed39fc9c20919226a8d51b1 jabberd-1.4.3-r5.ebuild 5844
-RMD160 fbb8d5f1acd14506cb5c492104f2c597d48141db jabberd-1.4.3-r5.ebuild 5844
-SHA256 0dd37505e8a27d4825756197c13f6693b6bda7c2d110a3a6f16e0720dd667078 jabberd-1.4.3-r5.ebuild 5844
-MD5 8f8b1a480e1ef4ecf382be3e5a44c7f5 jabberd-1.4.4-r2.ebuild 4563
-RMD160 8bc7369843dab79e855d5be4fcf0236214dfd443 jabberd-1.4.4-r2.ebuild 4563
-SHA256 50611507bd45229ac581c9e3790d86b43b051b16ef69907ef99c12a9c6323064 jabberd-1.4.4-r2.ebuild 4563
+MD5 50501d9f9e75d2ac06450b9e097ff4dc jabberd-1.4.4-r2.ebuild 4516
 MD5 fca62ce7966e503d26de97e498881323 jabberd-2.0.10.ebuild 3493
-RMD160 c4277ffbc4c89fda31a7bd3e3b639b7784376787 jabberd-2.0.10.ebuild 3493
-SHA256 e3ed8681a7cfbd8495cb4c6f7083fc75ab8bda3d06ce309ca6e70e460c894a60 jabberd-2.0.10.ebuild 3493
 MD5 95d2d330856a7b80ead26d0c334d5571 jabberd-2.0.9.ebuild 3621
-RMD160 9fcc392b6f872799503a950828275b1755992164 jabberd-2.0.9.ebuild 3621
-SHA256 53c186dd0035c1e30f9fc145759b6b85c50b227e82b58a406400f52af4e34d55 jabberd-2.0.9.ebuild 3621
 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
-RMD160 6a374a73307cf5720cfe688da961eaa3a009a059 metadata.xml 411
-SHA256 f3939be0151058724f8e93ab01477c9c5373473030d94a258561b4db29c68e26 metadata.xml 411
diff --git a/net-im/jabberd/jabberd-1.4.4-r2.ebuild b/net-im/jabberd/jabberd-1.4.4-r2.ebuild
index 722a28c315e6..4cd27bd15e21 100644
--- a/net-im/jabberd/jabberd-1.4.4-r2.ebuild
+++ b/net-im/jabberd/jabberd-1.4.4-r2.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r2.ebuild,v 1.1 2006/03/04 15:22:20 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r2.ebuild,v 1.2 2006/03/22 03:25:05 tester Exp $
 
 inherit eutils
 
 S="${WORKDIR}/jabberd-${PV}"
 DESCRIPTION="Open Source Jabber Server"
 HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://download.jabberd.org/jabberd14/${P}.tar.gz
-	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )"
+SRC_URI="http://download.jabberd.org/jabberd14/${P}.tar.gz"
+#	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
 ## Arches removed due to dependencie on jabber-base
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl ldap ipv6 msn oscar yahoo icq mysql postgres"
+IUSE="ssl ipv6 msn oscar yahoo icq mysql postgres" #ldap
+
 
 DEPEND="!net-im/jabber-server
 	net-im/jabber-base
 	>=dev-libs/pth-1.4.0
 	dev-libs/expat
-	ssl? ( >=dev-libs/openssl-0.9.6i )
-	ldap? ( =net-nds/openldap-2* )"
+	ssl? ( >=dev-libs/openssl-0.9.6i )"
+#	ldap? ( =net-nds/openldap-2* )"
 
 PDEPEND="msn? ( net-im/pymsn-t )
 		 oscar? ( net-im/aim-transport )
@@ -30,12 +31,8 @@ PDEPEND="msn? ( net-im/pymsn-t )
 
 pkg_setup() {
 
-	if use ldap ; then
-		ewarn "This is a test release and LDAP was been disabled"
-		ewarn "USE='-ldap' and try again"
-		die
-	fi
-
+	ewarn "This is a test release and LDAP has been disabled for everyone"
+	
 	if use ipv6 ; then
 		ewarn "You are about to build with ipv6 support, if your system is not using ipv6"
 		ewarn "do control-c now and emerge with \"USE=-ipv6\" or add it to /etc/portage/package.use "