Fixed a file collision issue 368693. Also removed an older version of dbunit

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 9 insertions, 46 deletions

diff --git a/dev-php/dbunit/ChangeLog b/dev-php/dbunit/ChangeLog
index 389436143df6..5096b7268ae8 100644
--- a/dev-php/dbunit/ChangeLog
+++ b/dev-php/dbunit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/dbunit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/dbunit/ChangeLog,v 1.4 2011/05/24 14:54:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/dbunit/ChangeLog,v 1.5 2011/05/31 13:55:36 olemarkus Exp $
+
+  31 May 2011; Ole Markus With <olemarkus@gentoo.org> -dbunit-1.0.0.ebuild,
+  dbunit-1.0.1.ebuild:
+  Fixed a file collision issue 368693. Also removed an older version of dbunit
 
   24 May 2011; Markos Chandras <hwoarang@gentoo.org> dbunit-1.0.1.ebuild:
   Stable on amd64 wrt bug #368293
diff --git a/dev-php/dbunit/Manifest b/dev-php/dbunit/Manifest
index ff51136e2917..6113678e83ec 100644
--- a/dev-php/dbunit/Manifest
+++ b/dev-php/dbunit/Manifest
@@ -1,27 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX channel.xml 804 RMD160 54c3ea5de2ac9d511671d2779b6f6c01cc7cd59a SHA1 a26c74e28b36d1a91d280a3225669e1cb4c87cce SHA256 1a1bda346c1bcc3b6cb7e3c09a4834ef90907b7129c92b5f22e9ebdd76194421
-DIST DbUnit-1.0.0.tgz 38183 RMD160 04713acf6c8d950e544a2f24bac50d68951164f8 SHA1 eb5cd183c40fb68f299cb62031ee216da08ee3a8 SHA256 e6b236a03e3f87bc523a18ba113742a7f23490e8202cd988bc5b689c4658f7e8
 DIST DbUnit-1.0.1.tgz 39055 RMD160 00a5a5fbe4e2d4ef87eaca9338dd6a829ca2a516 SHA1 9f3052e7b825a7dc7a54b9832e90345350b8b491 SHA256 85f128e5626d380b12148b3ae9c70b10a2b748347ddadc5548a7ec62d1c0a6b1
-EBUILD dbunit-1.0.0.ebuild 578 RMD160 b06e70b525c762805f6ff8b97138f9982f18812d SHA1 59cc9cf00dcd487adcad74d9d78c83c721e0c3fc SHA256 553eb41d528424924d8291fca3e4efc71f1cdfc9c4d3f0d613e2f211b6875aec
-EBUILD dbunit-1.0.1.ebuild 584 RMD160 04990d94bae170ad622c5014ba7af28693aaeec2 SHA1 fe9f5e6585a173d9c2acf3ad031af6bc396fa37c SHA256 8de4042d9a725dddc6af9946e58af9eca9aed0d22b853dae40c51cb50fb3ef96
-MISC ChangeLog 869 RMD160 333dff46c0315cb68497dc69bbb8da097f28becb SHA1 51ac8a36fddc6a266cd4fbec72f843db91d0db14 SHA256 5079b3a8c49ba1610f058a4b98d7b0d17a9872c3c3b41bee1c825a33db983990
+EBUILD dbunit-1.0.1.ebuild 609 RMD160 dab4a4209f5bd38d97178d7fda48dd1cae84ed1b SHA1 8bb1d8a484a4e50bc0eb4164c2c2a0cb1da39a3e SHA256 cd72258e42125031915399476e1fe4a51dff6c7a6c42e5df1dfbfe67ec6d9fb5
+MISC ChangeLog 1049 RMD160 a1b87f4133b3237b058f56ffadc2552abe860674 SHA1 9015e8e383c8d8666c201e0ad41a2cc12dc5ff9c SHA256 db4f565a61923b428f8f1b24e1ce98c91ab5bebd7ece13513d35b87cc829c3ea
 MISC metadata.xml 156 RMD160 a3a59cdc3ac33d711123b2d7e2b1deb2984aa101 SHA1 1f452f476317b4634c684eabfd8840d06d35b414 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN28avAAoJEPqDWhW0r/LCXb0P/A1MwgLKZKr/+q1Bw5kMu79H
