Fix collision (bug 547030), remove old.

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

5 files changed, 24 insertions, 116 deletions

diff --git a/sci-mathematics/topcom/ChangeLog b/sci-mathematics/topcom/ChangeLog
index 7ffb4d6ef56a..4a06ba3e44c9 100644
--- a/sci-mathematics/topcom/ChangeLog
+++ b/sci-mathematics/topcom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/topcom
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/topcom/ChangeLog,v 1.2 2012/07/12 06:19:23 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/topcom/ChangeLog,v 1.3 2015/04/26 10:57:52 tomka Exp $
+
+*topcom-0.17.4-r1 (26 Apr 2015)
+
+  26 Apr 2015; Thomas Kahle <tomka@gentoo.org> +topcom-0.17.4-r1.ebuild,
+  -files/topcom-0.16.2-no-internal-libs.patch, -topcom-0.16.2.ebuild,
+  -topcom-0.17.4.ebuild:
+  Fix collision (bug 547030), remove old.
 
 *topcom-0.17.4 (12 Jul 2012)
 
@@ -15,4 +22,3 @@
   +files/topcom-0.16.2-no-internal-libs.patch, +metadata.xml:
   New package: sci-mathematics/topcom, revised import from sci overlay,
   fixes bug 285619
-
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index f04c34a99cea..26f23eb11d44 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX topcom-0.16.2-no-internal-libs.patch 2417 SHA256 356c0fb1e01c6742b539f279966d575fa864d7a7ba9729945cfe3506b9ba3c3a SHA512 246df1c2303df1ac03707c1a7356a9feef2a77bfd10e48d79b0caa9eb710b5989941bbf44f46b25b65b9b314c90b0e073be92900a8f7bb0f8932bbbd03b31a5f WHIRLPOOL 07141b24ef8e11289326936c653a36506680d6104154e03d859d3b117bef80e2913da7b032fb9badb52f238e30acb9e21072d735c4c488ea6d731db609d51ed4
 AUX topcom-0.17.4-buildsystem.patch 3584 SHA256 1c03d2e0be6b1f0d7152ef41bbda6755fb5b97f626efd6549cce7cb156e878d4 SHA512 74293e77d6db067c3977467bf95f645e08b05ca5807167133ab6923748154dd34166df4da62872adce21b9ccd832a8ab3602d0000c67f494b5108064651d5d04 WHIRLPOOL c2f74623cabefef709a449af9b2fc6ee91fbe0ac1b328eb83646ea74760b9ccbb8a30db2e0779c6fa77526b45030349c2fcce08a36ad763cf0ecc0f63b009fa2
 AUX topcom-0.17.4-no-internal-libs.patch 2656 SHA256 04b1aa4838e81ec9ef14474055ccf7e3312ce0e1065fcd246fbb3f5808af2a86 SHA512 e3fc2257541383824a1f9b9a40bb014b8b1da5bdf904aaa0f85fa8ca8846622d656d5d9b893eaba45126ed88a3171b650cadaa862d537b02ccf13991d1812316 WHIRLPOOL 028e8a626df0ce5f26130353d5e1ba2082fd445e7423c9aa9608590ecc41f389b4f1eb343a53865122e85f29186e6dfcb77df450fa5cc99d24036dd25935353a
-DIST TOPCOM-0.16.2.tar.gz 22578125 SHA256 9c292be797ca87bcd20b96fc35347b42d0c7ade22ac98d41d44994ed0de42f80 SHA512 2d6cc8d57b243ab0d15a48210745f7dcbfe63cc39c29510b2601609bec769a41cdba25ee149cac0a28e2a20f2b074bb4ec4e76b29bdd704c6b644e0616c34401 WHIRLPOOL 3b6f554d64c19250e955366881561a75fab73294fd27ba847057b372ef6cde438d7bfec9dd962d52282eee5513d210e93be4c8cebff5a164dfbbad1c3f9fd046
 DIST TOPCOM-0.17.4.tar.gz 8666508 SHA256 42f3ff4e04613009966a3e3cd942f1fb6aa7bc7439f54f20a0b81d1989f9fef1 SHA512 29cee145ee8ec1a63c0b1ec5d9e5f34a11084767405435eed515f864ba1094ca4566c92bbf7cf56914e3e455dd8bdf9746c0f7192a9455fe7852a65704a6009c WHIRLPOOL 4b5f18b8eee251470281a352a354a683b7f42c852cb47552e4227699d9570aee09cda9f9e84f9e7abc5b9e1997818437618776ed90a8667cb186143da6deab4b
 DIST TOPCOM-manual.html 19251 SHA256 b1c3b326044fdb512264fa2bde6fa10962fd276d43fcab71cb0dc8778378608e
