summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2012-08-03 19:53:10 +0000
committerOle Markus With <olemarkus@gentoo.org>2012-08-03 19:53:10 +0000
commit84397a7afdc8fdc9371ca6721c99c0104c45b635 (patch)
tree11a92aa409d756085dbecd9d591151f2d238a84d /dev-php
parentStable for amd64, wrt bug #415239 (diff)
downloadhistorical-84397a7afdc8fdc9371ca6721c99c0104c45b635.tar.gz
historical-84397a7afdc8fdc9371ca6721c99c0104c45b635.tar.bz2
historical-84397a7afdc8fdc9371ca6721c99c0104c45b635.zip
Remove file that typically cause file collision. Bug #429662
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/PEAR-Crypt_HMAC2/ChangeLog6
-rw-r--r--dev-php/PEAR-Crypt_HMAC2/Manifest18
-rw-r--r--dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild9
3 files changed, 29 insertions, 4 deletions
diff --git a/dev-php/PEAR-Crypt_HMAC2/ChangeLog b/dev-php/PEAR-Crypt_HMAC2/ChangeLog
index dd38355c10a0..9dc03cdf4c33 100644
--- a/dev-php/PEAR-Crypt_HMAC2/ChangeLog
+++ b/dev-php/PEAR-Crypt_HMAC2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php/PEAR-Crypt_HMAC2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Crypt_HMAC2/ChangeLog,v 1.4 2012/01/18 19:37:42 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Crypt_HMAC2/ChangeLog,v 1.5 2012/08/03 19:53:10 olemarkus Exp $
+
+ 03 Aug 2012; Ole Markus With <olemarkus@gentoo.org>
+ PEAR-Crypt_HMAC2-1.0.0.ebuild:
+ Remove file that typically cause file collision. Bug #429662
18 Jan 2012; Matti Bickel <mabi@gentoo.org> PEAR-Crypt_HMAC2-1.0.0.ebuild:
fix has_version call
diff --git a/dev-php/PEAR-Crypt_HMAC2/Manifest b/dev-php/PEAR-Crypt_HMAC2/Manifest
index b69b6d56650a..ec55b691c016 100644
--- a/dev-php/PEAR-Crypt_HMAC2/Manifest
+++ b/dev-php/PEAR-Crypt_HMAC2/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST Crypt_HMAC2-1.0.0.tgz 8129 SHA256 6b616cd6c2a6c3937c5790d7ffa4ef917d3db2bba7310f86111f1e514432ed2b SHA512 0c3bd71ba8c2bf086ca703732fb3ee2471797ea486dbc863acbb5d07426395a65b8c794473ac4b1c1b85e954e27b79361116bee0a36f4b78edd780ea6c06bfca WHIRLPOOL ca09a86dbf7b00079dc1638e38b2439ba08ab467934374f5cb78c648929c07eb2fa75a0d327e915a7e2aed69c964e471d3bedd772743886cfba84a0e4794a31a
-EBUILD PEAR-Crypt_HMAC2-1.0.0.ebuild 706 SHA256 93aa8f01f88f876c18bcf88177ff55309eb44e4ee6bef668d3bb1801d33e7e5a SHA512 c60f8ded1a1b0bb2504077e6693f6a2c8b8ede46d3d0c6f4185499d9755a306a1b07c89005baaa66bdd883cb71041a85fadb6f52a9df43ec570c16999474a7b4 WHIRLPOOL aa8470094977b33462284ae26be14fedaaac7a4c1436182299ec1569a98bf6ff53e9a083c6418b09cc1d5e9454206fad2fc05396c7f2cbb3632fdafc8ec902b6
-MISC ChangeLog 993 SHA256 2042e20ea29e5a9e32e59001a97f24e90cfb3328719add87a6a5eea3e2ab786b SHA512 7099bacfbf7b306aa5e1ac1496d75aa36573cf7d3c0e975dbc339a24a6acc724b3ed95e8264235621e69f2132b11715f4a905807bb402862ca2213e3dc8bc573 WHIRLPOOL 1078f2d4258c978c15e9ec97f7d5fd2267c0ec6d5c8a1f593dd114b08f5357026c7f7e354c7fbb4f1000efcebfcbe10986b98c1d4891fa2dda9a54eb869cdc98
+EBUILD PEAR-Crypt_HMAC2-1.0.0.ebuild 860 SHA256 ebe932d8ba7220a42a7e303f3d923d4669380c7d49d8876172964ba8785fa727 SHA512 f700e7840d4125c01f1017d5ba68d8f67be235d938d8ff2b03290c1846d480047328809ed4fff74f5641099247e6c007887404af45e07bb63a1ad4b8a5215ad3 WHIRLPOOL 3c9f03eb92bee98b08ec6bb3d95d5b00dcd4ac23732b3afe44e6c572e6fdf1b347a3b69075b61a6a720ec867f923da4c5823afd7805d25f83e060498aa9c32f0
+MISC ChangeLog 1149 SHA256 da6edf0f379df4a60b48695edabb963f59254665baf5c0b139acc7ebda2e9cae SHA512 9c8c360ec09eeffe8e46b2ac94a266cd1ffd154d546e78f6a4420726b7252a8171030e526b6234861016217a1f5bc5efc71284d1795562e864fc562339e26e60 WHIRLPOOL bf7a82f87fa0514c7f2645ce14c57f4032ae5885477d955c40a20b560f4b60dadb4be2e36ea64ec3c47435d752fa7b82d20b739a490aa95f0c38d396ed75df65
MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQHCwwAAoJEGurSuXEqSv1eGoIAMGnrUqS7RGn+PMmA3w2KOgv
+tblFKPMXYsiqbJGr/Ql7+ZoEz96V6CClUM/6EWUNeb5vEvNpfih+WK1JfaBqmhKU
+1OVlVCdWxIVa3xrj90mR6MJuzIQ/HBEM2hRkBtpwHxf/2nlaPKz6fLvuH6HZkGVf
+bwstNx6qYYWlKJJTmVccfQrB4BVcOZ2oxpmcUNSx9Tgk+E0wAIcba5qROozDtdm3
+ggWE2PNTSPVcjVRNSN8aDi5p2LCFOzSJh5Ce7djn0fXUsK08jLYJRDYWPswqeviQ
+dbughV5VL/YAYbbpN1U/lNz3pYTePm6p7GbHESd+QMN3QiHRx5TAtbdp3G5dIG8=
+=Wg8G
+-----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild
index ff097b42aec4..fa342d68f338 100644
--- a/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild
+++ b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.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-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild,v 1.2 2012/01/18 19:37:42 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild,v 1.3 2012/08/03 19:53:10 olemarkus Exp $
EAPI="4"
@@ -12,6 +12,13 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+src_install() {
+ php-pear-r1_src_install
+
+ #Useless file that often conflicts with other packages
+ rm ${D}/usr/share/php/generate_package_xml.php
+}
+
pkg_postinst() {
if ! has_version "dev-lang/php[hash]" ; then
elog "${PN} can use the hash extension when enabled to extend the range"