[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/topcom/files/, sci-mathematics/topcom/

[Thomas Kahle]

commit:     8ff5095a9c6644e43fab5f7e9f40d6fc38007b0a
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 18:35:59 2016 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 18:36:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff5095a

sci-mathematics/topcom: remove old

Package-Manager: portage-2.3.0

 sci-mathematics/topcom/Manifest                    |   1 -
 .../topcom/files/topcom-0.17.4-buildsystem.patch   | 105 ---------------------
 .../files/topcom-0.17.4-no-internal-libs.patch     |  77 ---------------
 sci-mathematics/topcom/topcom-0.17.4-r1.ebuild     |  60 ------------
 4 files changed, 243 deletions(-)

diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index 426626e..30d3ca9 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,3 +1,2 @@
-DIST TOPCOM-0.17.4.tar.gz 8666508 SHA256 42f3ff4e04613009966a3e3cd942f1fb6aa7bc7439f54f20a0b81d1989f9fef1 SHA512 29cee145ee8ec1a63c0b1ec5d9e5f34a11084767405435eed515f864ba1094ca4566c92bbf7cf56914e3e455dd8bdf9746c0f7192a9455fe7852a65704a6009c WHIRLPOOL 4b5f18b8eee251470281a352a354a683b7f42c852cb47552e4227699d9570aee09cda9f9e84f9e7abc5b9e1997818437618776ed90a8667cb186143da6deab4b
 DIST TOPCOM-0.17.7.tar.gz 8661519 SHA256 a22be891225589790fb42d618c1c9657d221914612d4567eaeaaf5d6145667c4 SHA512 528e566e488641e078a8c9150f88a1544f607e6859da1d95a98dc5890c5a52882f8c8790097c3a77277066bd5d4c10a1e0a9c131fbc521f56f6139eeab7e21d1 WHIRLPOOL 1857c43d534aa04c15b02a4d5b378402a7e6c0a456f7be1a3c27f37dbd3938e1ca7aa3b645e56b1b57da8bedc58067a13127b5782e1025bb502be1b864b9295c
 DIST TOPCOM-manual.html 19251 SHA256 b1c3b326044fdb512264fa2bde6fa10962fd276d43fcab71cb0dc8778378608e SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67 WHIRLPOOL cf8da6b8fb7834730d755ba626903547e02864ea7da98be2e08fb9dafb10ef4503340eac3999915d562768ce2aaa07d38088b8b14c6be810681f6ed229f9d7c3

diff --git a/sci-mathematics/topcom/files/topcom-0.17.4-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.4-buildsystem.patch
deleted file mode 100644
index e8546aa..00000000
--- a/sci-mathematics/topcom/files/topcom-0.17.4-buildsystem.patch
+++ /dev/null
@@ -1,105 +0,0 @@
- lib-src-reg/Makefile.am    |    8 +++-----
- lib-src/Makefile.am        |    8 +++-----
- src-reg/Makefile.am        |   12 +++++-------
- src/Makefile.am            |   12 +++++-------
- wrap-gmp-gmpxx/Makefile.am |    2 +-
- 5 files changed, 17 insertions(+), 25 deletions(-)
-
-diff --git a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
-index 67c1dc9..202d6fa 100644
---- a/lib-src-reg/Makefile.am
-+++ b/lib-src-reg/Makefile.am
-@@ -10,11 +10,9 @@ SPXinterface.hh \
- RegularityCheck.hh \
- LPinterface.hh
- 
--INCLUDES        = -I../lib-src 
--INCLUDES       += -I../wrap-gmp-gmpxx
--INCLUDES       += -I../external/include
-+INCLUDES        = -I$(top_srcdir)/lib-src 
-+INCLUDES       += -I$(top_srcdir)/wrap-gmp-gmpxx
-+INCLUDES       += -I$(top_srcdir)/external/include
- INCLUDES       += -I$(includedir)
- 
- AM_CPPFLAGS     = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
--
--AM_CXXFLAGS     = -O2
-diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
-index defed87..c94109c 100644
---- a/lib-src/Makefile.am
-+++ b/lib-src/Makefile.am
-@@ -88,11 +88,9 @@ VertexFacetTable.hh \
- VertexFacetTableArray.hh \
- VirtualChiro.hh
- 
--INCLUDES        = -I../lib-src-reg
--INCLUDES       += -I../wrap-gmp-gmpxx
--INCLUDES       += -I../external/include
-+INCLUDES        = -I$(top_srcdir)/lib-src-reg
-+INCLUDES       += -I$(top_srcdir)/wrap-gmp-gmpxx
-+INCLUDES       += -I$(top_srcdir)/external/include
- INCLUDES       += -I$(includedir)
- 
- AM_CPPFLAGS     = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-35
--
--AM_CXXFLAGS     = -O2 -g
-diff --git a/src-reg/Makefile.am b/src-reg/Makefile.am
-index b0219a5..e9b00bc 100644
---- a/src-reg/Makefile.am
-+++ b/src-reg/Makefile.am
-@@ -2,15 +2,13 @@ bin_PROGRAMS = checkregularity
- 
- checkregularity_SOURCES = checkregularity.cc
- 
--LDADD           = ../lib-src-reg/libCHECKREG.a \
--                  ../lib-src/libTOPCOM.a
-+LDADD           = $(top_builddir)/lib-src-reg/libCHECKREG.a \
-+                  $(top_builddir)/lib-src/libTOPCOM.a
- 
--INCLUDES        = -I../lib-src
--INCLUDES       += -I../lib-src-reg
--INCLUDES       += -I../wrap-gmp-gmpxx
-+INCLUDES        = -I$(top_srcdir)/lib-src
-+INCLUDES       += -I$(top_srcdir)/lib-src-reg
-+INCLUDES       += -I$(top_srcdir)/wrap-gmp-gmpxx
- INCLUDES       += -I$(includedir)
- 
- 
- AM_CPPFLAGS     = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
--
--AM_CXXFLAGS     = -O2
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5ba9b22..4c59202 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -85,14 +85,12 @@ santos_triang_SOURCES              = santos_triang.cc
- santos_dim4_triang_SOURCES         = santos_dim4_triang.cc
- santos_22_triang_SOURCES           = santos_22_triang.cc
- 
--LDADD           = ../lib-src/libTOPCOM.a \
--                  ../lib-src-reg/libCHECKREG.a
-+LDADD           = $(top_builddir)/lib-src/libTOPCOM.a \
-+                  $(top_builddir)/lib-src-reg/libCHECKREG.a
- 
--INCLUDES        = -I../lib-src
--INCLUDES       += -I../lib-src-reg
--INCLUDES       += -I../wrap-gmp-gmpxx
-+INCLUDES        = -I$(top_srcdir)/lib-src
-+INCLUDES       += -I$(top_srcdir)/lib-src-reg
-+INCLUDES       += -I$(top_srcdir)/wrap-gmp-gmpxx
- INCLUDES       += -I$(includedir)
- 
- AM_CPPFLAGS     = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
--
--AM_CXXFLAGS     = -O2
-diff --git a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
-index 383e003..d93a637 100644
---- a/wrap-gmp-gmpxx/Makefile.am
-+++ b/wrap-gmp-gmpxx/Makefile.am
-@@ -2,5 +2,5 @@ include_HEADERS = \
- Integer.h \
- Rational.h
- 
--INCLUDES        = -I../external/include
-+INCLUDES        = -I$(top_srcdir)/external/include
- INCLUDES       += -I$(includedir)

diff --git a/sci-mathematics/topcom/files/topcom-0.17.4-no-internal-libs.patch b/sci-mathematics/topcom/files/topcom-0.17.4-no-internal-libs.patch
deleted file mode 100644
index e9cffee..00000000
--- a/sci-mathematics/topcom/files/topcom-0.17.4-no-internal-libs.patch
+++ /dev/null
@@ -1,77 +0,0 @@
- Makefile.am         |    4 ----
- configure.ac        |    6 +-----
- src-reg/Makefile.am |    6 +-----
- src/Makefile.am     |    6 +-----
- 4 files changed, 3 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 640652f..00ba26a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,2 @@
- SUBDIRS      = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
- EXTRA_DIST   = external/Makefile
--EXTRA_DIST  += external/gmp-5.0.5.tar.bz2
--EXTRA_DIST  += external/cddlib-0.94f-TOPCOM.tar.gz
--EXTRA_DIST  += external/gmpxx-patch
--
-diff --git a/configure.ac b/configure.ac
-index b737f27..ecd38ce 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,12 +17,8 @@ dnl Replace `main' with a function in -lstdc:
- 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, , sh -c 'echo soplex not found: --soplex will not work.')
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-diff --git a/src-reg/Makefile.am b/src-reg/Makefile.am
-index c976e34..b0219a5 100644
---- a/src-reg/Makefile.am
-+++ b/src-reg/Makefile.am
-@@ -3,15 +3,11 @@ bin_PROGRAMS = checkregularity
- 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
- INCLUDES       += -I../wrap-gmp-gmpxx
--INCLUDES       += -I../external/include
- INCLUDES       += -I$(includedir)
- 
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 4c35135..5ba9b22 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,15 +86,11 @@ santos_dim4_triang_SOURCES         = santos_dim4_triang.cc
- 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
- INCLUDES       += -I../wrap-gmp-gmpxx
--INCLUDES       += -I../external/include
- INCLUDES       += -I$(includedir)
- 
- AM_CPPFLAGS     = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30

diff --git a/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild b/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild
deleted file mode 100644
index 3745a13..00000000
--- a/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils 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 )"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc examples static-libs"
-
-DEPEND="
-	>=dev-libs/gmp-5.0.5
-	>=sci-libs/cddlib-094f"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/TOPCOM-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-internal-libs.patch
-	"${FILESDIR}"/${P}-buildsystem.patch
-	)
-
-src_prepare () {
-	# ... and link in tree versions:
-	append-libs -lgmp -lgmpxx -lcddgmp
-
-	find external -delete || die
-
-	mv configure.{in,ac} || die
-
-	autotools-utils_src_prepare
-}
-
-src_install () {
-	autotools-utils_src_install
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*a
-
-	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)."
-}