Fix collision (bug 547030), remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)

4 files changed, 18 insertions, 106 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/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)."
 }