drop old, update Makefile patch (bugs 457722, 457720)

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC

4 files changed, 32 insertions, 75 deletions

diff --git a/sci-mathematics/frobby/ChangeLog b/sci-mathematics/frobby/ChangeLog
index aad28cbd2391..6019f35edb45 100644
--- a/sci-mathematics/frobby/ChangeLog
+++ b/sci-mathematics/frobby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/frobby
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/ChangeLog,v 1.16 2013/02/15 19:08:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/ChangeLog,v 1.17 2013/02/16 10:01:56 tomka Exp $
+
+  16 Feb 2013; Thomas Kahle <tomka@gentoo.org> -frobby-0.9.0.ebuild,
+  files/frobby-cflags-no-strip-soname.patch:
+  drop old, update Makefile patch (bugs 457722, 457720)
 
   15 Feb 2013; Agostino Sarubbo <ago@gentoo.org> frobby-0.9.0-r1.ebuild:
   Stable for x86, wrt bug #457690
diff --git a/sci-mathematics/frobby/Manifest b/sci-mathematics/frobby/Manifest
index 2e3cfa29e9be..51935d761a30 100644
--- a/sci-mathematics/frobby/Manifest
+++ b/sci-mathematics/frobby/Manifest
@@ -1,28 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX frobby-cflags-no-strip-soname.patch 814 SHA256 d5c732b08d3ad4135644b7cf53b42ec9387d6b537e1175acc703798c982c9ada SHA512 2e6de0d19d09ed658ad4396512dddcf24875c7a54b52906043ba7f2600adb4dcdd300b978910620dac992893500fc4f0268eecea65d5083f6d92c84540d5ac77 WHIRLPOOL bfbaed85da81041b4a8fe66a73a0a6d09c27768443b9fbf07a1b6067e94e80216bbb911a04661c01086fa9e0102885449d1f865f85fa31286182355de41a8bdd
+AUX frobby-cflags-no-strip-soname.patch 1273 SHA256 61ebd2ba9b558ee6c9bd42ed160a2bbb633f59c9bc9f400cd4b37ead1a96982a SHA512 24387271eedb2955c96bd81235e5b425da1df475534522c3d474241328fd40937db4f4efa05c26cc1975d86c5165cbc3ded47f385b6359b46b018cf0d6052f1d WHIRLPOOL 40f392a36341d55f78db6d67cf6d702bb5111e16c1b02447ffbde11566e56fe45f69d8c00a68b17d0830eb8239374ded9d37bfeb888e142fe6859dfc3a4f9a81
 AUX frobby-gcc-4.7.patch 974 SHA256 a1d1092135ee699e2f7b84d45c5130fb8bc4ca996ad92747b9a21d06b35e5f3c SHA512 2e1895b16064cd7121145202f865b0b9ca1cdb3e5088d82f9f80c8a2fdc8ef4a76f734e326d8685465b06218eea1a502d48ee0e6dd51fe92965bc3f8830fc13f WHIRLPOOL 36b02e227f23613a61b3338c9ab9b705a13a45977226cc67725708ae907a552f54907173d537ba029fc0fe49f8021ca4af0b88da902b1cee9f84723bbc468ac9
 AUX frobby-gmp-5.1.patch 482 SHA256 d3d95c47a46c5ac82f5a12e55cc568fa5a2a946cfabd31376ac3a001f3911695 SHA512 a0e113c8a7c25c442a13425baf3fd3259ef48dfa67db25dcc1c87c9a2b1d2453d7daf9778a7c46ce9298db4f59177b63b7811eb4085f206c5a73e538488d174b WHIRLPOOL 5c2b39823ca4a5860c3b126a69137522ee6a38fada93232b74f1789846913bdefdd5101da8b2d9c19393e677e51473bbadce80561f939cd8d19fb125dbb8d4cb
 DIST frobby_v0.9.0.tar.gz 852524 SHA256 af092383e6dc849c86f4e79747ae0e5cd309a690747230e10aa38d60640062df SHA512 b1f64d7a8630ba7f5464e36f66a06a7a7909bc42f2e52898b2967b8ad6288da8ce11a5d79ebfbbfe2f3933930ad26444173f721465ae9a42b6dcf3eef7ecc59e WHIRLPOOL f02c6c794c214c047ae6e1d764b0a29a87be1c080e8ac7489aedb1394a90169f8dc5bb6447c961760a35ba2af90c34ed9bb8e282590d0d05abe791aff7473025
 EBUILD frobby-0.9.0-r1.ebuild 1403 SHA256 b477f62cfa099e01e52bb01d26b4bbe099df1a92a2a01a230822954be11e0c26 SHA512 b33d31dd3aa7b9e7378a79789fae460e4c67cc38f490dd4749f1b375a080f3f45f1b6fa07ddef51f713b06e2e87f76b355a7abd4b620fe79d53daebc630ce848 WHIRLPOOL 13b2a1cbe99ffa4adc3e1e1e5fc1bd05a212e002e89fb899ba53222f49fb2e69a8009f07420cdda8a48c3244265ca9363b662bf517a60f581cb8f6c09e917ea3
