gentoo new year resync : 01.01.2021

11 files changed, 64 insertions, 33 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 81cd7d70e36b..a4b7344a4449 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index b2e3878a02a2..30cbe27293c9 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,5 +1,5 @@
 AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
 AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
 DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
-EBUILD cdrdao-1.2.4.ebuild 1276 BLAKE2B ae784b2cf7a87ff73009efdfb21adb805f292ac44fd9595429340faf82cb94f24f1019c4a552f81e2d085b8b8d2d963be541f8f15f5717dd4d6ca66003905788 SHA512 74b72d8c9979d868c49e4a25bfef8bb4555c76a183a8d6f040e4fca1b9e220d226964492767ef98cfbaf67093f4f386778cbd9cd4b8fc304ea38890117318fd5
+EBUILD cdrdao-1.2.4.ebuild 1277 BLAKE2B 1bf79bfe39e8370eaa5abcebcce920dfcd6264ef53ff4956b308316efac05281a641d0bb8151ff06f7976fe8c6664876dcbe67768f885d84b5885b8fd95d3290 SHA512 c0e69fe3286580241cda3e39e931db8018e935d77ded7cc5d7d264900cd3e372384f88a4d8d26f45168f71909e357989e3dc5e0ecf2a869a53735c835f09845a
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index 89a6b02600a9..e083bfe8fa6d 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="encode mad vorbis"
 
 COMMON_DEPEND="
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index bca57faec4ee..9f6a57c3b065 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,6 +1,6 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8307 BLAKE2B f0a70affbb805dc31bd096d305edea97a0d0366c731547cdd112e133d41a1778c067796bd25a98796b9d1da2097b2afbeb0266340c5548b84fb28564c6a97386 SHA512 64b77433fa082b3ffa7f21babe2dfe06aaa4d8f78deb7d4bb06201e6876fdf3556450a6495fd05dc5863cb5eb0de6a226ffd13e3e0398294a319b2ac0f33b009
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8308 BLAKE2B b4adb966071c082867674170a193a6aaf613d90fe2e01acde251a66f4d30aeeb54f09857524f449b0bb9d2b82ee8612375ca19398ad49acfd33b7e07fcf5bcac SHA512 cdb2baf90783a4badc9696df70e845c02c977ac3988c0f7e98c0b5af926391c54e3308e7bf92b9318b35282301a98f07b814ba060de13c2463f8bdea42e695ca
 EBUILD cdrtools-3.02_alpha09-r3.ebuild 8401 BLAKE2B e32ea373c65cc1b74fa8acd970991dcca9047a26b300d9bbce3c75ba2063dee8ca07b7e80c95d88d4dd34d9e4eb44a629ab90ed7335b52a67f75db2be827ec93 SHA512 00b84a4885e36abfe984e8080100641c221c0ec16c69ab850f83685a64cc47d0c9d96549b640a24c8a0859dc945dbe494ef52fa9dff47443ffc20280243e5a79
