dev-libs/libf2c: Fix long on 64bit systems, #468352

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 133 insertions, 20 deletions

diff --git a/dev-libs/libf2c/ChangeLog b/dev-libs/libf2c/ChangeLog
index 30106eb1e005..2e670e5a40e3 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.55 2012/11/06 06:33:37 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.56 2013/05/08 06:49:01 jlec Exp $
+
+*libf2c-20110801-r3 (08 May 2013)
+
+  08 May 2013; Justin Lecher <jlec@gentoo.org> +libf2c-20110801-r3.ebuild,
+  +files/libf2c-20110801-64bit-long.patch, metadata.xml:
+  Fix long on 64bit systems, #468352
 
   06 Nov 2012; Ulrich Müller <ulm@gentoo.org> libf2c-20110801-r2.ebuild:
   LICENSE is "HPND" according to Notice in tarball.
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index 8cb1186edc8b..09c82ab06e9e 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 20051004-add-ofiles-dep.patch 439 SHA256 3f688297b45515c1e386bb7f94ad36bf0f6a3497a0baff759b54d943cbec7d8f SHA512 f1453a782b593744cceaff2cabcd0aae605324ebfd0e66505d55c4483374e3845710d4c1a6b71c4939adf588466f55d6a5856cd97a8e1c52a751151e9c2ee409 WHIRLPOOL 055db6e8bc28fb186a0e0357e7bd45f919f715828dab90e0907879343d0f749999e1781b468c8014ee979070966c6465ba219843cbf687c00c9d706ddfaaf25b
 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-64bit-long.patch 1784 SHA256 919698643f12b2fc4b9f4ebac395a8b2c9c01e83028907621b95dee8db4d5653 SHA512 69f2553473b940ab78e185dc17b94513bca2cde4f9a32d60b09183d853096fbe6de2dfc8354d44cdaf04bf5852674d4f31b4a11c8c761c0c802694537156edb1 WHIRLPOOL dacdd83b8dfea14bf6af9c56031a34ae7809140ebdfae311fd947ea887648ebe12eb76b4e509edd5ca66d5ed74556db9b8538bb5d213fd06d322098a3eced516
 AUX libf2c-20110801-main.patch 1708 SHA256 1054e609ec311fe8f8da43d400e762e650bb37405676903b281eed5bdf59535a SHA512 f2c8574f45580d2bf99e5506266668c615f19a985ffa27eefe38d373f083da61dbe486d5c27e034bd38029b46a4a77285e175a7285b1acb37e7a1ecfea6a2bbc WHIRLPOOL 24aefb349f2db7d772fd773039a639eb819cd2be7159e443bb26f0e13929c0409c68f34917bcab09c9eec8a967ec77c4805705c529837028b5b344ff4e372d95
 DIST libf2c-20110801.zip 128845 SHA256 f13c01421e9668dc86c78159d87c2f802dd1f8e62037834285c7ab77200d97d5 SHA512 7a7b7b02ca2b11456aa0deba5094aebc1e9f7070d1742ad76450ec79de7eed967fbd7446524b66c52295ed911471d2dc396d171569b5d37079bdca8220fd2fb6 WHIRLPOOL 7bc8fa6c016dbb860863b39939f27f99156de017a2847764698bc0b5bbf21ff183e783991d6c5200ddba1b636e9a8bb93d560c00344db94b4e9a7b254abdafde
 EBUILD libf2c-20110801-r2.ebuild 1304 SHA256 f4353ea486dc7f33fa93e0734d175b3a59d764eca5e621c0b6f0f1ad9b45c0c8 SHA512 5d3fa807f24f82a083f9caea5a7a14706faa5949e8c8d6dea69c8a948c19d2c2285b6322c2d316e2e54cb43d2f32e7bbce04c6251b40307f15d9f03fd60b3251 WHIRLPOOL 64312bccc84f728cd372c96d2f216a5b5caf273cfd25d5464a14646fe9cec4e42dbedafed6c5cbc59715844ce3d0d4f7fa449eed711be816707a39f19a614cd7
