summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-07-01 12:44:51 +0000
committerJustin Lecher <jlec@gentoo.org>2012-07-01 12:44:51 +0000
commit23d8860952b507b1565849062475728506ccd50e (patch)
treec92d45b23ad578d5d41c56d6e8fdffd968262c6c /net-ftp/pftpfxp
parentFix up functor locking (diff)
downloadgentoo-2-23d8860952b507b1565849062475728506ccd50e.tar.gz
gentoo-2-23d8860952b507b1565849062475728506ccd50e.tar.bz2
gentoo-2-23d8860952b507b1565849062475728506ccd50e.zip
net-ftp/pftpfxp: Don't add additional optimization flags to CXXFLAGS
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/pftpfxp')
-rw-r--r--net-ftp/pftpfxp/ChangeLog6
-rw-r--r--net-ftp/pftpfxp/metadata.xml8
-rw-r--r--net-ftp/pftpfxp/pftpfxp-1.12-r1.ebuild19
3 files changed, 19 insertions, 14 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/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() {