-EBUILD frobby-0.9.0.ebuild 1364 SHA256 a80d0b7eb1fc5886c4baabf140a40b9b9300262a91e2da89a26ff65c1e5086be SHA512 00dd1be5ef5dd3f95110e8adeed3e4fdc5a8bec1fdf068d67c00980525779d08f847f0a8c43ec65d001049122936b37cccd5fa67af7cbceea55e13702e280161 WHIRLPOOL c183dfb9ba37a544b23d19d8cfdcdc38fe2fb85bed4fb066f7d8d49914c4db78eeae42eabe2728065a71d969e32cf2044e4acc56b0362905f8de05089ba736c8
-MISC ChangeLog 2405 SHA256 14b41280a68258472396c8c9ab17d524d581b0b03b93bcee9ca3abbbb52eb2be SHA512 6c71c0f3f3c4f183c30e4e7b39659e0de5101bcf35357b3d7cf8aa281eff238a107f1be94af4db103a44431ae69f4c67d2dda5ce6c3131fc7fe71b62b10edbfb WHIRLPOOL 1e80885de929f67619903eb17f9915dc70de3c2649f6cb5a3d86f6514a387fa872d178363ec6500ae54c83a5913f375103b22c1db0670f6641e14013cedde67d
+MISC ChangeLog 2578 SHA256 6e0d1138061f99fba9535487a736a0be4eed2da775b0bb12e4f450e653eb4ba1 SHA512 11ab9adfd131c7a3474a129eb25765b4e67e410794a35978fd867e59cb224ace46d50d742bb4c30a09e6c501674a5aace9749058b769e2ca6b9fbce82da8d131 WHIRLPOOL a57765b3926d0bd228a4de0f85df9338434453fd2c385490181dec8b09ab59c9087a84cbfc169f7124c91c9a26b10309cedbed714de2380f437201483c722769
 MISC metadata.xml 376 SHA256 249ebafb8418fd86ca73f59e39bbf60d393b7f0fa3e9f918871e18dddc9ca339 SHA512 180e27f7e92b29029218ca223f6d00ede0aa3300bee10ada745b3fb261fc8ee78df61b126280d7af9643380b1ec110a43b9f189b6263a3a053ea8746e9cdf6ea WHIRLPOOL 9be1fdb91d9985d1de3578ad080fc25ccf096314a1c384ddc542d56073cbf7bbeda020e3261e58e3a5a8b60b28042af11acae841df1758213336f8dbe9093305
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRHoeVAAoJELp701BxlEWfBloP/ix/HF47WC3MRzYXJ5QVEcsJ
-cXYSMiopTdUWJbIYJMlozCi8dbmTvO0JBcOnmAMJ2ZiPHB62Tmc9iSZ4s6LordU1
-qec4vwNwBUMW3h7k8xYorH1t7BRMU1nLdGAhno3GHrO4pFONpwSjl4nfabsoUA3H
-6EHFegmA/S2Tu6DX/DHF2Qn45swAE518bUoOADwfn1PSNRmxiFM2oqqPkKqU0DUk
-ORZ5LzzZ7plcrjIOeGIRt6J31RVMS8yGVEa0SkK76NzE5XIIg4sIx0LTnjpE8y0T
-WZz/rDQTUZgdLs/dy1QMMhTmm1Z8zowG0Ai0rDFQDDh9MM+m+9Pqb0kyHkJE8B02
-9dXoe+d9fL3Q/eBOokzUrRdtCG9AJO/2pY+ydT8PKGlbM726Qq/podTisFuJfjZF
-XCHU5BF8tK7/DIWzjwmAWD+8TPByfA+0t5JIXZwtxq0XQ4GIN9gUWbsIffWxPtWY
-r7EYu/PcRamsffIiw0DkKwxcD76lcHr0mDTyZ5UD+G+AthUujmpJyhOpxJ+6SylB
-CfN3Zhk+EWCrDk3kd4wa0yNGKNPoeJ8SzVPC0EPx4pNUNksMdX5Yaa86UyBW6p+A
-kQD6Lw2Gk0GxgtL+LyQp9/pflaDnmy+wDpv4FJPnRTdFIT9KXY04wVc6+SWVcoBt
-h+6ruZ4mJkD8DnuyiBA+
-=t++U
+iF4EAREIAAYFAlEfWRcACgkQid6yGVZcMrxJyQD/fNAK5HAuID27VdvzvFZex4iQ
+ECht4gBLCH/GgwunUEUBAJ8C8IQXBMQ68hD7NLhtj+9VgGhqN6q2JBw09eC/41z0
+=0dCJ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/frobby/files/frobby-cflags-no-strip-soname.patch b/sci-mathematics/frobby/files/frobby-cflags-no-strip-soname.patch
index 48e504f95815..2f5721d62a71 100644
--- a/sci-mathematics/frobby/files/frobby-cflags-no-strip-soname.patch
+++ b/sci-mathematics/frobby/files/frobby-cflags-no-strip-soname.patch
@@ -1,6 +1,15 @@
-diff -U 3 -dHrN frobby_v0.9.0-orig/Makefile frobby_v0.9.0/Makefile
---- frobby_v0.9.0-orig/Makefile	2012-07-30 14:19:58.161584356 +0200
-+++ frobby_v0.9.0/Makefile	2012-07-30 14:21:36.796558990 +0200
+diff -U 3 -dHrN frobby_v0.9.0.orig/Makefile frobby_v0.9.0/Makefile
+--- frobby_v0.9.0.orig/Makefile	2013-01-15 22:40:13.127937655 +0100
++++ frobby_v0.9.0/Makefile	2013-02-16 10:54:42.265322522 +0100
+@@ -70,7 +70,7 @@
+   BIN_INSTALL_DIR = "/usr/local/bin/"
+ endif
+ 
+-cflags = $(CFLAGS) $(CPPFLAGS) -Wall -ansi -pedantic -I $(GMP_INC_DIR)	\
++cflags =  $(CPPFLAGS) -Wall -ansi -pedantic -I $(GMP_INC_DIR)	\
+          -Wno-uninitialized -Wno-unused-parameter
+ program = frobby
+ library = libfrobby.a
 @@ -87,7 +87,6 @@
  MATCH=false
  ifeq ($(MODE), release)
