dev-libs/libf2c: Adding new main() patch, #421975

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

4 files changed, 50 insertions, 8 deletions

diff --git a/dev-libs/libf2c/ChangeLog b/dev-libs/libf2c/ChangeLog
index b485e17d14fd..e96db79a0d13 100644
--- a/dev-libs/libf2c/ChangeLog
+++ b/dev-libs/libf2c/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libf2c
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.47 2012/08/31 07:04:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.48 2012/09/04 07:09:31 jlec Exp $
+
+*libf2c-20110801-r2 (04 Sep 2012)
+
+  04 Sep 2012; Justin Lecher <jlec@gentoo.org> -libf2c-20110801-r1.ebuild,
+  +libf2c-20110801-r2.ebuild, +files/libf2c-20110801-main.patch:
+  Adding new main() patch, #421975
 
 *libf2c-20110801-r1 (31 Aug 2012)
 
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index ab60dc262b59..4333ca40df8b 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -5,19 +5,20 @@ AUX 20051004-add-ofiles-dep.patch 439 SHA256 3f688297b45515c1e386bb7f94ad36bf0f6
 AUX 20070912-link-shared-libf2c-correctly.patch 356 SHA256 23e36c6802d29bdec559b59fbd9713f21a28896307647149601a99767c4c58db SHA512 1945777eb827aacc65f3ec1c325f640dc99f2c2d14aed62aa01009ce8c2519409dd91c43e8a74702d84cc0b4fca3cc8a40579e6cc0de8f8e696abad33dc45b05 WHIRLPOOL e6a2f4cc4003da3d5fcc65339c0369f5530afb6159de094792c627da0f13a27a316254ebbd75a4039d0bd8dcc629331b47ef542deb02a23842afb6fb9c75809b
 AUX 20090407-link-shared-libf2c-correctly.patch 358 SHA256 28e04d4fe1279ad37fba92f1fc9acb3110778a02f4c15da6b659b04baa3d2df0 SHA512 6edc5e0d418b4d87597c696623aacf1b15a526b2f2739726220b6302f3ad444bf01ebcd672f7ae40698f0e524d3019decad751490f38c1b2f32d2fd943df8a72 WHIRLPOOL 97592dd5af100647a4bb82b4254cb0f212b25dad40f599d8acb069fba6432989b30f12d0b56e16aa9e73b96977d4e5dc6ffbaa0a12aa419651a799abae948c63
 AUX 20090407-main.patch 242 SHA256 66e666adbcc5362b8cc31776932ef3e572811a1dff8700cac8a73cfba482c832 SHA512 f04394cb2d4ceef15c946438e7f8283a1b6ae23b7e77fc75093e503de4cb40045b04190aa952346a2e5e3aacff3fd30dccd38e72e16fd853e798805cd9661359 WHIRLPOOL 7e2664ae2436aec1a26d591abbe12ccbe65bc53aad55eaa64c416906bc2d0be85651da6e491748d0c72e20c193d6d11c62f2dfe0c9c04e95e5f4b134c1941c82
