net-ftp/pftpfxp: Don't add additional optimization flags to CXXFLAGS

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

4 files changed, 28 insertions, 22 deletions

diff --git a/net-ftp/pftpfxp/ChangeLog b/net-ftp/pftpfxp/ChangeLog
index 2b60ea037fc6..8c1e6d7c7628 100644
--- a/net-ftp/pftpfxp/ChangeLog
+++ b/net-ftp/pftpfxp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/pftpfxp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.17 2012/03/16 16:48:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.18 2012/07/01 12:44:51 jlec Exp $
+
+  01 Jul 2012; Justin Lecher <jlec@gentoo.org> pftpfxp-1.12-r1.ebuild,
+  metadata.xml:
+  Don't add additional optimization flags to CXXFLAGS
 
 *pftpfxp-1.12-r1 (16 Mar 2012)
 
diff --git a/net-ftp/pftpfxp/Manifest b/net-ftp/pftpfxp/Manifest
index 7162aa5b4b3f..facd159c382f 100644
--- a/net-ftp/pftpfxp/Manifest
+++ b/net-ftp/pftpfxp/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.11-gcc43.patch 328 RMD160 4492e0fd4635c752fc76e052a88e8a4781def431 SHA1 fde7469a4ce41ec9a5ee2f95589a56ff187fda59 SHA256 d2be9b44d970edfff827e20e2a5eb5924e9aca92d6af4eea90334ab303e019cb
 DIST pftp-shit.v.1.12.zip 155058 RMD160 694ab76126739cc7f611a0b4e604c9f1f8408b21 SHA1 f7b9c65c25ca0763453be23a35bf904318664d18 SHA256 b3448093b9a967490a2f25c5921881e22403887dcf66e17cd86383e299f0c15c
-EBUILD pftpfxp-1.12-r1.ebuild 1614 RMD160 3724ffb2699cd7023b9af92348c62fedc95fa5a9 SHA1 7a8a660d628e43b043c54a733595367a0ba294a9 SHA256 01caf2d8ed8a497c62a8cb3d1f81773f50fe5daca44cccd26170a94bacf56c35
-MISC ChangeLog 3389 RMD160 3e141ee593f8f5d6e78ab599c19d4ae45fde8d61 SHA1 311c9edd36c6d0d4a43bf47a0fd773c1f965fdf2 SHA256 027a6641feee11b0ebd3119a5475a3e46fa8af90045058ab5fd1d1c381622806
-MISC metadata.xml 248 RMD160 55f25ec59877ec3627fa4aaa346a61eacf403cad SHA1 3e7cd001b0c0005e3a86cb73d8ce32c2ad50d2fe SHA256 7404eee9a4427538674065b37d113a6531546b1126da727a21b6dbae1926bf98
+EBUILD pftpfxp-1.12-r1.ebuild 1656 RMD160 bd30109faae5cd15ee19015678e57474070b94b1 SHA1 c6fd70a50275484398c6bea24e1170f40a0a9cde SHA256 79a63e7b982ae8655a65f9509fde0e0a238b2bbe340021cac649e6d53c68d9e9
+MISC ChangeLog 3532 RMD160 4670b8bbadfce2e1985c8bd5bbc29a5fec5740ff SHA1 b27b54d866a29706438a97968be2eea42430b07b SHA256 5b61ac281dc562ec2aec546aa2c619610945f136a0039490c14f13a106d9a284
+MISC metadata.xml 234 RMD160 8349d33d86a7e7e3dafe1ebea1897baab4a0906d SHA1 5a8a96aa343d918275ee91ec68639d2889494000 SHA256 39b346463bdd6ec95ae4f6100f92e5db890c1d0ec02b6835dd9d6afb8a96414a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk9jbvAACgkQVWmRsqeSphOP+wCcCmycWr+mxSRhjafLJg9tQDo2
-RicAnAzFCeabPvev+yT3/jMSeMlq1Rkg
-=0Kg5
+iEYEAREKAAYFAk/wRkgACgkQgAnW8HDreRai5QCeNhWmMbAZfJiZnqLpuj83QAAT
+ZrMAoLKYPSOxrHD/+akBWyUSGplwzgvt
+=V3SS
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pftpfxp/metadata.xml b/net-ftp/pftpfxp/metadata.xml
index 1076258a0ce8..01385cb18624 100644
--- a/net-ftp/pftpfxp/metadata.xml
+++ b/net-ftp/pftpfxp/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<longdescription></longdescription>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription/>
 </pkgmetadata>
diff --git a/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild b/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild
index 2edd6f003acd..db505f312566 100644
--- a/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild
+++ b/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild,v 1.1 2012/03/16 16:48:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild,v 1.2 2012/07/01 12:44:51 jlec Exp $
 
 EAPI=4
+
 inherit eutils toolchain-funcs
 
 MY_P=pftp-shit.v.${PV}
@@ -14,14 +15,12 @@ SRC_URI="http://www.geekspot.nl/wp-content/uploads/2011/03/${MY_P}.zip"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-
 IUSE="ssl"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )"
 DEPEND="
 	app-arch/unzip
-	${RDEPEND}
-"
+	${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -30,26 +29,28 @@ src_prepare() {
 
 	# do no strip
 	# look for the correct library (bug #408231)
-	sed -i configure \
+	sed \
 		-e 's|[^D]*DO.*||g' \
 		-e 's|libssl.a|libssl.so|g' \
-		|| die
+		-e 's:-O2::g' \
+		-e 's:-g::g' \
+		-i configure || die
 
 	#fix permissions of configure script
 	chmod +x configure
 
 	# use CXX not CPP
 	# respect LDFLAGS
-	sed -i src/Makefile.in \
+	sed \
 		-e 's/CPP/CXX/g' \
 		-e 's|$(CXX) -o |$(CXX) $(GENTOO_LDFLAGS) -o |g' \
-		|| die
+		-i src/Makefile.in || die
 }
 
 src_configure() {
 	#note: not a proper autoconf
 	./configure $(use ssl || echo --nossl) || die "configure failed"
-	sed -i -e 's:$<:$(CPPFLAGS) $<:' -e 's/LINKFLAGS/LDFLAGS/g'  src/Makefile
+	sed -i -e 's:$<:$(CPPFLAGS) $<:' -e 's/LINKFLAGS/LDFLAGS/g'  src/Makefile || die
 }
 
 src_compile() {