@@ -9,6 +18,15 @@ diff -U 3 -dHrN frobby_v0.9.0-orig/Makefile frobby_v0.9.0/Makefile
    MATCH=true
  endif
  ifeq ($(MODE), debug)
+@@ -99,7 +98,7 @@
+ endif
+ ifeq ($(MODE), shared)
+   outdir = bin/shared/
+-  cflags += -O2 -fPIC
++  cflags += -fPIC
+   library = libfrobby.so
+   MATCH=true
+ endif
 @@ -204,16 +203,13 @@
        mv -f $@.exe $@; \
  	fi
diff --git a/sci-mathematics/frobby/frobby-0.9.0.ebuild b/sci-mathematics/frobby/frobby-0.9.0.ebuild
deleted file mode 100644
index 4aa0682a4fec..000000000000
--- a/sci-mathematics/frobby/frobby-0.9.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/frobby-0.9.0.ebuild,v 1.6 2012/07/30 12:28:16 tomka Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Software system and project for computations with monomial ideals"
-HOMEPAGE="http://www.broune.com/frobby/"
-SRC_URI="http://www.broune.com/frobby/frobby_v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="dev-libs/gmp[cxx]"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/frobby_v${PV}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-cflags-no-strip-soname.patch" \
-		"${FILESDIR}/${PN}-gcc-4.7.patch"
-	# CXXFLAGS are called CPPFLAGS
-	sed "s/CPPFLAGS/CXXFLAGS/" -i Makefile || die
-}
-
-src_compile() {
-	# Makefile uses the value of CXX which may be defined in /etc/env,
-	# breaking cross-compile.
-	CXX=$(tc-getCXX) emake
-	MODE=shared CXX=$(tc-getCXX) emake library
-	use static-libs && CXX=$(tc-getCXX) emake library
-	use doc && emake docPdf
-}
-
-src_install() {
-	dobin bin/frobby
-	dolib.so bin/libfrobby.so
-	dosym libfrobby.so "${EPREFIX}/usr/$(get_libdir)/libfrobby.so.0"
-	use static-libs && dolib.a bin/libfrobby.a
-
-	insinto /usr/include
-	doins src/frobby.h
-
-	insinto /usr/include/"${PN}"
-	doins src/stdinc.h
-
-	use doc && dodoc bin/manual.pdf
-}