-WdkPOlAd3+qHuE23Sl/38jmHn883x8W4VbaFgq6WbAKkNvQg4id+nY0p9mqBmKpC
-lBpMDggz9eg6mE4vjVKz8aSmU4X+KHoHG8ZDKpknUHv4v/0ozE9KQyUSPZ2ZT0FQ
-KLDqiMbsKwtVyUWUlOPVTgc3cC4VlFXDpCMQIsvo2eZZL4a5nudcBxF7ss416T6s
-CthjaA5TdLZAYJzXlJOX1Zt57Mrvypi4lGpy4AAYlvsetNvhkG4eOhnY4rgivUOu
-P4HSscYDKW0yLTv5Yp+85eYa0GSSABOmR/LGbHetL3dHpI5TbgeKz8pgvc8jO77A
-FhIggt1zNDBlFzDSmBE186Oi+tBYsoik1JkNzIhA+CcPf4tTyG9LbVI2W05zumVs
-udGQKzjwtzEL4CKOuCnR0c/d+T6gM+BTFYauuk3eYrTrIfpGdeOGws74zyL7HSrK
-set3uXGa24oST4NqweeQ/ZAk06WqQ2cLUXYiW636jd1+BgpBN99YwH2lD5XEMR9F
-aYq2IYWzvmQKtR+1TokwBeaXPwfzAC9eMEVSF11mbNZb0i35IIRf1yvb4jz6eGiC
-ugjsuMzdXIGGRfI2+Rid9AGV8rqCYVSmiVJSpguBSyNojbpo07amH+L38PeYpych
-RoOUFOQEYHbCKYqvs5G/
-=pOOq
------END PGP SIGNATURE-----
diff --git a/dev-php/dbunit/dbunit-1.0.0.ebuild b/dev-php/dbunit/dbunit-1.0.0.ebuild
deleted file mode 100644
index 4faa0c937a78..000000000000
--- a/dev-php/dbunit/dbunit-1.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/dbunit/dbunit-1.0.0.ebuild,v 1.5 2011/04/16 12:42:32 olemarkus Exp $
-
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_PN="DbUnit"
-inherit php-pear-lib-r1
-
-DESCRIPTION="DbUnit port for PHP/PHPUnit"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-HOMEPAGE="http://www.phpunit.de"
-
-RDEPEND="${RDEPEND}
-	>=dev-php5/ezc-ConsoleTools-1.6
-	>=dev-php/file-iterator-1.2.2
-	dev-php/php-tokenstream
-	dev-php5/PEAR-Text_Template"
diff --git a/dev-php/dbunit/dbunit-1.0.1.ebuild b/dev-php/dbunit/dbunit-1.0.1.ebuild
index 3616c181ab09..6b7a3dfbddf3 100644
--- a/dev-php/dbunit/dbunit-1.0.1.ebuild
+++ b/dev-php/dbunit/dbunit-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/dbunit/dbunit-1.0.1.ebuild,v 1.6 2011/05/24 14:54:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/dbunit/dbunit-1.0.1.ebuild,v 1.7 2011/05/31 13:55:36 olemarkus Exp $
 
 EAPI="3"
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
@@ -15,6 +15,7 @@ IUSE=""
 HOMEPAGE="http://www.phpunit.de"
 
 RDEPEND="${RDEPEND}
+	!!<dev-php/phpunit-3.5
 	>=dev-php5/ezc-ConsoleTools-1.6
 	>=dev-php/file-iterator-1.2.2
 	dev-php/php-tokenstream