gentoo resync : 15.01.2020

4 files changed, 3 insertions, 111 deletions

diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index c772578f6353..a7f24520b6ed 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1,7 +1,3 @@
-DIST lrslib-042c.tar.gz 168765 BLAKE2B d9ac0d59e4ca356f4cf76fa4f3756b6badd79a8c8546b7bd3a2dc65d211af30d354b9829395e68d79bb5acf24ba2087ca4d8a390a7c7d98e6cad86d0f9a27eac SHA512 a5fdd65b2c4e4cadd5fb9679e0e94ddc6b3564cdb9bdfcb7304351fec943527d2dccf117148d8d418ad8bd4577c9f69dabd6ca07107c1c1555c8c6d17f38fa60
-DIST lrslib-051.tar.gz 179396 BLAKE2B 22697dc4e99bf9ae528328c1a03e87f5101b1e0c74cbee9c7dafb5e1c897ad07587e9664abd9710094a6fe78cba0cff48c0489f687bedb616886101286153cc6 SHA512 65e4752ae75f06bccb74b0e12e0b03943654cba048d54dbcf93a36bea7f73b32826babe066d5fe20d3c6609548dc957063558633affe64d795c240c1fe748927
 DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f
-EBUILD lrslib-042c-r2.ebuild 1312 BLAKE2B 67ab2c35e3be56629e05fc62d3602058bc799a94c8741fe47c3f0346a93282cb7bf155f67e819b0992db9030950e06d344b054cc9e24fba3e4c1121a7ee656d2 SHA512 3d9dc22227f77784303922d1fb693ddd7ccd8b588743b2270243c584f1dbac97b633cab7bc4fcd5c2176fd4c6d29841f6a6eec589e8fbdf6f4420fb284bc9b79
-EBUILD lrslib-051.ebuild 915 BLAKE2B c67319e8aec861ca0a0ab3220390025164625c4f4d10bf876edd4bcf49cb3469dbf534d5c2659975f4c299f7bb4215fb82a62d3463fbc9c78b52b23e0bb3b5b0 SHA512 f557d6681656fa4bc6243a88575f3ae14eb5b6264e8c409b898cc23423eb80107cc311a5ad01cb4338f87dc059a96536b23bf0b0e6cb4981014383310aea00e2
-EBUILD lrslib-062.ebuild 1114 BLAKE2B 455c4e6e732fdfaa491da292db2d8bdf55c6b692da6bd738d617d8bb51e225dfa3b88263894482f4b5b38a0bb0daf3bc726fd5ec5e88ca269e210dd198a5eee9 SHA512 6e29d90108ae11e1cc5143406ecb7636277395fa3ebfbaa02eb8cd11e5f2f5a0f43877a75e52bbfddc5ea6104f4524b87daa8f092bfa02a20f13733d38d2492e
+EBUILD lrslib-062.ebuild 1109 BLAKE2B 8ea9aab321b54be31d5366f9e2b0e2a4c1b10c38b25e0fec72426f31251cf23512adf4f27364382aeb2c1a50d4923f311e5d0c883cdd1060fdcd49a75487a055 SHA512 a948ff0ccc8732045861cfb1a70ee378143e0bcd448d397adb6f24a3826c1e351a618d977f52d4a870f0bf3bce1a13422648b33d185eb3b78e81cc00e5b98999
 MISC metadata.xml 769 BLAKE2B 5660de1ef577fce0595a5d28eac737e1454bb97ec47a1993cfc9047a505ebef1d1c3984a129e4367ba5dfb2f8bc5975bcb7b7332e268528d820f1ea3231dabbc SHA512 f604771858909c1fb3f4f4c47094e9d6b16c1294575026246008c927a4d99aae6a2bdad45d66fe87c8be68b5a5a23f6fdfa72ec26a00a2a48a2ae7fe64cfb57d
diff --git a/sci-libs/lrslib/lrslib-042c-r2.ebuild b/sci-libs/lrslib/lrslib-042c-r2.ebuild
deleted file mode 100644
index 8fafdff0cba2..000000000000
--- a/sci-libs/lrslib/lrslib-042c-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="self-contained ANSI C implementation of the reverse search algorithm"
-HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
-SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp"
-
-DEPEND="gmp? ( dev-libs/gmp )"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	sed -i "s/gcc/$(tc-getCC)/g" makefile || die
-	sed -i "s/-O3/${CFLAGS} ${LDFLAGS}/g" makefile || die
-	# We don't like static linking to gmp or anywhere.
-	if use amd64 ; then
-		# This macro may only change messages that the
-		# binary outputs, but just in case... (Bug 384195)
-		sed -i "s/-static/-DB64/g" makefile || die
-	else
-		sed -i "s/-static//g" makefile || die
-	fi
-}
-
-src_compile () {
-	if use amd64 ; then
-		emake all64
-	else
-		emake
-	fi
-	if use gmp ; then
-		emake gmp
-	fi
-}
-
-src_install() {
-	dobin lrs redund redund1
-	# Collides with sys-block/buffer
-	newbin buffer lrsbuffer
-	if use x86; then
-		dobin nash setupnash setupnash2 2nash
-		# Prevent clash with cddlib:
-		newbin fourier lrsfourier
-	fi
-	if use gmp; then
-		dobin glrs gredund gfourier
-		# Clash with www-plugins/gnash
-		newbin gnash lrsgnash
-	fi
-	dodoc readme
-	dohtml lrslib.html
-}
diff --git a/sci-libs/lrslib/lrslib-051.ebuild b/sci-libs/lrslib/lrslib-051.ebuild
deleted file mode 100644
index 8c8e791b7941..000000000000
--- a/sci-libs/lrslib/lrslib-051.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="self-contained ANSI C implementation of the reverse search algorithm"
-HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
-SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gmp"
-
-DEPEND="gmp? ( dev-libs/gmp:0= )"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	sed -i "s/gcc/$(tc-getCC)/g" makefile || die
-	sed -i "s/-O3/${CFLAGS} ${LDFLAGS}/g" makefile || die
-	# Prefix for install
-	sed -i "s,/usr/local,/usr,g" makefile || die
-}
-
-src_compile () {
-	if use gmp ; then
-		emake all
-		emake all-shared
-	else
-		emake allmp
-	fi
-}
-
-src_install() {
-	dodoc readme
-	# Library
-	if use gmp ; then
-		emake DESTDIR="${D}" install-shared
-	fi
-	# Install default set of binaries
-	emake DESTDIR="${D}" install-common
-}
diff --git a/sci-libs/lrslib/lrslib-062.ebuild b/sci-libs/lrslib/lrslib-062.ebuild
index 1df9b43c7019..3cade66effaa 100644
--- a/sci-libs/lrslib/lrslib-062.ebuild
+++ b/sci-libs/lrslib/lrslib-062.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="gmp mpi"
 
 RDEPEND="gmp? ( dev-libs/gmp:0=