gentoo new year resync : 01.01.2021

3 files changed, 56 insertions, 25 deletions

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