+AUX libf2c-20110801-main.patch 1399 SHA256 81ed26bcd2779915c913867b0251887a6f8403d258c6f382e8c8d85eee5865c6 SHA512 c2bd99373f6f873fb50584315ffe5a58992eda558f3f44c0c1de3fb3428f383cb7d6729e87f62008a5bea0992e2156eeab981b2b0ea061c32182f3b47e5a3fd6 WHIRLPOOL f949f2c927da060cd5a097b7cae1ab342660f26c77bfd8d705a44f29e22bd7c134c470790229e8f71784db6a0765e36d9de49a9e6cce8b68348cc59e700d8161
 DIST libf2c-20070912.zip 128622 SHA256 9403da6e0ea3f20012f351ff1525efd7fc0d696b82ab7219f711f21e73d09ec0 SHA512 54a263353db4489d9f62c108b748f8e7c6da2c668ab89d40a5d3772d7427009ae90269b3c39e2f564c38c92603c4814ad65d07bca370deaab5f478325e095fe5 WHIRLPOOL 3d1fc1629059abac62a60c927e573db6b83b2fb4b81638a1e8283622f15cc1195d2a3a763e13bec4abd31725084fc91668dd5344f88322b395bd981c766fb4c9
 DIST libf2c-20090407.zip 128822 SHA256 5b3503d1560f0f12649baa94ad5ce8ff7e363ca3507c10bfc4afc8cfdb07fe92 SHA512 695bcb57026e986b203fdfacfbd6fee24251f37ff937d035b5bcfa9a46a3fb46ab0bffdcfbe24299360fd2a3247a5e5d3f4dbd3ab99326cbd16b77f59d130282 WHIRLPOOL ce03a18b0da5482c55206dffa88d1802e9d2e4ab6234ac5ee9bbd27d88433929b912675942a9838c4b94e2b24e2bc0956fc3a088e4e65d4e8f736ecaefc66fef
 DIST libf2c-20110801.zip 128845 SHA256 f13c01421e9668dc86c78159d87c2f802dd1f8e62037834285c7ab77200d97d5 SHA512 7a7b7b02ca2b11456aa0deba5094aebc1e9f7070d1742ad76450ec79de7eed967fbd7446524b66c52295ed911471d2dc396d171569b5d37079bdca8220fd2fb6 WHIRLPOOL 7bc8fa6c016dbb860863b39939f27f99156de017a2847764698bc0b5bbf21ff183e783991d6c5200ddba1b636e9a8bb93d560c00344db94b4e9a7b254abdafde
 EBUILD libf2c-20070912.ebuild 1393 SHA256 3a42e26e7e5a5e59e47cbc024e2091954e89021f27bf8f18aff62b2f9345bf63 SHA512 1b1f29505320d490b9af0a6436d35ae77e77ec7c419e43a0cb31b4fc811d6580afd8f92f32daa6a9f470e450ab169d7b3cdfd888d0eaf4f7c32038135c28c23b WHIRLPOOL e178c0f046e8f2b7300daa2e9427d9ce8ea716ed411a70bb2b430c9e329cc92186b4ed4f0513d0ee111f31569ce701c0e3e6780dd29629424e7b1428dcf2aa48
 EBUILD libf2c-20090407-r1.ebuild 1534 SHA256 1310d08979f6d1fd2dcc85903901edb450ef13ac3ea013ef435bea2cca193cba SHA512 19a72a992d76ce865730685214dbca5e515d10f8bbe3bcabfe378b2056c6358be9d3134a23a4a143a61c381e302e02ddaf0875a655877d1c02c7e21fd67cd3e9 WHIRLPOOL e43dba0604b49dfc5826f74477a77851c4793e443b149061d86715bfc233ab6f45822f8b177c1896feb5459030eb55bbe50e4eed38f6cbff4977b606a00cb243
-EBUILD libf2c-20110801-r1.ebuild 1282 SHA256 3758697320e5b614bab320daa94fe9144f2ac7624a3266c7485de633de9cf0d4 SHA512 c4612f50fd8d2bbba39cedb38cced38e226a4e03e044426f1d0d35a25c06dfa9cfdbb192d6322083e426a95c8a99ab82ca10cbcb3baa961b93fc73361a061ceb WHIRLPOOL 357f58e80b612aeafd11734735c309434c201e3c95783c0ca73a1532290e94a0e1aacfcb983c207b435a70e68ef737749a662c3526343deb591351122cc2eba0
-MISC ChangeLog 6541 SHA256 ce4a754d88ad16082a9057d2fd557783e223d7768426fa58d40ab10bdb90b95c SHA512 03d8a7a59b07c9139a0f8f35aba4027607ff59af0ecad7a7f82c7b0f0eafc16adf7d9879a9eaa1c42d2a996bf6d4b34fa4af50df6e473f370826484311112c66 WHIRLPOOL 672a6c295a572bd17fa0ebcc45fca9fd41ae702258d600bf9744daf71a11a4ce826633417efe515be73eeb36826099f334de9a9de085890172a19a68013efaef
+EBUILD libf2c-20110801-r2.ebuild 1317 SHA256 1d2b252cce6e832d92a489551ad4eb00db347aa4f11a9a12125d022192c8a7a2 SHA512 1d35eec462ee248aeb86295db72e0c08f020d6f92101c48f995c19e59ed416936e8a72857272fb1cc6e631313a998ccbdb26b59da937e57da9fbdcb8760bd7fc WHIRLPOOL 273ec40bf8e87e07d8b46426a4c4c0037311883f3f10076c799165c838b52d9223215ad478e7386a1d128cca6fbc4b1db39bba9185e4ebbe2ac7e59f162b574d
+MISC ChangeLog 6752 SHA256 98b0dfc1b1a9c65417f1a8e2d0d041f2b9b7a98d4d53a6ce690d5dd371793adb SHA512 ddc1c6a1b300bfe5cd13eb458d039c64abc124006976055f3c9147b475cc23797545bf4843885a5a13d7bcc316d5edd8ee932f99177f59a4d8143e24ad6f6784 WHIRLPOOL 32d2b49b8f5942288245b94bb3671f1291faa1fbc2ab9c6f28f71bac4c5f834db8e045183bc12054beca608d23b4dba0b33f3ea16fb3001a9ba65df685c8ac60
 MISC metadata.xml 260 SHA256 6b9dd40f025c613f025b1e5de0dab2078995f5ab18980fa9125875ba6c879f3a SHA512 45625819f8bf0b29d88e67382cc9441e64e90974aa037d383609c5742fc367246450a1603f85384f75ff748d2040f382629acfd6a05bbd7022b8830873e1dbcb WHIRLPOOL bb66b3a2c5cafa5d02aa0507307f1f0926814b6fce31f40dceebf58ce3086c4d942eab815658863bb2207ed7afff3c23ea9f513518adda685cb32d994bb664c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBAYgQACgkQgAnW8HDreRbDvACgyGbUyYorCu0aYUWkjsULznE2
