Remove file that typically cause file collision. Bug #429662

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

4 files changed, 31 insertions, 4 deletions

diff --git a/dev-php/PEAR-Net_FTP/ChangeLog b/dev-php/PEAR-Net_FTP/ChangeLog
index 8fd8c6025e9a..53dd2db8f42c 100644
--- a/dev-php/PEAR-Net_FTP/ChangeLog
+++ b/dev-php/PEAR-Net_FTP/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/PEAR-Net_FTP
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/ChangeLog,v 1.32 2012/02/09 11:43:05 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/ChangeLog,v 1.33 2012/08/03 20:02:44 olemarkus Exp $
+
+  03 Aug 2012; Ole Markus With <olemarkus@gentoo.org>
+  PEAR-Net_FTP-1.4.0_alpha3.ebuild:
+  Remove file that typically cause file collision. Bug #429662
 
   09 Feb 2012; Matti Bickel <mabi@gentoo.org> -PEAR-Net_FTP-1.3.4.ebuild:
   remove old
diff --git a/dev-php/PEAR-Net_FTP/Manifest b/dev-php/PEAR-Net_FTP/Manifest
index 68d83a4b95fa..9daca994f28e 100644
--- a/dev-php/PEAR-Net_FTP/Manifest
+++ b/dev-php/PEAR-Net_FTP/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Net_FTP-1.3.7.tgz 31749 SHA256 31ac1237d2d542b898a995893c0b13f7107c66b7be768c9ebf2628738ca97a5d SHA512 577f5c728acd7dea47ad640d0287db80bfe18b7a32472ee08e6d3848f7c9059616229d7e302603f33365150b49208113744e19a9d542b6d4a1f4f9c5ee5a7291 WHIRLPOOL 860cfd7c2b88e864e42d2d530a38995f2326181807904aa461b84e553b6d3398d0a8282165da69e6a73a35b7963962139119a17a379640904c7738f8748cdd3d
 DIST Net_FTP-1.4.0a3.tgz 35763 SHA256 0bd47f1b57b4da01cd6fc7dfcc74bcaff1b1fca30cbe9590122b4120c5741c92 SHA512 3bd203db7d4bcdbf19b80a8198c57a1af1db6441a00779a49c269b0e4561d301edee7eefd274b2ea4fb337ef4add68c55884d5eda4907139cd59247bdfbc4621 WHIRLPOOL ef47212964966dbfed488fdf8330cc74577c341e9d6b10cc8f8938347e2bbe5e054734fc98f75bacbaef647f4c0ab79062e8a2462d4f4224d5dab5ea7f740ff4
 EBUILD PEAR-Net_FTP-1.3.7-r1.ebuild 452 SHA256 69754dfa662b275219b0b87b053e429c3db5a20bd11f046ff5ba4b12f8b311c3 SHA512 ff154c10b595ba94e9f4d2e39a309e88a71f325dceab38de1a6c1d0dd136168fafcd35ab9559647e3eb9adba4574e8b96fb553e3793268c1ac9ee2eac2b6a74e WHIRLPOOL ff5ee3cef51f6ea65f4a2cfc70f2c8871241ef04adbaa263e6e04809f54e9d71fe26be18ad018d49a1a45eb3170e9e62a764a6a3e98309f8403c1592ca76b069
