summaryrefslogtreecommitdiff
path: root/sci-libs/cddlib
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-25 11:37:10 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-25 11:37:10 +0100
commit38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree04e2cf4bd43601b77daa79fe654e409187093c5e /sci-libs/cddlib
parent623ee73d661e5ed8475cb264511f683407d87365 (diff)
gentoo resync : 25.04.2020
Diffstat (limited to 'sci-libs/cddlib')
-rw-r--r--sci-libs/cddlib/Manifest10
-rw-r--r--sci-libs/cddlib/cddlib-094g.ebuild43
-rw-r--r--sci-libs/cddlib/cddlib-094h.ebuild45
-rw-r--r--sci-libs/cddlib/cddlib-094j.ebuild2
-rw-r--r--sci-libs/cddlib/files/cdd_both_reps.c255
-rw-r--r--sci-libs/cddlib/files/cddlib-094g-add-cdd_both_reps-binary.patch41
-rw-r--r--sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch43
-rw-r--r--sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch37
8 files changed, 2 insertions, 474 deletions
diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index c117673df379..79a9f0b72419 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -1,11 +1,3 @@
-AUX cdd_both_reps.c 6439 BLAKE2B bc370bafb19869bd72c2926dda0c9216a4fc768f60fd1ca01404d87880de23fad738846fb69b08ed38870df481d1af9d2faefd2b97ecb24bfa80c84c27c9e5d1 SHA512 5aaf99344a823f908ffb54dc5fa153a865f11c7a4fdcde8773627de794a55f376f78f8cc19e40f6e62aceeec2d855aedcf43b0d332dc3c7231356a43b6a6715e
-AUX cddlib-094g-add-cdd_both_reps-binary.patch 1210 BLAKE2B f0e8c1cae6cb108b3a77a5ab629550115acf21320fc0b288ff86f1ccb9df617ee4caaf20349270d27f66d965b94fad8b0a2f18ba344bb5b6e384554c3aa0060f SHA512 c69c6d2ebbfbf132a287032ac1470fcce0c0d1e000dd96501f271ff200034567056d3948626023722c83082289f40122b0eacf35d10d2497f36ab226a9316348
-AUX cddlib-094h-add-cdd_both_reps-binary.patch 1601 BLAKE2B 9d4d3784a758bb9b6d156550cd56b6e1b39fb3b82e5002344c3c3d8025ca6f3b57201a414cf98f3fec9a88b8268ff4427a6bc2ba96e91df06f6618faaf4573d7 SHA512 ccd75d42aa3bb1f753197fd3be7a6561f0bf419396cfbd42a6072b9d27955c5d80eff71622c6b54b26ed6cbe03544ae3bf61e0773c5630f1ce964845e71f7015
-AUX cddlib-094h-enforce-no-gmp.patch 1155 BLAKE2B e2111bd137f5f85c964023f63fe3b9da8bf0c5b5915051422faed4246d240006c87dd05de214a6f13f2ce4a7d1f804168d90020d32080ad121386d7207d37d4c SHA512 113f4d9cf812c46663a87e1c22c56e41717ac93b1e022f99ad011917cf96cd25ada7670e3270a40f3b9dbdf8e88e6cefe9fcc03971f0cf17488c9a59a1612de6
DIST cddlib-0.94j.tar.gz 1364746 BLAKE2B 60e81fccf8abd8d60fb7261d1d2d61b7ad2b60285e7dfa760905e2cb5b01f1570c27920728c12fc6994135e4b29ba8e1709066ddf2e2eff00f8f48b093ebd43e SHA512 b82d5e06538a29143a79f7ba7287a1784292e28f086071041e500fd81387a30c3fca6fae9049752f57b62d50b385d73681276d42d24941e3a43893da00452ea6
-DIST cddlib-094g.tar.gz 1383388 BLAKE2B c26f201f0369a931d672b192d6fab775210d2758e980cf867cf64f34d2ff3b23d862942507ae497c37723cdfe0c7beb55fe5d6cbe02349f576349579adbd4166 SHA512 e1053c6e34f79add53b2880c7664f9c20c0a6de636aa5de4c6a9dfc4d1d241221601c37d15e1833bcd5b1162512c3fbaed4046f771bc0a1e5753b713d6840b77
-DIST cddlib-094h.tar.gz 1678116 BLAKE2B 619e26745c04338d97fb4ce2997c23a16017ed19e14dda24c9ef90b84253d5540361b4ccd68eafb65b6380cff95b58e9ec2bf587643e71084cd47ed87bdffbc9 SHA512 22160c88832b78dd568b58c1e097e4c6006f82580f1114a3ef03fc10bde98132337d5b555306b58b65aac6fea1534d9e09725907808c969de16c2dfc75f80204
-EBUILD cddlib-094g.ebuild 1014 BLAKE2B e53740d143751c2a96efa2613e5d1df912805b44cb690f576c5bf036fcece1f708a92fbbc9cf5f20c05e66dce158b2e2a88fd65e4f33534fe25c15d156727c8f SHA512 f59749d1d10d844dfd97eafbbb1a752424f26af88652ff52d6f8a1fac2f1849051184a68c03f6bc82f548d0b550f12623c9ecce6c1e0aea2b1a9683779e57ef9
-EBUILD cddlib-094h.ebuild 1138 BLAKE2B 32ac8a7b2bca079879d021dfc9537f3a54fa912543a42479e1c951b45c84ce79e643c3369eaab07bb5bdcf430b90d6beb9cc62352e4275af4aac8cd207273c58 SHA512 c2e6fc69ceb8b0866f5713d906b7f9d97907ae7e5dc363d903f8b2dc7507156b8869f74bc0b60270ae80a34e6be109bc2796e8adf1caa608baf5f4e113a9e91a
-EBUILD cddlib-094j.ebuild 1397 BLAKE2B 7ee4d9bccb7761758c4ea58aa236e1c74fe8ff2a72a76c10cd2738e0f7cc831bb1bee5b3ff543085343dba1b4deaa00254f55473c0a0367a5858c1efc100e9dd SHA512 2b2b5b386dfdd1e26204f5c5cf78963cc51bcad91d394df9e6c95db815dd975761d485de720e0f4bd11c00abf89cd07173032d8204378c8dc23137ed715605db
+EBUILD cddlib-094j.ebuild 1396 BLAKE2B 032b697c46fd170dea85951451389f30fafe5ec67cee387583514bc8cff83ee8e5bf570308078f14deb88d42821bfaae6f8f847aa4e8df83827a00f81f413f2b SHA512 3fe5afeedefabaae12a1becc1ec735020802cf4b4b8184591a4b51c34147b087fbcf1a4a46c246ddf84a7dd320c056f70d6739a13c76d662776755e9dc125c74
MISC metadata.xml 1817 BLAKE2B 3a75a0a27708d31cf58ec067ad25ffce663b3d52f90dd2437ce529bb4babf49a6e0461eee6841ef836f37caa2f7e4f62a762ea61094213fe10f9cd1e16951d99 SHA512 a50ed995ba248cf59ae3b2c2d5a8f91df9b08bd03cb48a14de0eabc79b44091d425b41d980952ac3eea6182e12ca235985f347bb67ac109993a47a545d1c4289
diff --git a/sci-libs/cddlib/cddlib-094g.ebuild b/sci-libs/cddlib/cddlib-094g.ebuild
deleted file mode 100644
index 6a37b6d4ec1e..000000000000
--- a/sci-libs/cddlib/cddlib-094g.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="C implementation of the Double Description Method of Motzkin et al"
-HOMEPAGE="http://www.ifor.math.ethz.ch/~fukuda/cdd_home/"
-SRC_URI="ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND=">=dev-libs/gmp-4.2.2:0="
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( ChangeLog README )
-
-PATCHES=(
- "${FILESDIR}"/${P}-add-cdd_both_reps-binary.patch
-)
-
-src_prepare() {
- autotools-utils_src_prepare
-
- cp "${FILESDIR}"/cdd_both_reps.c "${S}"/src/ \
- || die "failed to copy source file"
- ln -s "${S}"/src/cdd_both_reps.c "${S}"/src-gmp/cdd_both_reps.c \
- || die "failed to make symbolic link to source file"
-}
-
-src_install() {
- use doc && DOCS+=( doc/cddlibman.pdf doc/cddlibman.ps )
-
- autotools-utils_src_install
-}
diff --git a/sci-libs/cddlib/cddlib-094h.ebuild b/sci-libs/cddlib/cddlib-094h.ebuild
deleted file mode 100644
index 217d76f23f08..000000000000
--- a/sci-libs/cddlib/cddlib-094h.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="C implementation of the Double Description Method of Motzkin et al"
-HOMEPAGE="https://www.inf.ethz.ch/personal/fukudak/cdd_home/"
-SRC_URI="ftp://ftp.math.ethz.ch/users/fukudak/cdd/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs tools"
-
-DEPEND="dev-libs/gmp:0="
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog README )
-
-PATCHES=(
- "${FILESDIR}"/${P}-add-cdd_both_reps-binary.patch
- "${FILESDIR}"/${P}-enforce-no-gmp.patch
-)
-
-src_prepare() {
- default
- sed -e 's|localdebug=dd_TRUE|localdebug=dd_FALSE|g' \
- -i lib-src/cddlp.c -i lib-src-gmp/cddlp.c -i lib-src-gmp/cddlp_f.c || die
- cp "${FILESDIR}"/cdd_both_reps.c src || die
- ln -s "${S}"/src/cdd_both_reps.c "${S}"/src-gmp/cdd_both_reps.c || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- use tools || rm "${ED}"/usr/bin/*
- use static-libs || prune_libtool_files --all
- use doc && dodoc doc/cddlibman.pdf
-}
diff --git a/sci-libs/cddlib/cddlib-094j.ebuild b/sci-libs/cddlib/cddlib-094j.ebuild
index dfcea92f0e38..e53e3ec982f7 100644
--- a/sci-libs/cddlib/cddlib-094j.ebuild
+++ b/sci-libs/cddlib/cddlib-094j.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g
SLOT="0"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
IUSE="doc examples static-libs tools"
DEPEND="dev-libs/gmp:0"
diff --git a/sci-libs/cddlib/files/cdd_both_reps.c b/sci-libs/cddlib/files/cdd_both_reps.c
deleted file mode 100644
index 3de4247e3016..000000000000
--- a/sci-libs/cddlib/files/cdd_both_reps.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* cdd_both_reps.c: compute reduced H and V representation of polytope
- by Volker Braun <vbraun@stp.dias.ie>
-
- The input is taken from stdin and can be either a
- H or V representation, not necessarily reduced.
-
- based on testcdd1.c, redcheck.c, and of course the cdd library
- written by Komei Fukuda, fukuda@ifor.math.ethz.ch
- Standard ftp site: ftp.ifor.math.ethz.ch, Directory: pub/fukuda/cdd
-*/
-
-/* This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "setoper.h"
-#include "cdd.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <math.h>
-#include <string.h>
-
-
-
-
-
-void compute_adjacency(dd_MatrixPtr Rep, dd_ErrorType* err_ptr)
-{
- dd_SetFamilyPtr AdjacencyGraph;
- if (*err_ptr != dd_NoError) return;
-
- switch (Rep->representation) {
- case dd_Inequality:
- printf("Facet graph\n");
- break;
- case dd_Generator:
- printf("Vertex graph\n");
- break;
- case dd_Unspecified:
- printf("unknown representation type!\n");
- default:
- printf("This should be unreachable!\n");
- exit(2);
- }
-
- /* Output adjacency of vertices/rays/lines */
- if (Rep->rowsize > 0) { /* workaround for bug with empty polyhedron */
- /* compute adjacent vertices/rays/lines */
- AdjacencyGraph = dd_Matrix2Adjacency(Rep, err_ptr);
- if (*err_ptr == dd_NoError) {
- dd_WriteSetFamily(stdout,AdjacencyGraph);
- dd_FreeSetFamily(AdjacencyGraph);
- }
- } else {
- printf("begin\n");
- printf(" 0 0\n");
- printf("end\n");
- }
-
- printf("\n");
-}
-
-
-void minimal_Vrep_Hrep(dd_MatrixPtr M,
- dd_MatrixPtr* Vrep_ptr, dd_MatrixPtr* Hrep_ptr,
- dd_ErrorType* err_ptr)
-{
- dd_PolyhedraPtr poly;
- dd_rowindex newpos;
- dd_rowset impl_linset,redset;
- dd_MatrixPtr Vrep, Hrep;
-
- if (*err_ptr != dd_NoError) return;
-
- /* compute the second representation */
- poly = dd_DDMatrix2Poly(M, err_ptr);
- if (*err_ptr != dd_NoError) return;
-
- if (*err_ptr == dd_NoError) {
- /* compute canonical H-representation */
- Hrep = dd_CopyInequalities(poly);
- if (Hrep->rowsize > 0) { /* workaround for bug with empty matrix */
- dd_MatrixCanonicalize(&Hrep, &impl_linset, &redset, &newpos, err_ptr);
- if (*err_ptr == dd_NoError) {
- set_free(redset);
- set_free(impl_linset);
- free(newpos);
- }
- }
- if (*err_ptr == dd_NoError) (*Hrep_ptr) = Hrep;
- }
-
- if (*err_ptr == dd_NoError) {
- /* compute canonical V-representation */
- Vrep = dd_CopyGenerators(poly);
- if (Vrep->rowsize > 0) { /* workaround for bug with empty matrix */
- dd_MatrixCanonicalize(&Vrep, &impl_linset, &redset, &newpos, err_ptr);
- if (*err_ptr == dd_NoError) {
- set_free(redset);
- set_free(impl_linset);
- free(newpos);
- }
- }
- if (*err_ptr == dd_NoError) (*Vrep_ptr) = Vrep;
- }
-
- dd_FreePolyhedra(poly);
-}
-
-
-void print_both_reps(dd_MatrixPtr Vrep, dd_MatrixPtr Hrep)
-{
- /* Output V-representation */
- dd_WriteMatrix(stdout,Vrep);
- printf("\n");
-
- /* Output H-representation */
- dd_WriteMatrix(stdout,Hrep);
- printf("\n");
-}
-
-
-void compute_both_reps(dd_MatrixPtr M, dd_ErrorType* err_ptr)
-{
- dd_MatrixPtr Vrep, Hrep;
- minimal_Vrep_Hrep(M, &Vrep, &Hrep, err_ptr);
- if (*err_ptr != dd_NoError) return;
-
- print_both_reps(Vrep, Hrep);
- dd_FreeMatrix(Hrep);
- dd_FreeMatrix(Vrep);
-}
-
-
-void compute_all(dd_MatrixPtr M, dd_ErrorType* err_ptr)
-{
- dd_MatrixPtr Vrep, Hrep;
- minimal_Vrep_Hrep(M, &Vrep, &Hrep, err_ptr);
- if (*err_ptr != dd_NoError) return;
-
- print_both_reps(Vrep, Hrep);
- compute_adjacency(Vrep, err_ptr);
- compute_adjacency(Hrep, err_ptr);
- dd_FreeMatrix(Hrep);
- dd_FreeMatrix(Vrep);
-}
-
-
-
-void usage(char *name)
-{
- printf("No known option specified, I don't know what to do!\n"
- "Usage:\n"
- "%s --option\n"
- "where --option is precisely one of the following:\n\n"
- " --all: Compute everything.\n"
- " This will compute minimal H-,V-representation and vertex and facet graph.\n"
- "\n"
- " --reps: Compute both a minimal H- and minimal V-representation.\n"
- "\n"
- " --adjacency: Compute adjacency information only.\n"
- " The input is assumed to be a minimal representation, as, for example, computed\n"
- " by --reps. Warning, you will not get the correct answer if the input\n"
- " representation is not minimal! The output is the vertex or facet graph,\n"
- " depending on the input.\n"
- "\n"
- "The input data is a H- or V-representation in cdd's ine/ext format and\n"
- "is in each case read from stdin.\n",
- name);
-}
-
-
-enum command_line_arguments { ALL, REPS, ADJACENCY };
-
-
-int parse_arguments(char* arg, enum command_line_arguments* option)
-{
- if (strcmp(arg,"--all")==0) {
- *option = ALL;
- return 0;
- }
- if (strcmp(arg,"--reps")==0) {
- *option = REPS;
- return 0;
- }
- if (strcmp(arg,"--adjacency")==0) {
- *option = ADJACENCY;
- return 0;
- }
- printf("Unknown option: %s\n", arg);
- return 1;
-}
-
-
-int main(int argc, char *argv[])
-{
- dd_ErrorType err=dd_NoError;
- dd_MatrixPtr M;
- enum command_line_arguments option;
-
- if (argc!=2 || parse_arguments(argv[1],&option)) {
- usage(argv[0]);
- return 0;
- }
-
- dd_set_global_constants();
-
- /* Read data from stdin */
- M = dd_PolyFile2Matrix(stdin, &err);
- if (err != dd_NoError) {
- printf("I was unable to parse the input data!\n");
- dd_WriteErrorMessages(stdout,err);
- dd_free_global_constants();
- return 1;
- }
-
- switch (option) {
- case ALL:
- compute_all(M,&err);
- break;
- case REPS:
- compute_both_reps(M,&err);
- break;
- case ADJACENCY:
- compute_adjacency(M,&err);
- break;
- default:
- printf("unreachable option %d\n", option);
- exit(3); /* unreachable */
- }
-
- /* cleanup */
- dd_FreeMatrix(M);
- if (err != dd_NoError) {
- dd_WriteErrorMessages(stdout,err);
- }
-
- dd_free_global_constants();
- return 0;
-}
-
-
-
diff --git a/sci-libs/cddlib/files/cddlib-094g-add-cdd_both_reps-binary.patch b/sci-libs/cddlib/files/cddlib-094g-add-cdd_both_reps-binary.patch
deleted file mode 100644
index 3aa5912b7460..000000000000
--- a/sci-libs/cddlib/files/cddlib-094g-add-cdd_both_reps-binary.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- src-gmp/Makefile.am 2009-01-26 09:30:16.000000000 +0000
-+++ src-gmp/Makefile.am 2009-10-04 10:36:17.000000000 +0100
-@@ -11,7 +11,8 @@
- testcdd2_gmp \
- testlp1_gmp \
- testlp2_gmp \
--testlp3_gmp
-+testlp3_gmp \
-+cdd_both_reps_gmp
- #cddmathlink
-
- scdd_gmp_SOURCES = simplecdd.c
-@@ -27,6 +28,7 @@
- testlp1_gmp_SOURCES = testlp1.c
- testlp2_gmp_SOURCES = testlp2.c
- testlp3_gmp_SOURCES = testlp3.c
-+cdd_both_reps_gmp_SOURCES = cdd_both_reps.c
- # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
-
- LDADD = ../lib-src-gmp/libcddgmp.la
---- src/Makefile.am 2009-01-26 09:30:03.000000000 +0000
-+++ src/Makefile.am 2009-10-04 10:36:17.000000000 +0100
-@@ -11,7 +11,8 @@
- testcdd2 \
- testlp1 \
- testlp2 \
--testlp3
-+testlp3 \
-+cdd_both_reps
- #cddmathlink
-
- scdd_SOURCES = simplecdd.c
-@@ -27,6 +28,7 @@
- testlp1_SOURCES = testlp1.c
- testlp2_SOURCES = testlp2.c
- testlp3_SOURCES = testlp3.c
-+cdd_both_reps_SOURCES = cdd_both_reps.c
- # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
-
- LDADD = ../lib-src/libcdd.la
-
diff --git a/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch b/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch
deleted file mode 100644
index ba9a909abb19..000000000000
--- a/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up cddlib-094g/src-gmp/Makefile.am.orig cddlib-094g/src-gmp/Makefile.am
---- cddlib-094g/src-gmp/Makefile.am.orig 2012-07-05 13:30:30.982562213 -0400
-+++ cddlib-094g/src-gmp/Makefile.am 2012-07-05 13:31:14.576563881 -0400
-@@ -11,7 +11,8 @@ testcdd1_gmp \
- testcdd2_gmp \
- testlp1_gmp \
- testlp2_gmp \
--testlp3_gmp
-+testlp3_gmp \
-+cdd_both_reps_gmp
- #cddmathlink
-
- scdd_gmp_SOURCES = simplecdd.c
-@@ -27,6 +28,7 @@ testcdd2_gmp_SOURCES = tes
- testlp1_gmp_SOURCES = testlp1.c
- testlp2_gmp_SOURCES = testlp2.c
- testlp3_gmp_SOURCES = testlp3.c
-+cdd_both_reps_gmp_SOURCES = cdd_both_reps.c
- # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
-
- LDADD = ../lib-src-gmp/libcddgmp.la
-diff -up cddlib-094g/src-gmp/Makefile.in.orig cddlib-094g/src-gmp/Makefile.in
-diff -up cddlib-094g/src/Makefile.am.orig cddlib-094g/src/Makefile.am
---- cddlib-094g/src/Makefile.am.orig 2012-07-05 13:34:07.449570501 -0400
-+++ cddlib-094g/src/Makefile.am 2012-07-05 13:34:32.128571446 -0400
-@@ -11,7 +11,8 @@ testshoot \
- testcdd2 \
- testlp1 \
- testlp2 \
--testlp3
-+testlp3 \
-+cdd_both_reps
- #cddmathlink
-
- scdd_SOURCES = simplecdd.c
-@@ -27,6 +28,7 @@ testcdd2_SOURCES = testcdd
- testlp1_SOURCES = testlp1.c
- testlp2_SOURCES = testlp2.c
- testlp3_SOURCES = testlp3.c
-+cdd_both_reps_SOURCES = cdd_both_reps.c
- # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
-
- LDADD = ../lib-src/libcdd.la
diff --git a/sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch b/sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch
deleted file mode 100644
index bab20025a793..000000000000
--- a/sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Don't link against gmp in the non-gmp version
- Using AC_CHECK_LIB will add -lgmp to all children, but we don't want this
- for the non-gmp variants. Instead, add -lgmp explicitly in gmp variants.
-Author: Ximin Luo <infinity0@debian.org>
-Forwarded: TBD
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.in
-+++ b/configure.in
-@@ -14,8 +14,6 @@
- dnl AC_CHECK_LIB(g, main)
- dnl Replace `main' with a function in -lstdc:
- dnl AC_CHECK_LIB(stdc, main)
--dnl look for gmp:
--AC_CHECK_LIB(gmp, main)
-
- dnl Checks for header files.
- AC_HEADER_STDC
---- a/lib-src-gmp/Makefile.am
-+++ b/lib-src-gmp/Makefile.am
-@@ -25,4 +25,4 @@
- setoper.h
-
- AM_CPPFLAGS = -I$(gmpincludedir) -DGMPRATIONAL
--AM_LDFLAGS = -version-info 0:0:0
-+AM_LDFLAGS = -lgmp -version-info 0:0:0
---- a/src-gmp/Makefile.am
-+++ b/src-gmp/Makefile.am
-@@ -32,7 +32,7 @@
- # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
-
- LDADD = ../lib-src-gmp/libcddgmp.la
--AM_LDFLAGS = -L$(gmplibdir)
-+AM_LDFLAGS = -lgmp -L$(gmplibdir)
- INCLUDES = -I../lib-src-gmp
- INCLUDES += -I$(gmpincludedir)
- AM_CPPFLAGS = -DGMPRATIONAL