gentoo resync : 31.05.2021

3 files changed, 3 insertions, 58 deletions

diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index bb4af472b40a..96814208e5ab 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -1,5 +1,3 @@
-DIST cddlib-0.94j.tar.gz 1364746 BLAKE2B 60e81fccf8abd8d60fb7261d1d2d61b7ad2b60285e7dfa760905e2cb5b01f1570c27920728c12fc6994135e4b29ba8e1709066ddf2e2eff00f8f48b093ebd43e SHA512 b82d5e06538a29143a79f7ba7287a1784292e28f086071041e500fd81387a30c3fca6fae9049752f57b62d50b385d73681276d42d24941e3a43893da00452ea6
 DIST cddlib-0.94m.tar.gz 1351298 BLAKE2B 0e1931ba94771f0dcae0ee10b003940ca331839eb8ce001ab02c4f1b382dde74d7dfcf74f4c62e1ae7214a3139547c09f56ef0cba5df74fc03a63ab741b64690 SHA512 50997bda38c36990456345881dc1eac65b1880aa510ea3812ae46a122ba7696bf3577f2b6976ff16811ee00f0a920c8ed6f1e7de0a4060bfaa96def11bab816e
-EBUILD cddlib-094j.ebuild 1396 BLAKE2B 032b697c46fd170dea85951451389f30fafe5ec67cee387583514bc8cff83ee8e5bf570308078f14deb88d42821bfaae6f8f847aa4e8df83827a00f81f413f2b SHA512 3fe5afeedefabaae12a1becc1ec735020802cf4b4b8184591a4b51c34147b087fbcf1a4a46c246ddf84a7dd320c056f70d6739a13c76d662776755e9dc125c74
-EBUILD cddlib-094m-r1.ebuild 1409 BLAKE2B 5d2d806df3b05611cdfe8ce235f1aa97917b9989cfbb3f4e5293b88817c6874e799d23bb823d63e434a70a16457855686124cb9c6b2ac4179966f9f69aeb26c1 SHA512 b9c324bb0c382fae96518e7e1cba92b20a3ee240dad56d402c521cb92aabfbb6c2c5297913b7fcc49dc5465b9527a0e8611602da68f1d91b85a9d261572944ca
+EBUILD cddlib-094m-r1.ebuild 1406 BLAKE2B 9fd279d6051a414e49c84f40f70e10f00f0de47788d4ce3b0f5e381c56847affbb79a336a79d96d0d11d92ff26043d4f13b70f9fff9e685da3af8f43ad5a791f SHA512 83195fe0ff4f39e76885119d6c0aad8d61799b3db2317f7c6ec89f935ef45fd669db252ae7260c92efb24787795ef445c9450dc5a71e460a7586bd61f803409b
 MISC metadata.xml 1847 BLAKE2B 2917e4e43137206b759b78f5fa5d94f68f7dbf767e648ace868c3052a7351fcf1184232817141987e730ab596e0bb7c48c3273a872e7e1e5ec3ca60685055462 SHA512 70d46548955ccce28224210acafbafe4bf12dc471950298f214a9db78107d13c011cfc472fa41d9d5b14001bdb29d1afed0653683186085d37b6d117980cc8b7
diff --git a/sci-libs/cddlib/cddlib-094j.ebuild b/sci-libs/cddlib/cddlib-094j.ebuild
deleted file mode 100644
index e53e3ec982f7..000000000000
--- a/sci-libs/cddlib/cddlib-094j.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This should have been dealt with versionator in the direction
-# 0.94x -> 094x - now we are screwed.
-MY_PV="0.94j"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="C library implementing the Double Description Method"
-HOMEPAGE="https://www.inf.ethz.ch/personal/fukudak/cdd_home/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs tools"
-
-DEPEND="dev-libs/gmp:0"
-RDEPEND="dev-libs/gmp:0="
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use tools; then
-		rm "${ED}"/usr/bin/* || die
-	fi
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	# Nobody wants the dvi/ps manual...
-	rm "${ED}/usr/share/doc/${PF}"/cddlibman.{dvi,ps} || die
-
-	# since the PDF manual is installed by default.
-	if ! use doc; then
-		rm "${ED}/usr/share/doc/${PF}"/cddlibman.pdf || die
-	fi
-
-	# The docs and examples are *both* installed by default, so we
-	# have to remove the examples if the user doesn't want them.
-	docompress -x "/usr/share/doc/${PF}"/examples{,-ext,-ine,-ine3d}
-	if ! use examples; then
-		rm -r "${ED}/usr/share/doc/${PF}"/examples{,-ext,-ine,-ine3d} || die
-	fi
-}
diff --git a/sci-libs/cddlib/cddlib-094m-r1.ebuild b/sci-libs/cddlib/cddlib-094m-r1.ebuild
index 6dc83abed745..3fd1ce1f01e5 100644
--- a/sci-libs/cddlib/cddlib-094m-r1.ebuild
+++ b/sci-libs/cddlib/cddlib-094m-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,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"