EAPI bump; respect LDFLAGS (bug 337917)

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 40 insertions, 22 deletions

diff --git a/app-text/c2ps/ChangeLog b/app-text/c2ps/ChangeLog
index 3ee03e2d75cb..d8f17273b13a 100644
--- a/app-text/c2ps/ChangeLog
+++ b/app-text/c2ps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/c2ps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/c2ps/ChangeLog,v 1.17 2011/04/10 03:15:29 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/c2ps/ChangeLog,v 1.18 2011/06/05 18:28:24 dilfridge Exp $
+
+  05 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> c2ps-4.0.ebuild,
+  +files/c2ps-4.0-LDFLAGS.patch:
+  EAPI bump; respect LDFLAGS (bug 337917)
 
   10 Apr 2011; Jonathan Callen <abcd@gentoo.org> c2ps-4.0.ebuild:
   Add prefix support, bump EAPI to 3, add prefix keywords
diff --git a/app-text/c2ps/Manifest b/app-text/c2ps/Manifest
index 01cbe71ca44f..a7b8b36a942e 100644
--- a/app-text/c2ps/Manifest
+++ b/app-text/c2ps/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX c2ps-4.0-LDFLAGS.patch 342 RMD160 a1e34cadf540fcf621e4f1307c07d4234333f190 SHA1 57c7ee5bf959d7a71f2aa551264f7816af8413cd SHA256 dca0b51b7c1e790da7a475d213d886017c44b81671da189cf93a7d4bf103682f
 DIST c2ps-4.0.tar.gz 48137 RMD160 c5f23d3e34d7390d4cb0b0a6334103b1b8879812 SHA1 782f0344d941898a67806e04833d6be5a78ea526 SHA256 c22800552b6018a7f01978cf918ad11ec780404b3fa87888e76929a08414a860
-EBUILD c2ps-4.0.ebuild 762 RMD160 b9a2a7022f13846f56a55fd781a5610d2d4a2731 SHA1 875106e9a73853993aef71e6d3a53cc0810ff8cf SHA256 719e9dd3f3342b264446741b8ce569bbc9f9f7945ebda43649f56a32b6b142c6
-MISC ChangeLog 1893 RMD160 3da0d887f011bc23b2cd29a04897b5271b2f0af2 SHA1 b4f83e81eef58f271fa244ff481694f946c640a6 SHA256 f5256da5ead55e40e739d315d3b20a5102ab1bca77f9f9e5e1444e9b134f6e62
+EBUILD c2ps-4.0.ebuild 804 RMD160 2ee406121ce7550ed9895235ee42212106c01e8b SHA1 72da24674a90ae1f77f53db61304f3cce37632b8 SHA256 f7c0db4271730c432d9117cfe610b34594b606261b928c69381ced6281dbbe0a
+MISC ChangeLog 2048 RMD160 e3e59208a554e04fced4526a5c6ecf323bfb0661 SHA1 e946a98ac4ff329384b7934bbfa32445b5b741e1 SHA256 ea68f75bf547b222375756e20b898d9e8e3fef3575c73fc4c9fff4300f02c4fc
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNoSDXAAoJELHSF2kinlg4+6MP/1QRNBnNhx/NbShfiXjBwhzX
-h0ZL9Muwv72leyNHGgx9D3KUYIMmtcNTW1LbsD4glti/WpaLJo9/9FD6KOnFWwNv
-Efro3qR7/YethzV80T/SDyW2rujQrBP0/qQMP46biLu1qpK/zO6bA/U3BEn3BUFJ
-kaleI1DF+OiwG3BoDW/Ssw+/0j0J0KL9kPNrElkf7PUEZ+whdJ5LMbHKjcqjR2gK
-GkfowIN+IVioGQAd6UpdSP3HrtvRfeXr/UBcxLaPxKtL9BngIPLkk4PgZB2gxsNe
-YGJnMmkyT2s0ZOXdRXxWAxACkHeMVmdLzTeSt/mzU7MWvCkmMOxFA8mk0cl+q6r9
-KsD2CbftNH6tMSlnRzPL64raRXRVAyi5x6os6atM2Iw3hyUwZqwt1ByNsY7ASO5F
-sO0YNu38WMyExFlEsFPheaBb+Kn29MDujma43KA58BZkH7ZQeurcGNfVlxcUAFYp
-TbGPtMaj4EixuSDPLsY17ljdXubrfLZa29W6T2F27H+ReYsyblWjdrYvmJrqLdy6
-w4YcY9tp4UGtjS7I5zfu/rzFOhdkkWcKTN5ahraMBF7S3CX+GxJWnzEA6XhXy5sR
-5h+gYWqG0aks69gNWtvihcPJ1K4Z/naWlysyw0wV0UtohIDUJZe1KtZ0MVsPzY2k
-j+wX8TvCaoqDnctdwrz9
-=Kyh5
+iQIcBAEBCgAGBQJN68rSAAoJENwGBM22xffe1K4P/3kloBtItumCu5BYJjokoE6T
+/SfpJY+JM83MOpxCRaVEpwtDvC76850NBCjQ7sdlZuhheINbX9zFyc5c/WvVW2FS
+RX4a0TwfZ2Vgb7jiNZiCroILNFvOIQ822d6ELg3S3NejsOwpiOVf+3JMFvq+AGEe
+Ud6hLG0KYy6F0N3sdXwLhW1I+yVbnazh9NjpCuNIXH/dMxqPPLP5bOV49kzFJ9Yk
+kWAElvUrQumjnWMEAKdioxQ/ZORXXWAvQnmtY7S+1qSo7SwKAP3Mz5aVnH0aQoRZ
+ekYPYbfBd8DpeVmvKzpbFzIaB7UZ3OI08NGwUcZxT6uA59YJlB4CYJVSyLonpjIJ
+F4BTQPbGYHml4xm6qHNWRxhJC3Ik7tTZSNCbu57m4+52DD516YFOsOzmZe/bAG9u
+z1CIgkRmkZCHrpv9oAU5iZ02PY5C55WnM3NFfYJln7O6rc9ytwb45AIqBQA9Bn9K
+bVf2VDKTMXh8t+S4ugBYTzo7Vuwo64twSUgLunVxv0Dk917SByjF/+btgH2/K+dP
+jwYZXOsO0VAl17n+qYpnsYgFP50Uuqg5OCPOCFNKlE8C/gMPTNqpDKFoYLhs1efu
+1Vs9+I2AlP7H6yPF7EUabf+hYApmc1fT9NYWCmoza9hvQ9YUxE5/zJ+pHEf4CfvZ
+Q00rkJu66JYhuHVRtfJ/
+=hD2D
 -----END PGP SIGNATURE-----
