dev-libs/libf2c: Drop main.patch, #421975

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

5 files changed, 29 insertions, 14 deletions

diff --git a/dev-libs/libf2c/ChangeLog b/dev-libs/libf2c/ChangeLog
index e8b7146c480d..b485e17d14fd 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.46 2012/06/19 23:11:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.47 2012/08/31 07:04:31 jlec Exp $
+
+*libf2c-20110801-r1 (31 Aug 2012)
+
+  31 Aug 2012; Justin Lecher <jlec@gentoo.org> libf2c-20090407-r1.ebuild,
+  -libf2c-20110801.ebuild, +libf2c-20110801-r1.ebuild, metadata.xml:
+  Drop main.patch, #421975
 
 *libf2c-20110801 (19 Jun 2012)
 
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index d2e17b95d560..ab60dc262b59 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
@@ -6,7 +9,15 @@ DIST libf2c-20070912.zip 128622 SHA256 9403da6e0ea3f20012f351ff1525efd7fc0d696b8
 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 1538 SHA256 9de3bec9139fe958a8161745cc360301b5c47c598ad5156a1406708c2a9fa798 SHA512 fa9bc985e2fe950a8b42481cb304c8beb4f061313f68ac324a36c39103202bd9f3ad1760c9d572580b8fe9c77c611062c044884f020b426c0403d30f9b18b26d WHIRLPOOL 0b05a349ee40e13551ab80e8eba3cedb8d2b8841218a0c32c1ce35cceef00dc36800cc3df39e11060392de9941c1de073003dc97f3860c2f6c61580375d0d87a
-EBUILD libf2c-20110801.ebuild 1321 SHA256 dc695051b6cd27e90f0f61da746b7915b0c4ef162d0b06fc331909f2a7d9fc74 SHA512 d9c244f73daf598f5010b8dde0786f109ba8dbd5d4dcd41507112035d4ceb4edf50dd49917e484da460ce8ec030492f4321194a09025e2157d88841f60b3684b WHIRLPOOL 9a96863dfb117d6a94dd0522817d32acf3b7dd7310f175185962f409929e1c1182be236e5fe37051dfe6d349e2e5eed8d665b76a9f1acad08088cdaea9e9a948
-MISC ChangeLog 6339 SHA256 226f2242bc47cb0114e61b71224b77055137bca499f31930ac876346f01dd13d SHA512 6d7b8ae8ee73b9725b7a658a16a575d50bf573b76134c88470d91a3070d7b4cb45b8d392e671560091f68a89efdb181e43ba919c4ce0789ecf18d92318c7bb9a WHIRLPOOL 447524c7b1ea00c0b6017ded3fafa80bb6e5f3cb9931516140446a3b1d7b3218b563882b70c76f1fc27c1eabe38fae614a091c87363d33a3233e9427b6f281d2
-MISC metadata.xml 259 SHA256 05d1a09a6e14f3a19bfe19d6eddd1eaf647c7d238bb22f91c2f9cfd6f9ac8cd4 SHA512 08fc503c4b041b38071c98b57c3537c92a16d43bcc8c5a9f15d2e6386fad4569a097ad858f46848b178d960d28e0747e9dd426e19429d4d4811bbb1a83b35f9a WHIRLPOOL 34c8355bd6587d17407ae88b8bb6d9dde1838fdc97c94ad9fae73181f0845366b65210700576599d34bc411f8050241a3ab4262acefb6d4e06df2cb9902956c8
+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
+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
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libf2c/libf2c-20090407-r1.ebuild b/dev-libs/libf2c/libf2c-20090407-r1.ebuild
index d474f9849a5f..e29fd437b82d 100644
--- a/dev-libs/libf2c/libf2c-20090407-r1.ebuild
+++ b/dev-libs/libf2c/libf2c-20090407-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-20090407-r1.ebuild,v 1.10 2012/06/06 03:32:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20090407-r1.ebuild,v 1.11 2012/08/31 07:04:31 jlec Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -25,8 +25,8 @@ S="${WORKDIR}/${PN}"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
-		"${FILESDIR}"/${PV}-link-shared-libf2c-correctly.patch \
-		"${FILESDIR}"/${PV}-main.patch
+		"${FILESDIR}"/${PV}-link-shared-libf2c-correctly.patch
+#		"${FILESDIR}"/${PV}-main.patch
 }
 
 src_compile() {
diff --git a/dev-libs/libf2c/libf2c-20110801.ebuild b/dev-libs/libf2c/libf2c-20110801-r1.ebuild
index 1803ac570e73..0ab9ad1ad562 100644
--- a/dev-libs/libf2c/libf2c-20110801.ebuild
+++ b/dev-libs/libf2c/libf2c-20110801-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2012/06/19 23:11:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20110801-r1.ebuild,v 1.1 2012/08/31 07:04:31 jlec Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs
@@ -23,8 +23,7 @@ S="${WORKDIR}"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
-		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch \
-		"${FILESDIR}"/20090407-main.patch
+		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch
 	sed -i -e "s/ld /$(tc-getLD) /" makefile.u || die
 }
 
diff --git a/dev-libs/libf2c/metadata.xml b/dev-libs/libf2c/metadata.xml
index 5e648252d26c..be04f37c8d6c 100644
--- a/dev-libs/libf2c/metadata.xml
+++ b/dev-libs/libf2c/metadata.xml
@@ -1,9 +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>
-