gentoo resync : 02.09.2020

9 files changed, 48 insertions, 75 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 6836be8bc80e..0afc9ce3140a 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdcover/Manifest b/app-cdr/cdcover/Manifest
deleted file mode 100644
index fa04d0889c85..000000000000
--- a/app-cdr/cdcover/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cdcover-0.7.4-Makefile.patch 480 BLAKE2B 42eda735fd5a49565dc30625ff4f25154e8060ef81996352dbc83975b3a5fb003e523162ccdb51baff0566249767a5f1754dffb97733fda89192df9a84bb8036 SHA512 eac8ee9fdd649c2f42a20ce8a695c0849d82a8cbfefb85646503d76f2d3f64f7cb17d63fc5924f0a83644d6b9aefa4e5d9d7c3d2c7e69e5572bb5d17ba05ebc3
-DIST cdcover-0.7.4.tar.gz 908267 BLAKE2B dc048bf756e8e9a55f477462a81975ace669c2ecd8d062b5880dce60b286f98d5a5b573704ef4323093e92d3802dc9087114b333462bd5d0979720b207b7d7fd SHA512 5da176559595608ac6565d23a390364b0fff332084206e819f91d22baee86a752677424fdf90e6a6ecf85fa30eab00edc89fb419f3ae82e0fcce0e714dbb1985
-EBUILD cdcover-0.7.4-r1.ebuild 962 BLAKE2B cfa97b8851f795b145c6ad346aeec00b7353498c01eda4fcd7ca1e04443163af85cea519f61a50f934aee14729ef349c4cb6de50abb4d3a2cf4f115b18554fe1 SHA512 2792bd7c5cbd6cccc58c4637d8df645e3c7e98168923c6dddf4970a63e2513b4f9639933b7016a39e6a95e5ad1994cda1079ddb233b6c9177e35cece27154c18
-MISC metadata.xml 244 BLAKE2B 469a05b81bd052f22d5c6cc5aa3683afb144abcb85b7794f077bdb3ef1073dc8295f1a48893f4faa97e51d4763dad89aa7240858b317ff8fe8341f85a059c56d SHA512 a04597cdb8b76cb0476450e0ccab923b3e84d9bc6eed456ab0a80a535a45063318f5d38a3cf943ae3ab0f4d1e803f0eb80e12439ab06068cd771768b1a7e338f
diff --git a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
deleted file mode 100644
index 156c79a1be0a..000000000000
--- a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=tk
-
-inherit eutils python-single-r1
-
-DESCRIPTION="cdcover allows the creation of inlay-sheets for jewel cd-cases"
-HOMEPAGE="http://cdcover.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cddb"
-
-RDEPEND="${PYTHON_DEPS}
-	cddb? (
-		$(python_gen_cond_dep 'dev-python/cddb-py[${PYTHON_MULTI_USEDEP}]')
-	)
-	media-sound/cd-discid"
-DEPEND=""
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	sed -i -e 's:ggv:gv:' dotcdcover.{example,m4} || die
-}
-
-src_compile() {
-	emake prefix="${D}"/usr target=/usr
-}
-
-src_install() {
-	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install
-
-	python_fix_shebang "${D}"
-
-	make_desktop_entry ${PN} ${PN}
-
-	dodoc doc/cdcover.pdf
-}
diff --git a/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch b/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
deleted file mode 100644
index c1026bf23503..000000000000
--- a/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -9,8 +9,8 @@
- IMAGES=./share/images
- TEMPLATES=./share/templates
- 
--DOCFILES=BUGS COPYING INSTALL README VERSION
--IMAGEFILES=autonum.gif cddb.gif exit.gif gv.gif logo.gif nocddb.gif ps.gif
-+DOCFILES=README VERSION
-+IMAGEFILES=application-exit.gif cddb.gif document-print-preview.gif document-save.gif logo.gif nocddb.gif renumber.gif
- TEMPLATEFILES=CD-Classic.pst CD-Modern.pst CD-Tracktime.pst CD-TwoColumns.pst DVD-Classic.pst
- 
- INSTALL=install -D
diff --git a/app-cdr/cdcover/metadata.xml b/app-cdr/cdcover/metadata.xml
deleted file mode 100644
index 88453e2e2dde..000000000000
--- a/app-cdr/cdcover/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cdcover</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/dumpet/Manifest b/app-cdr/dumpet/Manifest
index 838b72e1be14..d68cc472cce3 100644
--- a/app-cdr/dumpet/Manifest
+++ b/app-cdr/dumpet/Manifest
@@ -2,4 +2,5 @@ AUX musl-byteswap-fix.patch 294 BLAKE2B 1967a0ec276357db52b57ed84b2f111dd456477b
 DIST dumpet-2.1_p20140601.tar.gz 20140 BLAKE2B def3e7948096e2543bf24324b17c3b3123b867e750971858cb403732efde6c217fcf1c04955a0dd4ed2f99fdaedecab1becdcc1027645e7a955ed1addf11daa1 SHA512 161911ae136aa81abff5a591593acf421a4101e3f80cb259c5b2190581d5cbd06641eefe4c873d40d1b2adabedb2e42ef7fdd0a6e39ec98e1927550ae8960eda
 EBUILD dumpet-2.1_p20140601-r1.ebuild 865 BLAKE2B 05fe70b1311e20e32e5b199555613d70ad6ccfa1f2a748ffe61133945cd05a4b88e6e2eea78140bc781338fdd609bb8e535860768c500f60f793722ee8ccecc8 SHA512 d30ff2f0d940e404323bb0f9c2e52ad4c26034aad295dff9dd0ecc771d4c3e2bad130007fbd1513ca3f282ebd0098368b443c25974fa6714e81df7a8e2553075
 EBUILD dumpet-2.1_p20140601-r2.ebuild 918 BLAKE2B b7236f9ba6bc556e61d7cede87f0e6b574db1424be8379e57ebb8cb310c4750c43594d349e338a15636486f772f107c7188eb2fb24325565b98725763f97e9cf SHA512 fb835a7c8f653d08b3aad3e9c0617fdbdb636f6753e737619f1c0ee55ae56d2ec713796a4446024eb59be90a7395d8bba5818233f4a1f3c0bb763d24ac29b369