-EBUILD topcom-0.16.2.ebuild 1104 SHA256 ddab1b50370c8750d1693e4b4916489fe835c2280c8be1517bbae58d9c932920 SHA512 f789b64c2811fb62312355d7abb02d080bfb62589550fb937be33058e4c635784cd6da8e52ac4224623eeb87fe83fb8dca4299fa582fb8750193fe9a5ec3b2d1 WHIRLPOOL 836100e820a6e836a675943eb20a1b5cc4e692a955fa34a6e986184869e13cedadf23895f4f67dba841c213575726616e8d900124538f75cfd91755ddcb15fbf
-EBUILD topcom-0.17.4.ebuild 1282 SHA256 d7f41bab18986c7d8457f708c8ec04ffd23aa64e5e701708e1bf271bd1fdf082 SHA512 6c7736e003c7ab3594f0a36392c30389b7eca5fb8c88fc12db06e072fb380ad900521801814f24ea019e9f020f1144ba4e8c47dd997473be4fdb7497c23989d3 WHIRLPOOL 30b7435e95b576ede638bd0a389515554df8da511221eff1ba068c4190731bd974993d905ce478e76154ba7f85f1597f925548eecaa84a90530b8beb10e8df84
-MISC ChangeLog 749 SHA256 1ef28772cdd1f4333ae60b395266c5d563955c688264452232346dbfc422f0e9 SHA512 c965c6ede64c47c69f71fa48831dbf5b3ab39dd53fbcb9e7afd877050a07ea314288afa9042d03d5c83f744a34ecdc480009ce880f4ff08fae48a8baf1416c09 WHIRLPOOL 14852dca5cf6228d7822e7b0bdb9e1a8026d88952055861e7b3a73253f2dd4d5f3ea21c1802bddcea23315421e1a779218398afcb319abedff5c63bcf7ac4965
+EBUILD topcom-0.17.4-r1.ebuild 1501 SHA256 512be8ad90aa301678fb0cb5b9e6c4cbc1cd839846175eff69a0b3edfadb5b6f SHA512 2d00a31789972db7428ebed2afcb0064ee93cd1a971fb9add6b1fb1f4cd7658fc29e96271e2dea9baec1ff7e2a6751aa50c5f6e1b4a4c8837080d98b66341ffc WHIRLPOOL e695faf85a6a45791dbe55758dfce388c6792cc0d73839c21de32dc079adc173e4a578bba52a364da6de8f1179254e5cd5482836d2486073ba0e114cf08a9e56
+MISC ChangeLog 993 SHA256 d6abb9f3d9c46f88b8c7ad9e8f0352aa555fa0d586749f8da669fbf2e0d9c00a SHA512 649b87a215526dc609fe3563c82551161729a1718baa531297070b310e22393cfecb77e70f794930abe9f5b72221ed312b9fae9cb23dc758e44cf0cce053411f WHIRLPOOL 3d9c033f47081a7155ee0be533892bb57dbd31ff2aaa36af0bdf00bb9e67c436f29d0394d7090caa3688fcc295e1ae797ab64e3abc1b281fb356f561c8f01a1f
 MISC metadata.xml 391 SHA256 fd1471b00b7648e6d6304e33b865b04143bc7f56df9143f1a2d5378ee5626a80 SHA512 e692a53595913ef3290e746d581f4d4ec59c2d06c1a69f325fc3463c4330cc9fb18d65d3d45719104ef090f3585fb8c72b1fa04639acacfd97da8557c0e49fb3 WHIRLPOOL ec4db0de547a0995dc916bf1ae5629d2f3a3c8672f55ef0d9ba56818b447d255052c457e3385a3f601973e04d62a08bac39321d4ff337f6e0d5fadcdad615d76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2
 
