Fix bug 518000 (thanks Alexander Tsoy), remove old.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 12 insertions, 49 deletions

diff --git a/sci-mathematics/4ti2/4ti2-1.6.2.ebuild b/sci-mathematics/4ti2/4ti2-1.6.2.ebuild
index ae9f9f0fb1f4..0323d702e14d 100644
--- a/sci-mathematics/4ti2/4ti2-1.6.2.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.6.2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.6.2.ebuild,v 1.2 2014/07/18 12:27:10 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.6.2.ebuild,v 1.3 2014/11/14 09:58:13 tomka Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=true
+AT_NO_RECURSIVE=1
 
 inherit autotools-utils
 
diff --git a/sci-mathematics/4ti2/4ti2-1.6.ebuild b/sci-mathematics/4ti2/4ti2-1.6.ebuild
deleted file mode 100644
index c530ff4b6116..000000000000
--- a/sci-mathematics/4ti2/4ti2-1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.6.ebuild,v 1.1 2013/09/11 21:34:48 tomka Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
-HOMEPAGE="http://www.4ti2.de/"
-SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE="static-libs"
-
-DEPEND="
-	sci-mathematics/glpk:0[gmp]
-	dev-libs/gmp[cxx]"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.2-gold.patch
-	)
-
-src_prepare() {
-	sed \
-		-e "s:^CXX.*$:CXX=$(tc-getCXX):g" \
-		-i m4/glpk-check.m4 || die
-	autotools-utils_src_prepare
-}
diff --git a/sci-mathematics/4ti2/ChangeLog b/sci-mathematics/4ti2/ChangeLog
index f993b8cc0d32..0eb8207dfe99 100644
--- a/sci-mathematics/4ti2/ChangeLog
+++ b/sci-mathematics/4ti2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/4ti2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.16 2014/07/18 12:27:10 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.17 2014/11/14 09:58:13 tomka Exp $
+
+  14 Nov 2014; Thomas Kahle <tomka@gentoo.org> -4ti2-1.6.ebuild,
+  4ti2-1.6.2.ebuild:
+  Fix bug 518000 (thanks Alexander Tsoy), remove old.
 
   18 Jul 2014; Chema Alonso <nimiux@gentoo.org> 4ti2-1.6.2.ebuild:
   Stable for amd64 wrt bug #511442
diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index 9774db3e0f9e..2deae3d4de34 100644
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -5,20 +5,14 @@ AUX 4ti2-1.3.2-gcc47.patch 17244 SHA256 b800834f1736e53dea2798b7ddaf407dfc8152fc
 AUX 4ti2-1.3.2-gold.patch 652 SHA256 50ebe74bb3fc8c0863a12823e52f4dc9d1fe7ab6e8674d53453adb5fd8460601 SHA512 60b14d7b287b69adbce420f37dad5d83ce21bfa4329ea0810c67f054d35a71f6795b0a8206b268ec9cfa08f796a4cd80a34d816c691e8e3e77adcbc5217b43a7 WHIRLPOOL ac0358e169846be7ac75380d69752f24b8bd5e9a68e4ad59abc840fcf86c6998f76df37888cf305ab2c4bf8b96dd2ce566f13a434f0522f377f8feb337b1e22b
 DIST 4ti2-1.3.2.tar.gz 4658600 SHA256 30f15696105b5cfa0784d2f7f9a310ef67d616d2367e064c85ba36ec9a20a066 SHA512 f5d76ed8405e34d2d27138343c59d32bc212528491e89e996bfc54e9a5ebd67eeb63b2a606b5e94c16ed83df1ea96e78346f16d9d432e2a28cd39aff807b8687 WHIRLPOOL b7aa50b94ff4cdd3237ee965c72a2f6f36c6cb7e8b0bffcdf00c45e93f49c224348336b3e12615bf8bfefda4429a8fc98593b08c94712ad5ed2100ed555eb3b6
 DIST 4ti2-1.6.2.tar.gz 5531651 SHA256 e1b39c5c051904e41deefce5419b16d723b1f403c616ddd6e3610e260d4b5711 SHA512 ff68f767b8677ce0ce94cca39fa3ef87835d77a951f0ec6ae28ab171bf09ae25c551d88c2cdf5bf3115b33bd32366b063533a1c22576130a00f542f9370bcd7b WHIRLPOOL f125cee526f8d2693b01978fd39cc36c900e7611ac0b8026f33c68ec8ccb0bb29cdffdf5c11adc6a5f7041389d34e6cacff173437c4be725c9b390a25e24e397
-DIST 4ti2-1.6.tar.gz 5556747 SHA256 5edd106a3584408d89c58cb432f8b08eec472aa3277a35928523cdb4e43c769e SHA512 5e4be6e592853f4512bce5eb45ecc150f8fd928f2b16a447a5f246e66eae47007c0a1926fcfb2f0be809c3a0fd1e3fc5c7ced193290f7201223366c07d582510 WHIRLPOOL 79b7b1dc5600d7bacb1e62ad972c5ce421d2e9d93b9ce7290e5f29ce66479a151e36797cce857a7196d5d771d82f9417a098e4da1e2fb36e2ad47eae0a1d67c9
 EBUILD 4ti2-1.3.2-r1.ebuild 830 SHA256 6e0f0f52285bbefb549456cc43b9230fb84756e9ce83705ec6da7b4f0b86045b SHA512 781520d44106459a06e27a619d0ad60573f9f5c70a6bf7a68b6731a2e49480b36527609760cbf56500f54bbf0a9cd24ded573219eeacaec7678317df7a3ce314 WHIRLPOOL 15171efd854ab620b1b44781ee93aa94d331f5ca8e44b888804e90aac10a8323643e574dff6290f05b669be237d2578d3b30312689620ced47a4c1a3feae060f
