summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-26 03:52:01 +0000
committerMike Frysinger <vapier@gentoo.org>2008-10-26 03:52:01 +0000
commita2535a82b877d2f4520d5ac9155322d8640da186 (patch)
treea1576cb82468081bed55df3703a8ca4a32fe5921 /net-ftp
parenttweak output to make people happy with // #236268 by Pacho Ramos (diff)
downloadhistorical-a2535a82b877d2f4520d5ac9155322d8640da186.tar.gz
historical-a2535a82b877d2f4520d5ac9155322d8640da186.tar.bz2
historical-a2535a82b877d2f4520d5ac9155322d8640da186.zip
Respect env CPPFLAGS #234599 by jody.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/ftp/ChangeLog6
-rw-r--r--net-ftp/ftp/Manifest15
-rw-r--r--net-ftp/ftp/files/netkit-ftp-0.17-CPPFLAGS.patch15
-rw-r--r--net-ftp/ftp/ftp-0.17-r7.ebuild3
4 files changed, 35 insertions, 4 deletions
diff --git a/net-ftp/ftp/ChangeLog b/net-ftp/ftp/ChangeLog
index 32af91598ec6..cc96df96d887 100644
--- a/net-ftp/ftp/ChangeLog
+++ b/net-ftp/ftp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/ftp
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ChangeLog,v 1.33 2008/07/07 22:03:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ChangeLog,v 1.34 2008/10/26 03:52:01 vapier Exp $
+
+ 26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/netkit-ftp-0.17-CPPFLAGS.patch, ftp-0.17-r7.ebuild:
+ Respect env CPPFLAGS #234599 by jody.
07 Jul 2008; Jeroen Roovers <jer@gentoo.org> ftp-0.17-r7.ebuild:
Stable for HPPA too.
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 646a77a46eb1..6809135ab9af 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX netkit-ftp-0.17-CPPFLAGS.patch 272 RMD160 3ba2482f20ee501e22b5bd38968fb4a0b2f910b5 SHA1 5e46bdea8643b49b302886ec63b19c8b4180f098 SHA256 9663ef9e335b3c1b941a335f5cd05986f6d709a1bed186a4a6d23fab52888e8d
AUX netkit-ftp-0.17-acct.patch 419 RMD160 131d0f7f411a9317bef4a9489371499824dc1982 SHA1 a88683246d609d04d07c46befa154d2c05cb06f1 SHA256 c5a50791759b7f15c7743b8af9f233efa7765715044262f5220634b86a11bafa
AUX netkit-ftp-0.17-arg_max.patch 1444 RMD160 540cfc21a483b1a443af4c7bde1480c52c97da82 SHA1 7f62c80e162f0d5949238da733ffc600dbc613da SHA256 e38bd3d24923839b0409989063ec61753fe9c52e08ea4d3ec3f347c6103a46b3
AUX netkit-ftp-0.17-custom-cflags.patch 587 RMD160 97865bb90153947f22b99c7096f4aeccf77a2d2a SHA1 a85964284cc09f8c5b8968c9de7f74a55b8abb7d SHA256 4b29b8c788669a32eeb7e9adc9b86cae5917472d639fc0b7c8f607f7a5469dbc
@@ -11,6 +15,13 @@ AUX netkit-ftp-0.17-sigseg.patch 457 RMD160 339df1461663465326799be5b76ed6efc90c
AUX netkit-ftp-0.17-ssl-0.2.patch 29503 RMD160 53ca3a2cad782693d752550b2d8968a34d0ca695 SHA1 98774a2a6a34d6dd62e34ea9b5f471489adc52bc SHA256 7cd2f0c1f15d466ad6e382fe1c47b3b7d16186a3e57ef3bbb299351d0e7fba2f
DIST netkit-ftp-0.17.tar.gz 53934 RMD160 ff67bdd1f233e375f7c6e8853906edb0e3bb42a2 SHA1 815541a33bf02a43b5b41194389b8435e7890935 SHA256 61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349
EBUILD ftp-0.17-r6.ebuild 1540 RMD160 15c4dbdf7515fac59d671a6bc0e03ee8d1662d07 SHA1 f4f6cdea12add2531d98ec616b30b8c802eb1fda SHA256 f59c39e9d6c14dd3e52423299a2c676e86f44833758b4d84946934b73b5f7c3d
-EBUILD ftp-0.17-r7.ebuild 1659 RMD160 f25b60ef344ac431ef3e711ceb9a9d29491795f2 SHA1 d8467b555d878f91f9e59c57bf09cd9605e38fe6 SHA256 5eb9bfefdb84a4d628b4a563150bdd273f15165464521e8def6f75f12b830d7c
-MISC ChangeLog 5021 RMD160 1018de38966b833fe1978815bccec4bdc0b185b4 SHA1 9331cde2fc745f72ced24c0a078af2a627130bc3 SHA256 74c6d7bf0608b6b58e02bc6a353602acfb3684661d38bc34f68dc1059bf2cf83
+EBUILD ftp-0.17-r7.ebuild 1715 RMD160 f9329fe128e193074297a8435e6a72a99a77b810 SHA1 cedd9eeef65ab209261c54dc6264cfd3ea1a8653 SHA256 b865ced9fc67e3b785161b9f7c46c073d44fe7d606d9cd8cd69836b6463e04f6
+MISC ChangeLog 5176 RMD160 4841a5e6a38cc0a62e9ebb812d62dccea1b3ccb5 SHA1 c834aaf0baad38af1befd17635e15f50e71114a8 SHA256 a443cda6f9c8174e7ecc208222a833e52f78c75ebc9df69fc2d872d2c9b0c408
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkD6WcACgkQ67wieSYcaxcsVQCgrpb67wrtJO2y6EolPfaMtHvG
+nx8An2emwtXZFZRExy8oSbhDj/eXdDWc
+=cP5U
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/ftp/files/netkit-ftp-0.17-CPPFLAGS.patch b/net-ftp/ftp/files/netkit-ftp-0.17-CPPFLAGS.patch
new file mode 100644
index 000000000000..4a26c2a004a0
--- /dev/null
+++ b/net-ftp/ftp/files/netkit-ftp-0.17-CPPFLAGS.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/234599
+
+--- MRULES
++++ MRULES
+@@ -1,8 +1,8 @@
+ # Standard compilation rules (don't use make builtins)
+
+ %.o: %.c
+- $(CC) $(CFLAGS) $< -c
++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -c
+
+ %.o: %.cc
+- $(CC) $(CFLAGS) $< -c
++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -c
+
diff --git a/net-ftp/ftp/ftp-0.17-r7.ebuild b/net-ftp/ftp/ftp-0.17-r7.ebuild
index eeb3cd8a8af6..2f518ac1a4be 100644
--- a/net-ftp/ftp/ftp-0.17-r7.ebuild
+++ b/net-ftp/ftp/ftp-0.17-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17-r7.ebuild,v 1.6 2008/07/07 22:03:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17-r7.ebuild,v 1.7 2008/10/26 03:52:01 vapier Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -34,6 +34,7 @@ src_unpack() {
epatch "${FILESDIR}"/${MY_P}-custom-cflags.patch
epatch "${FILESDIR}"/${MY_P}-sigseg.patch #fedora, #199206
epatch "${FILESDIR}"/${MY_P}-arg_max.patch #fedora, #226513
+ epatch "${FILESDIR}"/${MY_P}-CPPFLAGS.patch #234599
append-lfs-flags #101038
}