+EBUILD dumpet-2.1_p20140601-r3.ebuild 953 BLAKE2B 08426c94faf86ccd0d044a4c89181f0f56e7039128574b2ef397ebde87c7e9dd181db5b55372400c594b749be8567eba48afa19fd43cc8b1c7f8fdc073d08a43 SHA512 1207bf6f10570460214501716ef59d53d3e5f929cb803b0ec6c34171082984ad0de83b6f36b8b5f43a1285af5bdacc895a5ee1991554763f27b6602d0338e17b
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild b/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
new file mode 100644
index 000000000000..00b1082b508b
--- /dev/null
+++ b/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT="8f47670dd582c96ad1b6dd3c9b9da0acebded5d8"
+
+DESCRIPTION="A tool to dump and debug bootable CD-like images"
+HOMEPAGE="https://github.com/rhboot/dumpet"
+SRC_URI="https://github.com/rhboot/dumpet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+#Restrict tests since required test file is unavailable
+RESTRICT="test"
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/popt"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/valgrind )"
+
+PATCHES=( "${FILESDIR}"/musl-byteswap-fix.patch )
+
+src_prepare() {
+	sed -i Makefile \
+		-e "s/^install : all$/install :/" \
+		-e "s/^CFLAGS:=/CFLAGS?=/" \
+		-e "s/^CC:=/CC?=/" \
+		-e '/^LFLAGS/ s/$/$(LDFLAGS)/' \
+		|| die
+	default
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" dumpet
+}
+
+pkg_setup() {
+	tc-export CC
+}
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index f7ccf96a16c0..723994549956 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -5,5 +5,5 @@ DIST isomaster-1.3.14.tar.bz2 257674 BLAKE2B 7b7abeb586eb8c6964d7959222195c1999f
 DIST isomaster-1.3.15.tar.bz2 251622 BLAKE2B 9a3dd4e4a0d6aa0ff5b76774322e2f66257dda18e01835cad911f7abaa83584de1388a6c21bed8a8c8b5b9e94d4a2f23801e656b2586cb24b38b5aa4ca074c15 SHA512 08d4b12ba1f35e8fdca75b05b3125b046a03e1f1dab6876226b45c76e8a40fa78296854e8142a0864402563913af4c935ffe338777b593026e40e121b4089661
 EBUILD isomaster-1.3.13.ebuild 1490 BLAKE2B 65c8871a3222bff5abac963ec42ca8547155e2b70c26bf87829e7d03714454a6724abae637882b3913e5e6fdb8b8f994570edfdf40ac492944ed3a252cfc979a SHA512 8693942b49c6b7c85e1c7db64f6f8cb98bb13848f3943c9b29e041e7978a44c089bc33fd1e342ec5b28108feb75f1f11621fb0e7f256879c8582cee462b5d4b2
 EBUILD isomaster-1.3.14.ebuild 1495 BLAKE2B 3c508e9fb2edcad37f05cdf222f15e80453b3d150249ed47ca910769c7df07f288529f433c2c6d592eadcfc29ace212b0a9bc88f1b01d0e397cd5572b0bfbbe3 SHA512 e51aaf01126082cf2f2b41ce6ba7f240d04df5500663d65ed60870317130069486b04399c436920434ff2ff2a7f243c4eaae21a0f44cb11fdec92e1a212df437
-EBUILD isomaster-1.3.15.ebuild 1503 BLAKE2B 3ca6260debe02234e74a00c524530824672ce0458b82346208f4236f568e669c62b4de16f876eb474bd54c7d54899f520ff38619b514d362860313f98ab5472c SHA512 daad43b38d78f9b05ecdc1228209ff2478717d767094efc40884c5fc70c8be39901601f9675eb3fa1b7743a35f769c2455406e66ac93c1423f4ec5d3e13d7576
+EBUILD isomaster-1.3.15.ebuild 1502 BLAKE2B 614d283c404345c3af4bfa2bc6b33071146f263e633abe7ea68a0d0805ee4bdb169205df8d89923459145f99c9a09ad1672012ee895c58f7326fb8a3e8ba8c7d SHA512 c2f4febb643dd3803f0c2a863e53113196b349d2daa7051625ed6c00a29d61e19432f2e3c4793a275f9b7bd659cbe192a7548eeea83bddafcfc411807b6b8b9b
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/isomaster-1.3.15.ebuild b/app-cdr/isomaster/isomaster-1.3.15.ebuild
index 2012fa69bf64..5584d6f052c3 100644
--- a/app-cdr/isomaster/isomaster-1.3.15.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/iniparser-4.1:4