-EBUILD 4ti2-1.6.2.ebuild 806 SHA256 0d5b5818840f2484d086a2a87405ccf48fcc31cdbb048289806c07830a70550c SHA512 80a8102e8cddc815c93b9b9ad56e340573dfee14bc4f92afaad9b471505960d7335045424720e9ba49e7add3b9b42af935a4ec7e30c76f1ef9fbcf1fe4370397 WHIRLPOOL 685239075f420ad76b6a1d6f69c087aba49d8b3c95495aa89d4b0c2c936ba68ac6b0885f34904ab914cb0615179d56aaf2ad54ffdef6ebc4ef08ae611aefc24a
-EBUILD 4ti2-1.6.ebuild 804 SHA256 c6bc64bf2b1bd83ccf0c83859f749e5023bf5f5782dc488a74c7a09b17fc67b4 SHA512 6bac4c6ffaed329a5a02b34313ae0919fa49310845dc7f76aaa225bab474968018e62ab4c2d4f0f56ab6d53824f58d144d621d5d5de0f50802c096c21f93b4e8 WHIRLPOOL 39b2f1df2206f36eb0f1496a80de8bc3bab4d37518b7b0435c215adce7153a95bf06426ecc3aff4561afc7532fcf879332f9dfdf7a224fccfca8dad5028be15d
-MISC ChangeLog 2648 SHA256 62995f71853a5f023771b054e55fcd76b6e05f479e6cc6c1f1177709a4c778ce SHA512 27e69f01a386664b6cd322938d13e6269a2cf334f933ee01d48cbe2db293ec987ae07e22a6686b7de7978b13c6551e502741e2e0ab849ce4da6eb9fc83224033 WHIRLPOOL 9b6ae4c941ab982dd17b024d767005f68907d31f4ec74b504935acb3bb5ed3b95492f6f393dec6c21ed121358821d6053be33dfcf2db85c70b44f0a0f485de79
+EBUILD 4ti2-1.6.2.ebuild 823 SHA256 a10cad01db5b6c5527f7d6703fec1b7ad83b30bc63ac3315bc03e76634541af3 SHA512 d5a845516660896ee6ff89e2f834fbde37088f147a04d7f434e950f5d2fe256ab059da388202eabdeed4bf84624f56a0ab4c4ca677c391f16bdeb5299a6481f4 WHIRLPOOL ff3a9bc565bd76c7b534a3025d7a45966558372260ed7d366ba0c4d4ca1dbcf88921ed13afaf30c59dc85128b6b2139e1775fb49ff4df736e1877e5184387c87
+MISC ChangeLog 2788 SHA256 3c302b6aa40bf34a0e6b99876e3eaf307da079f113c05afda434ecbdbe998dbd SHA512 8d1bf73f6d164fb58444d1785154cefd6e7397a2298e3dd085dd8cc1eb2e96e002b3f347b97d52e9bfdac80e2a0633e0bc0070b3ca9212082d080943566875db WHIRLPOOL fe462a4f0d5bc45ab984ca42ed4ad62f973ad60b27d7b844ea7bbf239e01e040565a5c243e356156b89d58c5b62faa63bfc211bfc1dccff3de12041727670393
 MISC metadata.xml 438 SHA256 1de19f430f262df930f1ddca59bbbf5820f7577418b4d737fc4a18843f89aac9 SHA512 db6751ece76934b154b36460eb1f71053a3b23dee607114a5e89e878a9f93d751cf6fdc58673f1d0583f6e80aafa358c7d8faa30863a333b0a908d7c254acbde WHIRLPOOL 279b1d05932c3eba7030d0051285ae0472545b619b26e07b221652bb732e998d45f8f7c9f16b7d9ec6e2ffa377fffd12618481949701872cd49c714c9be53d99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTyRLjAAoJEA2sAkrWKOU2zg8H/1cw0MnCWJHfiUSJrZY4rb7M
-7xjFz4NLbhAq52mq77YBT9voSYj8ljnieAvo/2Yu3DkDq83snsDWnOTMYorvdoqi
-nr2Yy7ejtRKaS01KMM8raX0Fqgd/sm/KS+0RlQ2Iuu3QaZgY0javyOSea+0zmwT+
-Rx+nL2ersGjlKZ4iw7b2RoUIk3norZJ5CHqBTTFB2fgG/1dLY9gEdBFGQuFFihnl
-bisyIaoaX+cOIkOtVZHiyAHI34lzrdTp+MYssawrEhvMZtzxO08dVu5mpN0uj5A3
-cE8e6n4umuD6T54WeVZTUgugHRWHRTah8R486QIVr+dkeIfQ6u5KaJpN2dvxTKw=
-=oJJy
+iF4EAREIAAYFAlRl0oMACgkQid6yGVZcMrzNAwD/Q2CS4X6J0k4QczJpA5JoghTp
+f0vMzs1NGTVKoIjpUL0A/RBsI2IBl0iSuP3/dAGcMVDPayK1xotQY7HGSiEASR+i
+=PPNg
 -----END PGP SIGNATURE-----