gentoo resync : 25.04.2020

4 files changed, 2 insertions, 162 deletions

diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index e8337e380151..8adb05e22424 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,9 +1,6 @@
-AUX glpk-4.63-debundle-system-libs.patch 2240 BLAKE2B 5bd0d25768682a410159e3bf0eaf83dc038da8c6bda275c6994846516bb347caf6d4ea726e8635c77b84a463cb1ec32955f573589291486067c651a88d7f276c SHA512 186c1dd2197119b376a76a2db9a73d7fc1e43adc6ae54f5d3e39ad9114a9a406d45dd7bce4bcea31cfce94e71234b70872db22378e8312026912a93077488805
 AUX glpk-4.65-debundle-system-libs.patch 1930 BLAKE2B 0c265afe9338e75bb3d6536e9e0b2f473e15b4b524b29244bd6bce44a1f77e48c122a463a3800a246435b47d240e799fd16a21ef5c66eb00643759774c47ef73 SHA512 940c2d3dc12efd8df90c17277630a60ea6682eff0323ea82eeb8b81377db612103c29fb44bbe8ff936d96a436548be3e4c772f55f8412adaad546a6381be6333
 AUX glpk-4.65-fix-mysql-include-prefix.patch 1837 BLAKE2B ecd90024e07f29e8ebb6af80b520c8f192cfea21c90d8c247001389f2ccfcf24ad487981a0cc719d1ca99e266dd2a9d66f6416d4f2d5e7c80bdf807b9bb7b74e SHA512 c74281bf3e03e136d183b562b8f682a3e1957019a36ec0c6a048049f0d5f55361107a62e36eaa9e3306a1f13df10adf55c2f54f096b6e353108856e05d9ce799
 AUX glpk-4.65-longstep_verbosity.patch 844 BLAKE2B c1d14e6dfd596694bf1da060129713eb70ceebd4b1742e8496b89c1e1bfefa5bfdf320ecb8d863aa5b5a0d9750bca8bf59b261608cc39b1d1a0b3fe3b10a7be4 SHA512 29d8e876c0d5fba14056e8f0639e3746c6f4c0eefcad284727921e0ca7184ad96b4363dfe9bfe67b74d6d9419f37d21e453e431bf53438b624c1ab0ef9fe1092
-DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c
 DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
-EBUILD glpk-4.63.ebuild 1460 BLAKE2B 87059596f20960dc68de7bd7fd804bbb7774ea373601782da090fa3dad4403e28725cfed8dc31bb25c0a229ff5275b7950665c31baf2f2fdf9c88f0489f25073 SHA512 3d5c104f103f46440499181f5c0155ca1a8d4b7418fc8c93bcff7382601f4fbcd2380ea3a637ad469c0ac3a579b67b6c011ecdcfaf66fb0cd40adb33c675dff3
-EBUILD glpk-4.65.ebuild 1792 BLAKE2B f32f1e3e8d84be2e5419114abb7aee35ad0e6c5692bb01835f58d869b571832dbc2d49f1cb8ad42fbb7a2edcc632f7a0b167fbe27c59ed05ba3a5dcfb5643a2d SHA512 31041d5866fbd516cba4f7db1332de86f0d47820da51d5cc30a22dc1109df7cf7465af31e489779c94e5faab9c4c126ef13f6ad7662d397e5ffdc3aac99d7542
+EBUILD glpk-4.65.ebuild 1787 BLAKE2B cce26aa79190ce27f60a49f7325a2adc005ebfb47ccdc5f0b6252b87441c88af90c43cf7524e61e3b9377a9108ace3d97ce7bc3feaec51a8d4aa1ea66caba5ab SHA512 2fc117d1bff9cc476b19a0a63a12701bda56fc33c80d87bc8c8cddee34702f5dbff5ff4fe37239bf349db46443ea8e4167fc853fc9d4f9cb583587d57b2c5d60
 MISC metadata.xml 998 BLAKE2B 11afba9ccdd6a53cee9432201eee2ae03483da71212f1c7f9907a775e6c2fcce068648fdae87965dab7550c9157c86697802707b582589626cf48e4236aa56e0 SHA512 1ef83c282b3a6143a1e85a1ecdc55463cf5617409dc990806917077c30e4acd2663b2772bf47aa96c572ee78dab76467c10b4ae9a2705220aa6e8e4936c4f7b5
