diff options
author | Ole Markus With <olemarkus@gentoo.org> | 2012-08-03 20:02:44 +0000 |
---|---|---|
committer | Ole Markus With <olemarkus@gentoo.org> | 2012-08-03 20:02:44 +0000 |
commit | 5c1fc4bdb739648c5a796eef23400899c675fc4d (patch) | |
tree | 180bdc188abcf425546ef42436b2d37e17c2eb47 /dev-php | |
parent | Switched to autotools-utils, EAPI 4 (diff) | |
download | gentoo-2-5c1fc4bdb739648c5a796eef23400899c675fc4d.tar.gz gentoo-2-5c1fc4bdb739648c5a796eef23400899c675fc4d.tar.bz2 gentoo-2-5c1fc4bdb739648c5a796eef23400899c675fc4d.zip |
Remove file that typically cause file collision. Bug #429662
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'dev-php')
-rw-r--r-- | dev-php/PEAR-Net_FTP/ChangeLog | 6 | ||||
-rw-r--r-- | dev-php/PEAR-Net_FTP/PEAR-Net_FTP-1.4.0_alpha3.ebuild | 7 |
2 files changed, 11 insertions, 2 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/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 +} |