diff --git a/app-text/c2ps/c2ps-4.0.ebuild b/app-text/c2ps/c2ps-4.0.ebuild
index 7dabf3a3387f..d7348f00df9e 100644
--- a/app-text/c2ps/c2ps-4.0.ebuild
+++ b/app-text/c2ps/c2ps-4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/c2ps/c2ps-4.0.ebuild,v 1.17 2011/04/10 03:15:29 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/c2ps/c2ps-4.0.ebuild,v 1.18 2011/06/05 18:28:24 dilfridge Exp $
 
-EAPI=3
-inherit toolchain-funcs
+EAPI=4
+inherit base toolchain-funcs
 
 DESCRIPTION="Generates a beautified ps document from a source file (c/c++)"
 HOMEPAGE="http://www.cs.technion.ac.il/users/c2ps"
@@ -14,12 +14,14 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-LDFLAGS.patch" )
+
 src_compile() {
-	emake CC="$(tc-getCC)" CCFLAGS="${CFLAGS}" || die
+	emake CC="$(tc-getCC)" CCFLAGS="${CFLAGS}"
 }
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man1
-	emake MAN="${ED}"/usr/share/man/man1 PREFIX="${ED}"/usr install || die
+	emake MAN="${ED}"/usr/share/man/man1 PREFIX="${ED}"/usr install
 	dodoc README
 }
diff --git a/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch b/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
new file mode 100644
index 000000000000..d68002180091
--- /dev/null
+++ b/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/c2ps-4.0/Makefile	1997-05-15 11:50:56.000000000 -0400
++++ b/c2ps-4.0/Makefile	2010-09-24 19:42:33.000000000 -0400
+@@ -45,7 +45,7 @@
+ 	install -m 644 c2ps.1 $(MAN)
+ 
+ compile:	c2ps.c
+-	$(CC) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c
++	$(CC) $(LDFLAGS) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c $(LIBS)
+ 
+ clean:
+ 	$(RM) c2ps *.o core *~