-TRsAoIzaXdyMTnQ16YCVlPkWxyBSYDZu
-=5yXy
+iEYEAREIAAYFAlBFqTAACgkQgAnW8HDreRYAsgCgxvMqP50XXp+IIgNbnIgvRwX5
+8A8AoLONd+wGaNlcCj+7OWhoFZukMu8o
+=5Cji
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libf2c/files/libf2c-20110801-main.patch b/dev-libs/libf2c/files/libf2c-20110801-main.patch
new file mode 100644
index 000000000000..4026db6eff77
--- /dev/null
+++ b/dev-libs/libf2c/files/libf2c-20110801-main.patch
@@ -0,0 +1,33 @@
+--- a/makefile.u
++++ b/makefile.u
+@@ -27,7 +27,7 @@
+ ## If your system does not have the x86_64-pc-linux-gnu-ld command, comment out
+ ## or remove both the x86_64-pc-linux-gnu-ld and mv lines above.
+ 
+-MISC =	f77vers.o i77vers.o main.o s_rnge.o abort_.o exit_.o getarg_.o iargc_.o\
++MISC =	f77vers.o i77vers.o main.o main_foo.o s_rnge.o abort_.o exit_.o getarg_.o iargc_.o\
+ 	getenv_.o signal_.o s_stop.o s_paus.o system_.o cabs.o ctype.o\
+ 	derf_.o derfc_.o erf_.o erfc_.o sig_die.o uninit.o
+ POW =	pow_ci.o pow_dd.o pow_di.o pow_hh.o pow_ii.o pow_ri.o pow_zi.o pow_zz.o
+@@ -206,7 +206,7 @@
+ 	i77vers.c i_abs.c i_dim.c i_dnnt.c i_indx.c i_len.c i_mod.c \
+ 	i_nint.c i_sign.c iargc_.c iio.c ilnw.c inquire.c l_ge.c l_gt.c \
+ 	l_le.c l_lt.c lbitbits.c lbitshft.c libf2c.lbc libf2c.sy lio.h \
+-	lread.c lwrite.c main.c makefile.sy makefile.u makefile.vc \
++	lread.c lwrite.c main.c main_foo.c makefile.sy makefile.u makefile.vc \
+ 	makefile.wat math.hvc mkfile.plan9 open.c pow_ci.c pow_dd.c \
+ 	pow_di.c pow_hh.c pow_ii.c pow_qq.c pow_ri.c pow_zi.c pow_zz.c \
+ 	qbitbits.c qbitshft.c r_abs.c r_acos.c r_asin.c r_atan.c r_atn2.c \
+--- /dev/null
++++ b/main_foo.c
+@@ -0,0 +1,10 @@
++#include <stdio.h>
++#include <stdlib.h>
++
++
++void missing_MAIN__ (void)
++{
++  fprintf(stderr, "The Fortran main program is missing.\n");
++  abort();
++}
++void MAIN__ (void) __attribute__ ((weak, alias("missing_MAIN__")));
diff --git a/dev-libs/libf2c/libf2c-20110801-r1.ebuild b/dev-libs/libf2c/libf2c-20110801-r2.ebuild
index 0ab9ad1ad562..a655c9948328 100644
--- a/dev-libs/libf2c/libf2c-20110801-r1.ebuild
+++ b/dev-libs/libf2c/libf2c-20110801-r2.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/dev-libs/libf2c/libf2c-20110801-r1.ebuild,v 1.1 2012/08/31 07:04:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20110801-r2.ebuild,v 1.1 2012/09/04 07:09:31 jlec Exp $
 
 EAPI=4
+
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Library that converts FORTRAN to C source"
@@ -23,7 +24,8 @@ S="${WORKDIR}"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
-		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch
+		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch \
+		"${FILESDIR}"/${P}-main.patch
 	sed -i -e "s/ld /$(tc-getLD) /" makefile.u || die
 }