gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 66 deletions

diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 400cbbb384c1..8561755fddd9 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,6 +1,4 @@
-DIST ppl-1.1.tar.xz 14734820 BLAKE2B 2c96d86b534c7f06569bfe37d0ca1938b0c7c708b38d62e210d868db005275e392b2cc9e6dded7d4a5bf1e901136c298b0ff86d2933dc89b4607d5ef9e286b86 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.1.ebuild 1594 BLAKE2B 1ba5be59ce7903eff44c29b1f7da8961bc963c6eff3de09e400de35cb2b47f7a7f4a86f90bca84d1203eddeacf977089bac784a8b11cccb339a89fe84b1209e1 SHA512 3bb479007912a81237e37052077cc436fc6662ac5566ab8e69ac2897843acb79a2c78767cfcb37b90bcf3876ed9eb53f42aec362e4d697de5fd39c57cff38913
-EBUILD ppl-1.2-r1.ebuild 1259 BLAKE2B d2189b47bb91065fde4312154a90782b4b889dea139eac446e798be6be9112610c3c62a3c36c3059c63a8a25b2d388c662273feee96f4392ed74d939e6862efc SHA512 78666f60f00f5b8376cca440001a415e167bfad549a865e0bbcadaeaca5cd4730b665b5c2ddad3c87a47e1d1b60b5fb6a753886130def75b486d239d484b0b6e
-EBUILD ppl-1.2.ebuild 1598 BLAKE2B 579d3a070b7f167bf8765933988818312d17adc5c03ef11e75f893ede5f4f482ee289bf8d1e493f89fd6ed3e341cdfbb1d0cabbc067dbf9f5325e425c0d45bc6 SHA512 70063616f31d2d1046962c6e57c8c869549d5adece4d4cd12c2517774841b3615b02f640b315c6746681ea67f0d01b727824b3a99e514d4741eaa0243907bb97
+EBUILD ppl-1.2-r1.ebuild 1255 BLAKE2B 612a952756364bbacb0c24fe5c3315be58ede4e7cb10c51cadda39cd877f2b3bcad7435d5c9021148de9198ecda30167b9a70ae7ab04093a274037ff6da80d9a SHA512 d1b1660084489f1ac8d15f948e319a97c7a94405807cf933c0c8a17d7977eb358a95a7245f47680640aa452b4f610a18d86573636c6dd4dac449fdf9cbba064e
+EBUILD ppl-1.2.ebuild 1596 BLAKE2B a1330aef84f7a9024e170aeff4adee135245c8f4ab1b5643db1508df14b738cf0ac8d2ae195b9c930e2a4393513af4fb04b0b1cb8f4fcad970fe60c2aa713be6 SHA512 d6ed03ac19c4789e99a0c797da5b93229ee02935373607c33f3227c16672d288d0c2ddd2c9fec5cd2cc81bc5b6441bc97d28dadd89b8a97815f1cd792a8c813a
 MISC metadata.xml 354 BLAKE2B 77e58ca8f59039d9814e8388a7fa941fe88130fadd21720447f050f09cbccdf289153f15874c6f48cd7d8720841d181e4904e515df87c3a16fc8673283b41b4c SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50
diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
deleted file mode 100644
index 242c50accd94..000000000000
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
-HOMEPAGE="http://bugseng.com/products/ppl"
-SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0/4.13" # SONAMEs
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~sparc-solaris"
-IUSE="+cxx doc lpsol pch static-libs test"
-
-RDEPEND=">=dev-libs/gmp-6[cxx]
-	lpsol? ( sci-mathematics/glpk )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/m4"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use test ; then
-		ewarn "The PPL testsuite will be run."
-		ewarn "Note that this can take several hours to complete on a fast machine."
-	fi
-}
-
-src_configure() {
-	local interfaces=( c )
-	use cxx && interfaces+=( cxx )
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-debugging \
-		--disable-optimization \
-		$(use_enable doc documentation) \
-		$(use_enable lpsol ppl_lpsol) \
-		$(use_enable pch) \
-		$(use_enable static-libs static) \
-		--enable-interfaces="${interfaces[*]}" \
-		$(use test && echo --enable-check=quick)
-}
-
-src_test() {
-	# default src_test runs with -j1, overriding it here saves about
-	# 30 minutes and is recommended by upstream
-	emake check
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}"/usr -name 'libppl*.la' -delete
-
-	pushd "${ED}/usr/share/doc/${PF}" >/dev/null || die
-	rm gpl* fdl* || die
-	if ! use doc; then
-		rm -r *-html/ *.ps.gz *.pdf || die
-	fi
-}
diff --git a/dev-libs/ppl/ppl-1.2-r1.ebuild b/dev-libs/ppl/ppl-1.2-r1.ebuild
index 12b2ca6d0371..6980ae7142cf 100644
--- a/dev-libs/ppl/ppl-1.2-r1.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2.ebuild
index 02423503552f..f312858082bb 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]