gentoo resync : 28.04.2021

7 files changed, 164 insertions, 33 deletions

diff --git a/app-arch/xdms/Manifest b/app-arch/xdms/Manifest
index 591f913e8e37..e6f307c06491 100644
--- a/app-arch/xdms/Manifest
+++ b/app-arch/xdms/Manifest
@@ -1,3 +1,6 @@
+AUX xdms-1.3.2-dont-compress-man-pages.patch 499 BLAKE2B 69be6d731cff4d369d57d6a9fc71f122ade07f48c6351ada5e45ffa9f668d68bdf82ff2091dcdf64803659677a2d24b2133b8e04217f7ccb3273710df33497f1 SHA512 1b0e209782c68961515bfe3c6055732652ed6eb6a8aae968ab7273a5174274d37ec024c68179e43c433a129546483105c68a76c74addccd938b202dbdea3f2ee
+AUX xdms-1.3.2-fix-build-with-gcc-10.patch 1887 BLAKE2B ba0c0316bd660eebcdb3f70c29fbce2726f09528c1ef19e7659a527b6054fd6d5449a9310ad398ab05bb1ce309becfc7168f9a83bdb15177850535e3889b2d31 SHA512 e7dc413aa2b21a01fdcf1c1b19ea8a9f42ce249f3450cebc5aeee966120d67e3f2e56af2d4d4aa9bcf13e2d83edaa51b1ba1030a9f519dd4c536d592f907deea
+AUX xdms-1.3.2-respect-DESTDIR.patch 957 BLAKE2B c3296fdc3ef98936a76c76548f4294775faaa016d6ab5ab38f673c09a860b1da0a96f29824ea6583f31eb77c6ed2fbe34afcc8c561e1d842634f013a7afaa711 SHA512 59960128c6cb364483948c4009e9f465c9521990725079dea3b1431863cbacf4152ab138ee681c7226ccfa1202db2e9780cba4baa860b50b8069b0c16fb574d1
 DIST xdms-1.3.2.tar.bz2 43010 BLAKE2B 97118ce2052a93e334b02d1687e4c867f7158bdd99bfc4249a7a22d1eee57c6d6bbb26c640f0bdb61004997fcb6218724de40c759ae51f4b72da8dee0ebde48d SHA512 e29dd1d2373c635ba953ef526849e0b8fa645a0da91fff3a3512ce26eee43fb2c1280f27fae0a42a4fd47106494d6e44c5684eff3581661e538780927b851cac