diff --git a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch
deleted file mode 100644
index e836219d0add..000000000000
--- a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Remove suitesparse (camd,colamd) and zlib bundles
-bicatali - apr 2014
-Updated for 4.57 by soap (Jan 2016)
-Updated for 4.60 by bicatali (Dec 2016)
-Updated for 4.63 by bicatali (Jul 2017)
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/configure.ac glpk-4.63/configure.ac
---- glpk-4.63.orig/configure.ac	2017-07-25 00:00:00.000000000 -0700
-+++ glpk-4.63/configure.ac	2017-07-27 14:10:47.986520907 -0700
-@@ -69,6 +69,11 @@
- dnl Check for math library
- AC_CHECK_LIB([m], [exp])
- 
-+AC_CHECK_LIB([amd], [amd_1])
-+AC_CHECK_LIB([colamd], [colamd])
-+AC_CHECK_HEADER([amd.h])
-+AC_CHECK_LIB([z], [gzopen])
-+
- dnl Check for <sys/time.h> header
- AC_CHECK_HEADER([sys/time.h],
-    AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
-diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/src/Makefile.am glpk-4.63/src/Makefile.am
---- glpk-4.63.orig/src/Makefile.am	2017-07-25 00:00:00.000000000 -0700
-+++ glpk-4.63/src/Makefile.am	2017-07-27 14:11:30.841536062 -0700
-@@ -6,18 +6,15 @@
- 
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/api \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
- -I$(srcdir)/mpl \
- -I$(srcdir)/proxy \
---I$(srcdir)/simplex \
---I$(srcdir)/zlib
-+-I$(srcdir)/simplex
- 
- libglpk_la_LDFLAGS = \
- -version-info 42:2:2 \
-@@ -57,18 +54,6 @@
- glpssx01.c \
- glpssx02.c \
- lux.c \
--amd/amd_1.c \
--amd/amd_2.c \
--amd/amd_aat.c \
--amd/amd_control.c \
--amd/amd_defaults.c \
--amd/amd_dump.c \
--amd/amd_info.c \
--amd/amd_order.c \
--amd/amd_post_tree.c \
--amd/amd_postorder.c \
--amd/amd_preprocess.c \
--amd/amd_valid.c \
- api/advbas.c \
- api/asnhall.c \
- api/asnlp.c \
-@@ -142,7 +127,6 @@
- cglib/gmigen.c \
- cglib/mirgen.c \
- cglib/spv.c \
--colamd/colamd.c \
- env/alloc.c \
- env/dlsup.c \
- env/env.c \
-@@ -196,21 +180,6 @@
- simplex/spxprob.c \
- simplex/spychuzc.c \
- simplex/spychuzr.c \
--simplex/spydual.c \
--zlib/adler32.c \
--zlib/compress.c \
--zlib/crc32.c \
--zlib/deflate.c \
--zlib/gzclose.c \
--zlib/gzlib.c \
--zlib/gzread.c \
--zlib/gzwrite.c \
--zlib/inffast.c \
--zlib/inflate.c \
--zlib/inftrees.c \
--zlib/trees.c \
--zlib/uncompr.c \
--zlib/zio.c \
--zlib/zutil.c
-+simplex/spydual.c
- 
- ## eof ##
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
deleted file mode 100644
index e895918d23a1..000000000000
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/40"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="
-	sci-libs/amd:0=
-	sci-libs/colamd:=
-	sys-libs/zlib:0=
-	gmp? ( dev-libs/gmp:0= )
-	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.63-debundle-system-libs.patch
-)
-
-src_prepare() {
-	sed -e 's#CPPFLAGS="-I/usr/include/mysql#CPPFLAGS="-I'"${EPREFIX}"'/usr/include/mysql#' -i configure.ac || die
-	use odbc && [[ -z $(type -P odbc_config) ]] && \
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	else
-		myconf="--disable-dl"
-	fi
-
-	econf ${myconf} \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable static-libs static) \
-		$(use_with gmp)
-}
-
-src_install() {
-	default
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild
index 258796fa21ae..a08a4af54c4f 100644
--- a/sci-mathematics/glpk/glpk-4.65.ebuild
+++ b/sci-mathematics/glpk/glpk-4.65.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/40"
 IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="