-iEYEAREIAAYFAk/+bHEACgkQgAnW8HDreRYouwCfRODw4k27mIN90ubV3QtgAzKR
-KAMAoIoUmdqpVs4b+xB6V3nJFBUEeiGj
-=JzD1
+iF4EAREIAAYFAlU8xVYACgkQid6yGVZcMrwYlQEApymu5PUykEyMqwCqiUwhNGvx
+C/hd6+HWwv6IagkVAWIA/0EqSGwWWXZtIKSxNpM42bDE0FCGoQ82mMm/084mS+CC
+=owiq
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/topcom/files/topcom-0.16.2-no-internal-libs.patch b/sci-mathematics/topcom/files/topcom-0.16.2-no-internal-libs.patch
deleted file mode 100644
index 9e89b1b5892b..000000000000
--- a/sci-mathematics/topcom/files/topcom-0.16.2-no-internal-libs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -U 3 -dHrN TOPCOM-0.16.2.orig/configure.in TOPCOM-0.16.2/configure.in
---- TOPCOM-0.16.2.orig/configure.in	2009-10-15 09:00:51.000000000 +0200
-+++ TOPCOM-0.16.2/configure.in	2010-11-09 18:02:19.000000000 +0100
-@@ -17,12 +17,8 @@
- dnl AC_CHECK_LIB(stdc, main)
- dnl Replace `main' with a function in -lstdc++:
- dnl AC_CHECK_LIB(stdc++, main)
--dnl Make libgmp:
--make -C external gmp
--dnl Make libcddgmp:
--make -C external cdd
- dnl Check for soplex:
--AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.')
-+AC_CHECK_LIB(soplex, main, , /bin/sh -c 'echo soplex not found: --soplex will not work.')
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-diff -U 3 -dHrN TOPCOM-0.16.2.orig/Makefile.am TOPCOM-0.16.2/Makefile.am
---- TOPCOM-0.16.2.orig/Makefile.am	2009-10-15 07:36:24.000000000 +0200
-+++ TOPCOM-0.16.2/Makefile.am	2010-11-09 18:02:19.000000000 +0100
-@@ -1,4 +1,2 @@
- SUBDIRS      = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
--EXTRA_DIST   = external/Makefile
--EXTRA_DIST  += external/gmp-4.3.0.tar.gz
--EXTRA_DIST  += external/cddlib-0.94f-TOPCOM.tar.gz
-+
-diff -U 3 -dHrN TOPCOM-0.16.2.orig/src/Makefile.am TOPCOM-0.16.2/src/Makefile.am
---- TOPCOM-0.16.2.orig/src/Makefile.am	2009-07-03 12:56:30.000000000 +0200
-+++ TOPCOM-0.16.2/src/Makefile.am	2010-11-09 18:03:25.000000000 +0100
-@@ -76,10 +76,7 @@
- santos_22_triang_SOURCES           = santos_22_triang.cc
- 
- LDADD           = ../lib-src/libTOPCOM.a \
--                  ../lib-src-reg/libCHECKREG.a \
--                  ../external/lib/libcddgmp.a \
--                  ../external/lib/libgmpxx.a \
--                  ../external/lib/libgmp.a
-+                  ../lib-src-reg/libCHECKREG.a 
- 
- INCLUDES        = -I../lib-src
- INCLUDES       += -I../lib-src-reg
-diff -U 3 -dHrN TOPCOM-0.16.2.orig/src-reg/Makefile.am TOPCOM-0.16.2/src-reg/Makefile.am
---- TOPCOM-0.16.2.orig/src-reg/Makefile.am	2009-07-03 12:56:33.000000000 +0200
-+++ TOPCOM-0.16.2/src-reg/Makefile.am	2010-11-09 18:02:40.000000000 +0100
-@@ -3,10 +3,7 @@
- checkregularity_SOURCES = checkregularity.cc
- 
- LDADD           = ../lib-src-reg/libCHECKREG.a \
--                  ../lib-src/libTOPCOM.a \
--                  ../external/lib/libcddgmp.a \
--                  ../external/lib/libgmpxx.a \
--                  ../external/lib/libgmp.a
-+                  ../lib-src/libTOPCOM.a
- 
- INCLUDES        = -I../lib-src
- INCLUDES       += -I../lib-src-reg
diff --git a/sci-mathematics/topcom/topcom-0.16.2.ebuild b/sci-mathematics/topcom/topcom-0.16.2.ebuild
deleted file mode 100644
index 9647ca58c444..000000000000
--- a/sci-mathematics/topcom/topcom-0.16.2.ebuild
+++ /dev/null
@@ -1,45 +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/topcom/topcom-0.16.2.ebuild,v 1.2 2012/07/12 06:19:23 jlec Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
-HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
-SRC_URI="
-	http://www.uni-bayreuth.de/departments/wirtschaftsmathematik/rambau/Software/TOPCOM-${PV}.tar.gz
-	doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="
-	dev-libs/gmp
-	sci-libs/cddlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/TOPCOM-${PV}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare () {
-	# Don't compile internal GMP and CDD ...
-	epatch "${FILESDIR}"/${P}-no-internal-libs.patch
-
-	# ... and link in tree versions:
-	append-libs -lgmp -lgmpxx -lcddgmp
-
-	eautoreconf
-}
-
-src_install () {
-	default
-
-	use doc && dohtml "${DISTDIR}"/TOPCOM-manual.html
-
-	use examples && dodoc -r "${S}"/examples
-}
diff --git a/sci-mathematics/topcom/topcom-0.17.4.ebuild b/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild
index 8ded61352495..d1813e75ea77 100644
--- a/sci-mathematics/topcom/topcom-0.17.4.ebuild
+++ b/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/topcom/topcom-0.17.4.ebuild,v 1.1 2012/07/12 06:19:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild,v 1.1 2015/04/26 10:57:52 tomka Exp $
 
 EAPI=4
 
@@ -50,4 +50,11 @@ src_install () {
 	use doc && dohtml "${DISTDIR}"/TOPCOM-manual.html
 
 	use examples && dodoc -r "${S}"/examples
+
+	mv "${ED}"/usr/bin/cube "${ED}"/usr/bin/topcom_cube || die
+}
+
+pkg_postinst() {
+	elog "Due to a file collision with media-libs/lib3ds the helper"
+	elog "'cube' has been installed as topcom_cube (see bug #547030)."
 }