-EBUILD cdrtools-3.02_alpha09.ebuild 8238 BLAKE2B 7bb73807895571dee4c7322a86ded1540ed2446f9be36fe72039a259b88c048a7f03725aa146c7977c69dd132aa143fb30cb9ef92e185e1bb475b902e6c14af3 SHA512 2547caf73df8bfa14b25e144d49208e53c771acbb0a23ce87e8d1c249e16a3cb2fd73babedcf4c3cfd5f0a8f180343de22fb6ac71780dee9f1040e0c6ca607e6
+EBUILD cdrtools-3.02_alpha09.ebuild 8239 BLAKE2B 4e021f5c66c3ebc25f2facbe8f88c379f82d8c7eaaa35a88316efb659d39f5a0d056604c24888296a069e57047e0e4cf42ee90f3e5e5ddfe2bd3cb1a79dedfd7 SHA512 d32eab33bc62db128a0deee811a30441565dcf89e0b2d7c11a64afae3bc81df108b1d20c345cf502143bec7b25c9ff8b6b125c03cb6be1a38fd7ad11fb4d20a7
 MISC metadata.xml 444 BLAKE2B 4d6375fb99e7751846883ef73422767522b2d43c9d48869a9babac90e507b90e076a80b6cb9e920869c07000d64168b1cd1b75c1d7655e9b06c0a4a2bd957fdd SHA512 0945a0d302bd8c16b1512a8b63250bd39b7685121fb26dc9677b6c4fb1c81bee41b104df07fa77f83cb8a8461ccf408a0ce2a3cd979bb943935109f4b664b020
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index 0d3043b3c791..859df6e277f6 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index b6c8ee6bdd56..b4a67d02ffc8 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index bd30ed42ad0a..2aa50dedc649 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -9,5 +9,5 @@ AUX dvd+rw-tools-7.1-bluray_srm+pow.patch 427 BLAKE2B 5caea4e6afd1af9b0afd33e9cf
 AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc87b26597ead0b623deb22bff11a40638bd5faca1de75b8289484889d2d2768077fd637dfe57fdb8bc9f61c1ddd6bed91d SHA512 554b1eb09a00e6bba38acc6ab983f3e0e810b919eb2205f9ee6473d83edd0fdd524e29b844f4c5a55f8044bb72457b2896a24488d691773a00aa355dd1be9975
 AUX dvd+rw-tools-7.1-noevent.patch 783 BLAKE2B 78f27d65759b98607ac6e3eb29ce44c2d88029f7fdaffd3a6d305166b82a069c8a8621b2c680bfbb3a9a2e6585370bc6c1503b4107e903f69099565bfdc0de8d SHA512 0df88a56b3b776934fea0caca1ac247b5b5416fa4985601ac7996633a833b4d264b334d6bb9c5d7587227529ee36a7f2087fad9f6851b4cde8918204d8718b47
 DIST dvd+rw-tools-7.1.tar.gz 140846 BLAKE2B e456be6ee8d1863e78abc6d494a1ce08a49e3aec9b45533408c33ff4620dfc450b968280ce0453b0c0d966f3afca0d23e1ed7e3497caee8216561ad85599b138 SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31
-EBUILD dvd+rw-tools-7.1-r3.ebuild 1535 BLAKE2B 9266e418664e83e9420a0bb1dc367550c2b61f2422e224f5024ded0194c6933d79eb5781cb11391d6144e5af3f22aee8b49bea6e05f9f049256cbeb24121e5cd SHA512 c3d701aa8c6da697c6031d03532df6dec5f89f9adf1555f1a4708122b727ece5a4f0f5b8e8c6e07b35b5861c6714692f3c4e07861f4bea24a0721ee50a070d99
+EBUILD dvd+rw-tools-7.1-r3.ebuild 1536 BLAKE2B 079c22093d821610304c2b687b14feb4e15d70c50acf897c97c40a3d99c9783174feabd7ab08029e85a4011a33ff759d607429b04889f0a56938c37c22919e08 SHA512 e9eeacdc4c4ef38eca0195b90ad1fc6a5e8722c637fb5dcc608a131cc496efdc7f37ac5e2180276e65337834bc1a8dca18c46e3e3624e9447cedcf90f6a0c376
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index c797c1c67194..f2e040ecf9d2 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="app-cdr/cdrtools"
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index db71cf8b263f..353d2e2ef49f 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -1,3 +1,4 @@
+AUX dvdisaster-0.79.5-fno-common.patch 538 BLAKE2B c50640bd957b1545fde6692920c4fd1a1877a0da6f03aca61eb03e8b0c2e4af72b82c8a9b4f769ab45f0627f9537b70ec188eb5f4f3a57168c9b3024770a9a60 SHA512 0e2c1dd7b48553975df2f3c2d56c811a489aae8dd65a3f57a544eab7c01d9b9022c1574d92a8210a1fef0fc8f44948509c6abf19d64bd3b871c1dc480c25b71f
 DIST dvdisaster-0.79.5.tar.bz2 8224726 BLAKE2B 443816b550a627ce1998eae71c6524c17105c7253af1e1591eae06055d342afc4457b847c53bfb857793676fc50ca9c5c7f33dafaf541c92e84f149a2987d632 SHA512 8630d4389983307afc3faa5b4256f531ded370f84ec35d4a363853dc7d79e5e15ee0b81bf64f4b88f57fe6176537df8195f83acf23e770d991c700b7408dd1f5