-EBUILD PEAR-Net_FTP-1.4.0_alpha3.ebuild 467 SHA256 779d4137aaa9af53d94247dcad7a551677fb399cdeee65c8ed79a63a5c31a60b SHA512 dc0229814b04c3f91f93604e4ac1f2580071e00fddc8b4b4eb54df8710c2562f54702a09da5e218d56b2a120ed08d95e03dbeeb9b92d97891d84cb18dbf7057d WHIRLPOOL ec5741b9601ff1950f432b7039e79809133b0e5c059f68ae8ed8b029d8fb65c67baf98ad03fafe1fa7d81a1a40c97ee6143cf850e2f3c6ad28f521b39b0d9375
-MISC ChangeLog 4421 SHA256 9281e4b7c615952a24e804233a0683ecc99f1d080b382b55dfcdf4daa704f382 SHA512 227635dffa7649e20e38991c5675090aa1b406f7ce92a0c070b13f56a5213e0a3512bd01114b34ad859804b994ed2c7da1374a9d7c22d0c34d2c68f9b1c8504d WHIRLPOOL 8f297a1b0b4695d7acc6286217530f39f1798cdb898a424ab5f7e5f1561bd2422c2102802ee4860c5a58b4f14baa3e2ee1519cd2eb7de70c32cf51b7851da488
+EBUILD PEAR-Net_FTP-1.4.0_alpha3.ebuild 566 SHA256 227b25906911e9d309bf338d525616f713e7a52d21aba06c4426de9796b10887 SHA512 d84244c5bdcd281a21631725de8b8580cc411ae425397e9970996bf0d1e5f123e1ce0f394a5fdf620a6d2db5790227b68cb7b50a0ec258fc75b7ba41e2c0b767 WHIRLPOOL 4332d523be469c834fd4fcc95c58842f3bd8a048ee687bcae085672865ccf711b4c7cacb1ec1823d29b2c51336ef153a908d389db43f71f2c7471972dc74d327
+MISC ChangeLog 4580 SHA256 2af494cc4776ecc1c22507398019171ca6d6c4967d11c248b089149c845bc511 SHA512 afd6b76107a543da5136af009a9ed85d07b6a5335937006b67342b9334b0320c599fd6e65d02fe6c9f788f80a6748a8e1c22dde45d1d73700a23e9e81844f390 WHIRLPOOL a5ea0f7f55a9c21f36c568380ef6728f07107559f01d178c3fd7e3e2727fac7bfea82a7c081bc3892b38ad570af8fed1bf61c975cb9e6924e92de890ddb08333
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQHC5qAAoJEGurSuXEqSv1pWcH/RYpveWN3usv+WxuCzTIG1Yr
+CJ8nnIcIxcmhV6fcDYl2BxEhbrU1j8G7NXCq6XjjbVagWuK7gKtoxm/Vkkn9Ezku
+E4g926E9Ra9Glj9gIgz35QQHyVqQ089yqcReow2c8nFKVy4itCoFLCAn5VlrBsTC
+0kECqJ22853y/w8W/JURk1+pAq2STkVH8BQFrprYC64aBMnRvw4qISZ4xEExmgzT
+b5aK7LOWrTUMi+fA1ljHnP/ykEm74zKHv56/FqHG/RA6ObyfGrTU8qBiHTs8E0Jz
+fkhjOuhZ1y7jhrunba6jb7jbGfAORgjZB2d0v+f1Br+I/sXfmE6fqFmjgs5U6pU=
+=YM+o
+-----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha3.ebuild b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha3.ebuild
index 879c33a88581..776d081b48b8 100644
--- a/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha3.ebuild
+++ b/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha3.ebuild,v 1.1 2012/01/18 22:12:14 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha3.ebuild,v 1.2 2012/08/03 20:02:44 olemarkus Exp $
 
 EAPI="4"
 
@@ -13,3 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 RDEPEND="dev-lang/php[ftp]"
+
+src_install() {
+	php-pear-r1_src_install
+	rm "${D}"/usr/share/php/generate_package_xml.php
+}
diff --git a/dev-php/PEAR-Net_IPv6/Manifest b/dev-php/PEAR-Net_IPv6/Manifest
new file mode 100644
index 000000000000..591b4cd908e9
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv6/Manifest
@@ -0,0 +1,4 @@
+DIST Net_IPv6-1.2.1.tgz 9682 SHA256 54164277e6551f57b81a8c28744dce18dd7c5a8c2b5548a609c9c3511db3af6b SHA512 551f8b9e5ae94c1e5905ef54cba1ff001267e75f7ce248faf943e86529578b017fec53dd40bf63dc85f038603acca3e75a01f4698b96f8216d8c41ffb188c4e4 WHIRLPOOL ff764addd17d3d9ab774d3e807eeb22f05acc6d98516da244b47287061abb3df224eaea0ff68cbbab98dafcb11c3de6c427c390c3ed400c79a4a57f0274b7333
+EBUILD PEAR-Net_IPv6-1.2.1.ebuild 355 SHA256 6a0b90b045d8517207ca6f81e897c9b17e4480c529a2f134cb147cb57f44f012 SHA512 117b6012793057be96028e3f5fb7d989ff1775e993f5bcafa91855232ddedbf8092a55e3546a9b86b01a10932cb73c12cec4db8600b7d2f0c84166cd8428c67d WHIRLPOOL ef5409935feac27535274057dca496d6cff500f3f554a4a1cf724fa000dc941cd347f964680a66f69ac0ee7be0283a7c0c2dda628c2c415f2856623920874323
+MISC ChangeLog 361 SHA256 4581eb43818b835b19006cfa11016bad85d59b5581e9fd5d24ab068757711b0b SHA512 f97f37d68690372ffc087010192f7e44883a034b7be16eed06372bde2f37d7187943e7828cfb1558323380e8f603635312d7590aaebf9f9bf33ce686e28f9032 WHIRLPOOL 16660f7500e65b140810f1951bc75257fd0e07defb9853c913cc5b4707b61930338d6273394b011472c67a9bd19ba3c6945b71e1582cd641d1d406e2ef74182e
+MISC metadata.xml 323 SHA256 00190b88b1d14040ecf55dd9cf729f4fe44b12f0f47ca34a81bc048f7635ef43 SHA512 0bc64854548a18180dc3283f6a6c5d43687e27dc72bf673bcf2643d34c589bdca19b004f68eec745e7f1b6cb6fce52a517efa1706ab8ce5b7653f9908148093e WHIRLPOOL d1f3b3fa76ab4a3c7547606c268dac160a389fae438c9b43d343b61e2b418ff3d0694dc70a2ec04aeb8af16ceb646294eb3f538905f6fda99aa2ad64a5b82c96