-MISC ChangeLog 7565 SHA256 16f8e3d61ea71deb1dfec50647d8ad9a34a05fad510bd5d8798e2722cd1fc988 SHA512 bcbc5d954db1cc29039e2d730f90d2f5177c9d3037c785b0667abdca5183ed5004fa63fe203de197871205e6d02e04a3775552f232165749be4bc597f7124add WHIRLPOOL d397d595d5571ebee78bf0ae9d89d7a2cdb40051235c75b6b4f3485d1046e060454481940c345d3113364fbc89cef043fcd8eeed810daef7f8be5a59ae27ba22
-MISC metadata.xml 260 SHA256 6b9dd40f025c613f025b1e5de0dab2078995f5ab18980fa9125875ba6c879f3a SHA512 45625819f8bf0b29d88e67382cc9441e64e90974aa037d383609c5742fc367246450a1603f85384f75ff748d2040f382629acfd6a05bbd7022b8830873e1dbcb WHIRLPOOL bb66b3a2c5cafa5d02aa0507307f1f0926814b6fce31f40dceebf58ce3086c4d942eab815658863bb2207ed7afff3c23ea9f513518adda685cb32d994bb664c7
+EBUILD libf2c-20110801-r3.ebuild 1348 SHA256 aa5bed788a5aa62f170ca84b2756f8bbc1f7488ad64913f150a36e7bf404ceee SHA512 5763ba9436dab85e2a445f0d18d9459cc043e7dcc86d1514d8eb5a33f8791c6b712e7f6a01bda053c776f440f9af12a672302bf46dfc2f73fedd05592db90444 WHIRLPOOL 71526d85480e6b686942dc0df2ee7cf4d136bf40cc383e8cef1ba4c1a692e90ed12f90f96a83a84e34b877e8495d2327a034030e12e6b924abee83947b2004fd
+MISC ChangeLog 7771 SHA256 3d86744922cd361a1d5c3d8e7681546aa02c32848817bebaf9c298aa4ecd5579 SHA512 6a5ffdda97239223b9dcc9a1784890292b2c4d605ed87d258d22e8789558749d21b983d3954f1433a6f49cb76eb354b691381b95bb5cc4805366debaa5ba9357 WHIRLPOOL 1af5ef92cca0e93277ba38f4da6c0e210762d346884a685e7e865631a71bdc475bda783492c81c1217511af99b9a6fb9fa8ea0185a996aca474ff0ad3383d862
+MISC metadata.xml 262 SHA256 104aaf008a1e944d29258b95337ac85f5fe5acb142b0ecd7d182f78c4e4b51c7 SHA512 1fffa1f2d70400c79b48a40a884f2b4f7f85cc303de7913f3c48055e94157693d640eb58ff953416beebc043b2fcef61eec5a27e71dde48966e3cb8353e16c6b WHIRLPOOL 100e2b4fd2deeff7e2a0e95457845d65f44cc7881d23a2d49f3a4fafb38b5893d8b3abbc4939cb7543b40db98256fedc5c8c03b9f7fd92b150e158a83b6e8119
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQmK9jAAoJEDxpGckxwJCBzjUP/1SfD5JRVSexG0/bsMA5EVkd
-P6UKzM49R4VKTAfZgKYMzYxKSVXyVBYU42ZeBuW8fGLzAACbK01EUakxX2oalkR4
-qZ4dypYclf3OQkTJXtXSkaz5USWXghTDD7dSLkpyH0eAU5I4+503lJqlX9udxKex
-HJUfzULlk6SkYlbsPTBPhtmrQb3pKnBdmWlSDjQcTIrjK5nqK8aU5Zm8aKHhXBui
-MKz+DMksFcIxmH57ydsViW6PtYGv6ywsGLOTYjg1VmXhVGceJeilqHafmCEh7lOv
-edaU906M8n3+0dEM6+Gel9WZNxiCz7FGxDne+BBDWgzypY9SBiXj8mc01ctCwLg1
-dd6XoMxEIgmopOhS6WG90ovZOHDgE/9R3Sf5QF4gH/6o+lntQxBhc4Ve3Bdj0i/Z
-Gvz64G84Yetrgc5Lf+FhmJEuaSqWwUvCDSyAvGsc+HAtDwSSZ5znkykE6KSIWuhZ
-Q7qTvGhxYEd/XqvL1NoHvkKJYDw6KEVfVzsr9Ne4YPgkXdXdFdq6s1msUE2VyVY0
-gRGxPFWierbiUmohjUvh10US7rUpKipw9gjeGhs3hA7kjWDRRLHB8tMH2j8bEauI
-SPSHykEjgr3Rd/bCT5vsVJ+2cQ1CVc6tzaXJ0/nBFgsxMsGsxkncPgDzLo3mzL19
-YKI+xN811ha6VVnLFpHK
-=bzAw
+iEYEAREKAAYFAlGJ9V4ACgkQgAnW8HDreRYd6ACgpSd4+zpuz6IIcn+ZZI5WrKJk
+jbAAnRtWhNvEOGCgfr/19oQOTuoZJuhT
+=NqMz
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libf2c/files/libf2c-20110801-64bit-long.patch b/dev-libs/libf2c/files/libf2c-20110801-64bit-long.patch
new file mode 100644
index 000000000000..85687c5a4208
--- /dev/null
+++ b/dev-libs/libf2c/files/libf2c-20110801-64bit-long.patch
@@ -0,0 +1,57 @@
+--- libf2c2-20090411.orig/f2c.h0
++++ libf2c2-20090411/f2c.h0
+@@ -7,21 +7,35 @@
+ #ifndef F2C_INCLUDE
+ #define F2C_INCLUDE
+ 
++#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
++typedef int integer;
++typedef unsigned int uinteger;
++#else
+ typedef long int integer;
+ typedef unsigned long int uinteger;
++#endif
+ typedef char *address;
+ typedef short int shortint;
+ typedef float real;
+ typedef double doublereal;
+ typedef struct { real r, i; } complex;
+ typedef struct { doublereal r, i; } doublecomplex;
++#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
++typedef int logical;
++#else
+ typedef long int logical;
++#endif
+ typedef short int shortlogical;
+ typedef char logical1;
+ typedef char integer1;
+ #ifdef INTEGER_STAR_8	/* Adjust for integer*8. */
+-typedef long long longint;		/* system-dependent */
+-typedef unsigned long long ulongint;	/* system-dependent */
++#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
++typedef long longint;		/* system-dependent */
++typedef unsigned long ulongint;	/* system-dependent */
++#else
++typedef long long longint;              /* system-dependent - oh yeah*/
++typedef unsigned long long ulongint;    /* system-dependent - oh yeah*/
++#endif
+ #define qbit_clear(a,b)	((a) & ~((ulongint)1 << (b)))
+ #define qbit_set(a,b)	((a) |  ((ulongint)1 << (b)))
+ #endif
+@@ -42,10 +56,16 @@
+ typedef short ftnlen;
+ typedef short ftnint;
+ #else
++#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
++typedef int flag;
++typedef int ftnlen;
++typedef int ftnint;
++#else
+ typedef long int flag;
+ typedef long int ftnlen;
+ typedef long int ftnint;
+ #endif
++#endif
+ 
+ /*external read, write*/
+ typedef struct
diff --git a/dev-libs/libf2c/libf2c-20110801-r3.ebuild b/dev-libs/libf2c/libf2c-20110801-r3.ebuild
new file mode 100644
index 000000000000..470e76e93774
--- /dev/null
+++ b/dev-libs/libf2c/libf2c-20110801-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20110801-r3.ebuild,v 1.1 2013/05/08 06:49:01 jlec Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Library that converts FORTRAN to C source"
+HOMEPAGE="http://www.netlib.org/f2c/"
+SRC_URI="${HOMEPAGE}/${PN}.zip -> ${P}.zip"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
+		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch \
+		"${FILESDIR}"/${P}-main.patch\
+		"${FILESDIR}"/${P}-64bit-long.patch
+	sed -i -e "s/ld /$(tc-getLD) /" makefile.u || die
+}
+
+src_compile() {
+	emake \
+		-f makefile.u \
+		libf2c.so \
+		CFLAGS="${CFLAGS} -fPIC" \
+		CC="$(tc-getCC)"
+
+	# Clean up files so we can recompile without PIC for the static lib
+	if use static-libs; then
+		rm *.o || die "clean failed"
+		emake \
+			-f makefile.u \
+			all \
+			CFLAGS="${CFLAGS}" \
+			CC="$(tc-getCC)"
+	fi
+}
+
+src_install () {
+	dolib libf2c.so.2
+	dosym libf2c.so.2 /usr/$(get_libdir)/libf2c.so
+	use static-libs && dolib.a libf2c.a
+	insinto /usr/include
+	doins f2c.h
+	dodoc README Notice
+}
diff --git a/dev-libs/libf2c/metadata.xml b/dev-libs/libf2c/metadata.xml
index be04f37c8d6c..30770fe1c088 100644
--- a/dev-libs/libf2c/metadata.xml
+++ b/dev-libs/libf2c/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   A library to conver FORTRAN 77 to C/C++ source code.
 </longdescription>
 </pkgmetadata>