-EBUILD xdms-1.3.2-r1.ebuild 656 BLAKE2B dd1c41a9b764b8dd66cbbe01b9ea69159f2b8ef3323df303f448529b15c98f38cfbd717ecf169131a6acd1a58f0a9925808beeb392f7175a604cdd2028959d9a SHA512 d014365da30a5ba188c6df9709b6c3049f0b22c4dc00b687cdf7aac199dfbe83c097f1fb5caf1f69f37e6631aaab7d9696ff7359e64fa45359bfbeaa84a59d66
-MISC metadata.xml 864 BLAKE2B 209b2fd1290a35b6d372b5725bd9d297a2d9b86a56bc45bdfd725e81399f004ac6d4de87386d883e921bc6a34d2e45797d029d71ec317f7c3930a4d7faf991f6 SHA512 a535abd221a7ea350cfeb4fbb84585cc4f4d6ee83f607ae5d0eee73a709b8df5ed3cf9b3056dbd6b8a68ff06353c5c8b407f322a06a3bbeb5fe3d6d0cea4cdba
+EBUILD xdms-1.3.2-r2.ebuild 963 BLAKE2B e1fb08de2cc825114fd3636881f510eb00d38156f8327516af1c4ff5906807176fe297ce00748364147747e4fc8896c4794e5454c7fc3ae58361490c35493d29 SHA512 19b70de944766c51f9df5a7ef996a2fbd21bcf5124975ae4aa1c814da902b90c6e7953cefc61199d5cd9cdeed8118eb853b43ba2bd7fc81998958120734dfdba
+MISC metadata.xml 946 BLAKE2B afe54847b8a528e4a20820fc480adfc6d78fd7d6d7db421649cc15934f6275526da3a3f7b144008c98d0da18c2ab38e32d12c00d9d5417382c58b2dce742db4c SHA512 bcfbd892265aeab44994d7acf53d2a952a1c76ba42ed70dbd30e0fd4bb84edf8c77951ca4b677d49c380e049bd21ec64881f6340c05599239f6d858500a582c9
diff --git a/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch
new file mode 100644
index 000000000000..3396b59a309c
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch
@@ -0,0 +1,13 @@
+From: Sam James <sam@gentoo.org>
+Subject: [PATCH 2/2] Don't compress man pages
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,5 +11,4 @@ install:	xdms
+ 	install xdms.txt COPYING ChangeLog.txt ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/
+ 	chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms
+ 	chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}
+-	gzip < xdms.1 > xdms.1.gz
+-	install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/
++	install xdms.1 ${DESTDIR}{PREFIX}/share/man/man1/
+-- 
+
diff --git a/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch b/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch
new file mode 100644
index 000000000000..dad00addead3
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch
@@ -0,0 +1,80 @@
+https://sources.debian.org/patches/xdms/1.3.2-7/0002-Fix-build-with-gcc-10.patch/
+
+From: Jeff Law <law@redhat.com>
+Date: Sat, 9 May 2020 15:16:39 +0200
+Subject: Fix build with gcc-10
+--- a/src/u_deep.c
++++ b/src/u_deep.c
+@@ -17,9 +17,9 @@
+ #include "getbits.h"
+ 
+ 
+-INLINE USHORT DecodeChar(void);
+-INLINE USHORT DecodePosition(void);
+-INLINE void update(USHORT c);
++static INLINE USHORT DecodeChar(void);
++static INLINE USHORT DecodePosition(void);
++static INLINE void update(USHORT c);
+ static void reconst(void);
+ 
+ 
+@@ -98,7 +98,7 @@ USHORT Unpack_DEEP(UCHAR *in, UCHAR *out, USHORT origsize){
+ 
+ 
+ 
+-INLINE USHORT DecodeChar(void){
++static INLINE USHORT DecodeChar(void){
+ 	USHORT c;
+ 
+ 	c = son[R];
+@@ -117,7 +117,7 @@ INLINE USHORT DecodeChar(void){
+ 
+ 
+ 
+-INLINE USHORT DecodePosition(void){
++static INLINE USHORT DecodePosition(void){
+ 	USHORT i, j, c;
+ 
+ 	i = GETBITS(8);  DROPBITS(8);
+@@ -171,7 +171,7 @@ static void reconst(void){
+ 
+ /* increment frequency of given code by one, and update tree */
+ 
+-INLINE void update(USHORT c){
++static INLINE void update(USHORT c){
+ 	USHORT i, j, k, l;
+ 
+ 	if (freq[R] == MAX_FREQ) {
+diff --git a/src/u_heavy.c b/src/u_heavy.c
+index fff93d3..8557b71 100644
+--- a/src/u_heavy.c
++++ b/src/u_heavy.c
+@@ -30,8 +30,8 @@ USHORT heavy_text_loc;
+ 
+ static USHORT read_tree_c(void);
+ static USHORT read_tree_p(void);
+-INLINE USHORT decode_c(void);
+-INLINE USHORT decode_p(void);
++static INLINE USHORT decode_c(void);
++static INLINE USHORT decode_p(void);
+ 
+ 
+ 
+@@ -74,7 +74,7 @@ USHORT Unpack_HEAVY(UCHAR *in, UCHAR *out, UCHAR flags, USHORT origsize){
+ 
+ 
+ 
+-INLINE USHORT decode_c(void){
++static INLINE USHORT decode_c(void){
+ 	USHORT i, j, m;
+ 
+ 	j = c_table[GETBITS(12)];
+@@ -96,7 +96,7 @@ INLINE USHORT decode_c(void){
+ 
+ 
+ 
+-INLINE USHORT decode_p(void){
++static INLINE USHORT decode_p(void){
+ 	USHORT i, j, m;
+ 
+ 	j = pt_table[GETBITS(8)];
diff --git a/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch
new file mode 100644
index 000000000000..3db969932084
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch
@@ -0,0 +1,22 @@
+From: Sam James <sam@gentoo.org>
+Subject: [PATCH 1/2] Respect DESTDIR
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,10 +6,10 @@ clean:
+ 	$(MAKE) -C src clean
+ 
+ install:	xdms
+-	mkdir -p {PREFIX}/bin {PREFIX}/share/doc/xdms-{VERSION} {PREFIX}/share/man/man1
+-	install src/xdms {PREFIX}/bin/
+-	install xdms.txt COPYING ChangeLog.txt {PREFIX}/share/doc/xdms-{VERSION}/
+-	chmod og+rx {PREFIX}/bin {PREFIX}/bin/xdms
+-	chmod -R og+rX {PREFIX}/share/doc/xdms-{VERSION}
++	mkdir -p ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} ${DESTDIR}{PREFIX}/share/man/man1
++	install src/xdms ${DESTDIR}{PREFIX}/bin/
++	install xdms.txt COPYING ChangeLog.txt ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/
++	chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms
++	chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}
+ 	gzip < xdms.1 > xdms.1.gz
+-	install xdms.1.gz {PREFIX}/share/man/man1/
++	install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/
+-- 
diff --git a/app-arch/xdms/metadata.xml b/app-arch/xdms/metadata.xml
index ec5a204b1712..3a9a20905857 100644
--- a/app-arch/xdms/metadata.xml
+++ b/app-arch/xdms/metadata.xml
@@ -9,4 +9,7 @@
 		Can extract the files contained inside the DMS archives, if the compressed disk is an AmigaDOS disk, using readdisk made by Bernd Schmidt.
 		Can process multiple files in batch with a single command, and also use stdin and stdout for input and output of data.
 	</longdescription>
+	<upstream>
+		<remote-id type="gitlab">heikkiorsila/xdms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild b/app-arch/xdms/xdms-1.3.2-r1.ebuild
deleted file mode 100644
index 14f419cd4b8c..000000000000
--- a/app-arch/xdms/xdms-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
-HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms"
-SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	sed -i Makefile.in \
-		-e "s:COPYING::" \
-		-e "s:share/doc/xdms-{VERSION}:share/doc/xdms-${PF}:" || die
-	sed -i -e "s:-O2::" src/Makefile.in || die
-}
-
-src_configure() {
-	./configure --prefix=/usr --package-prefix="${D}" || die
-}
diff --git a/app-arch/xdms/xdms-1.3.2-r2.ebuild b/app-arch/xdms/xdms-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..07dce668c10a
--- /dev/null
+++ b/app-arch/xdms/xdms-1.3.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
+HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms"
+SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.2-respect-DESTDIR.patch
+	"${FILESDIR}"/${PN}-1.3.2-dont-compress-man-pages.patch
+	"${FILESDIR}"/${PN}-1.3.2-fix-build-with-gcc-10.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i Makefile.in \
+		-e "s:COPYING::" \
+		-e "s:share/doc/xdms-{VERSION}:share/doc/${PF}:" || die
+
+	sed -i -e "s:-O2::" src/Makefile.in || die
+}
+
+src_configure() {
+	tc-export CC
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Needed to avoid typical "Undefined symbols for architecture x86_64"
+		append-ldflags -undefined dynamic_lookup
+	fi
+
+	./configure --prefix="${EPREFIX}"/usr || die
+}