-EBUILD dvdisaster-0.79.5.ebuild 1728 BLAKE2B 5b2e6687ec1f3771b567bb6105cfb87a25f0d8d9e3a25188f76756fb97a55578f83d9d684536a3b8a3dbd27b005d30cb58357bfaa2f58272f27efa7c0239c2df SHA512 c18c942b7b23403942784c2184e65ec7362a4ca4a564f40fc31e7faa73e5144632844d4b79853ac58c2715345650c885ccbebd826035330959fc8cc9a854135e
+EBUILD dvdisaster-0.79.5.ebuild 1860 BLAKE2B 4ada7e92304ba60c31e6e06d2e4868c78112b3ae63ab0c31a0b84c4d80b43893c10646417caf7c680cba5fb131023aedff4e89d906568209c39a86388ccd7ae5 SHA512 27b5b0dc6247cc37f217472d15aa79f18dc759be57c0dcc22646074f4fb2546f46ed8e0ebced43cc0bf688a1121788eedd314ba1eeba22785741364d74ee27cf
 MISC metadata.xml 533 BLAKE2B 9db837ca6d8d637bd17eec18ae9f395d5217ca63455d90d1615bffe4a8cf858aa502b144ff9132853895d995db4776d2c9f2108ac3dcc0d6c451b0ad7d82e91f SHA512 d554061a440ce135ad7a799cc9717885f22d2da11bab7c7a755654e93aefa9404d80ed628d669473c411d3f6710eec6149ff2716075f02b99e4cc53f219a8716
diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
index 1cdfebed6125..242cffbb8bb8 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop gnome2-utils toolchain-funcs
+EAPI=7
+
+inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)"
 HOMEPAGE="http://dvdisaster.net/"
-SRC_URI="http://dvdisaster.net/downloads/${PN}-${PV}.tar.bz2"
+SRC_URI="http://dvdisaster.net/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -20,28 +21,36 @@ done
 unset dvdi_lang
 
 RDEPEND="
-	>=dev-libs/glib-2.32:2
-	nls? ( virtual/libintl )
-	>=x11-libs/gtk+-2.6:2
+	dev-libs/glib:2
 	x11-libs/gdk-pixbuf
-"
-DEPEND="${RDEPEND}
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/os-headers
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+DOCS=( CHANGELOG CREDITS.en README README.MODIFYING TODO TRANSLATION.HOWTO )
+
+src_prepare() {
+	default
+	sed -i -e "s@CC=gcc@CC=$(tc-getCC)@" scripts/bash-based-configure || die
+}
 
 src_configure() {
 	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--docdir="${EPREFIX}"/usr/share/doc \
 		--docsubdir=${PF} \
-		--localedir=/usr/share/locale \
+		--localedir="${EPREFIX}"/usr/share/locale \
 		--buildroot="${D}" \
-		--with-nls=$(usex nls) \
-		--with-memdebug=$(usex debug) || die
+		--with-memdebug=$(usex debug) \
+		--with-nls=$(usex nls) || die
 }
 
 src_compile() {
@@ -49,7 +58,7 @@ src_compile() {
 }
 
 src_install() {
-	DOCS="CHANGELOG CREDITS.en README* TODO *HOWTO" default
+	default
 
 	newicon contrib/${PN}48.png ${PN}.png
 	make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
@@ -59,7 +68,7 @@ src_install() {
 		newicon -s ${res} contrib/${PN}${res}.png ${PN}.png
 	done
 
-	local dest="${D}"usr/share
+	local dest="${ED}"/usr/share
 
 	local dvdi_lang
 	for dvdi_lang in ${dvdi_langs}; do
@@ -69,8 +78,5 @@ src_install() {
 			${dest}/man/${dvdi_lang/-/_} || die
 	done
 
-	rm -f "${D}"usr/bin/*-uninstall.sh || die
+	rm ${ED}/usr/bin/*-uninstall.sh || die
 }
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-cdr/dvdisaster/files/dvdisaster-0.79.5-fno-common.patch b/app-cdr/dvdisaster/files/dvdisaster-0.79.5-fno-common.patch
new file mode 100644
index 000000000000..c4c86138865e
--- /dev/null
+++ b/app-cdr/dvdisaster/files/dvdisaster-0.79.5-fno-common.patch
@@ -0,0 +1,24 @@
+--- a/dvdisaster.h
++++ b/dvdisaster.h
+@@ -425,9 +425,9 @@ typedef struct _CrcBlock
+  *** forward declarations
+  ***/
+ 
+-struct _RawBuffer *rawbuffer_forward;
+-struct _DefectiveSectorHeader *dsh_forward;
+-struct _DeviceHandle *dh_forward;
++extern struct _RawBuffer *rawbuffer_forward;
++extern struct _DefectiveSectorHeader *dsh_forward;
++extern struct _DeviceHandle *dh_forward;
+ 
+ /***
+  *** bitmap.c
+@@ -450,7 +450,7 @@ void FreeBitmap(Bitmap*);
+  *** build.h
+  ***/
+ 
+-int buildCount;
++extern int buildCount;
+ 
+ /***
+  *** cacheprobe.h