gentoo resync : 15.06.2021

8 files changed, 44 insertions, 211 deletions

diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index 925288359413..38c46d040a6c 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -1,10 +1,5 @@
-AUX detox-1.2.0-LDFLAGS.patch 501 BLAKE2B d0a989cb0a4a251e4c0c73efee3072c4e7a67c23482be0095d8a4c7307d1198b2fa9f3eaa492014e3d2504c1c5513423f8fc39856775b2aabf304c8a1f0835b3 SHA512 a3d59bef705d763be2831d03ccfef5fd69859a8e6f6900a1b6558135d2fa38a7844c16276bedab1b5af15f3e287cada615ea4c83f4c6737919c7c55daa7e55bf
-AUX detox-1.2.0-change-default-sequence-to-use-utf8-table.patch 379 BLAKE2B 753b6c0dc72ff972501787c927aaf77f97a4e9fc33d60151bc9f2eaeb0f7ab05b8876e42da56bdf8702d032ade8d0042596c0766a58cd81d7e2e8ab5d3957be1 SHA512 8804afdb7a5b37b01d2e16d68ae2e7b381cdfe75fd10de7a20388079bce9f137765e11b4e1d8d4cdabc6e521af7deb3309d84e42308e4c9108edb9537cb2706e
-AUX detox-1.2.0-format-security.patch 1964 BLAKE2B 41074dae01426f5a3293ba36dca12d950ffe6175ff2355263d6e0e68ca951f7ef30d07810c00e8456ca68fe03b7dab3a0740cbc5e2adb0d7041741deb00606d4 SHA512 c0ce9ac00500399a28bc4d2bc4dff5c20386817d154c2185ebf29df1544ff400199d2884139f7f68c3f5e260d1742877f0b8b53787d8a585f9ff04028f878a2a
-AUX detox-1.2.0-install-missing-file.patch 642 BLAKE2B 232a89c132c681d47243411c42c0975ec1c0ef493f7015db3591b89abf0b294e7fddeb7afabd992180ad7cd60031fd0f60aa228daa31b59116d7251a697d856c SHA512 32f83f700a508729c27941ae627c544dd2ba1900a647285d4160038e69dbad8f1205c5056daa9c5c19a56a70a6e528db187a59d56dfcfee7d772eb0fd809d087
-AUX detox-1.2.0-parallel.patch 1120 BLAKE2B bccae5f969e1127b8819a5542354ea2aaac765a3667679598d4edd5d3dd6bfac45845718599be59bbebc11d860d6fc56163777e3e3940da0805b9d5cc1bcf0bd SHA512 5a9c964cd46a1cd4463460a400226a80a9c1705bd60655362ca02950a06acacbafed1c039793eb6445988e91a47888dbf1c643bf8c34003e7c34a02398f58855
-DIST detox-1.2.0.tar.bz2 86118 BLAKE2B 2dbde6ebd98b59c18c60f99006731484dcbc698ab77b56991f2af94f4ad45da141046975af47b66242ff42d4e3a8bb3b515d4b70ba30f12cb1b8ceea5832f52a SHA512 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a
 DIST detox-1.4.0.tar.gz 106361 BLAKE2B 5993ded30282a16a81481885cdee41fe0b1c2ac34e5f389b53981e098d13acdfe367c7de462436fe3a4ee8ff86220f4c69d54a47c1122a0f39bde12c4d6ec908 SHA512 9486056b3b58dbb5ae16bc461586a997f8990ddb6e0db5ba561df862c16dfe926911fd09f065ef2578d39c3e3f1a267be201f865cf3f6b576c01910bda39cecb
-EBUILD detox-1.2.0-r3.ebuild 993 BLAKE2B f815c0713756ea76ba6e9d2bbcd04af6c4c67a8605f518567a282713c33f898269953e5ceed216fed83065f6e49588070320a8b139f468fe41b37ecd0c8f34fb SHA512 0de9fdb1ea213e6e58ef4fb8ea3dda4a9ff7b2b2cf9c8f37eb470c7e20f0e971ef8e833bcff3a9c1aaf39a89ce4a01934a98dd87df6514b8cf23ec40c5943239
+DIST detox-1.4.2.tar.gz 106736 BLAKE2B a27f9d93bf6f6c1634517c0f193affe576b2eec6be4b8fc38e91ef75a6f1a01a4376684d5a9b109b3971d0e311b64faeba020a3b7660ff130086956a7ebe92bd SHA512 ca1327e127cf1ba1803d8931aa119c9d11fc5b998f45ad5f7c339cea7f7928a5a6a45f90db9a51a7ccf6d4ee268cd316461c621db62dcc7182cd0255e74a1481
 EBUILD detox-1.4.0.ebuild 758 BLAKE2B 605cda9872bffe8755ece521b9bc7ecfc6ea3300a1cef8e93ff204da7d5da54f6a49e32a77864c54b036a0f571a5b52419d16733de28fa8874294d4e02948367 SHA512 8d083039907bcbb7f935f65b9129658a7b0071c90c6d03224a3d200ad3cf490f1575e77fefb08f66c32552c3db7fd06b0294045b7af091e629cfbc6789de488b
+EBUILD detox-1.4.2.ebuild 761 BLAKE2B 7e57e85fcd74bb94348441557a3ee1afc3885855a675e588fcae59af1e9b10c0370ad7ef272fe2fadba13a381b49da3d9f6f0109ef5b3ba942f6f6ea0df305ea SHA512 8eb75960ac89da5831fd390d0c5008cf9c1184cdab3d1854dccb69daaf8a259eb72ba3c6ae96354a90c430a5ce9758f5fa17ab3a6e7362b4d74cea1107680566
 MISC metadata.xml 340 BLAKE2B 448af504cf3e5e2d644d5a7551d5a0e7775f95601c06704584df7be0fe68060deddd9ad41e04e6240c346bb37a7f6017f5ed54e999ecb36efda481463a10388e SHA512 22cb6a81a6b5001f6ebeae252400eb4a7568a6baf028413d1eeaccad3de9b7b2e5c4d5a3f9e0cd4c87567a2135e7a4e7d0796d2efc377f2f26ddf0b555713943
diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild
deleted file mode 100644
index 2ec1846e2a59..000000000000
--- a/app-misc/detox/detox-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Safely remove spaces and strange characters from filenames"
-HOMEPAGE="http://detox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/${MY_P}
-
-RDEPEND="
-	dev-libs/popt
-	!dev-python/detox"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallel.patch
-	"${FILESDIR}"/${P}-LDFLAGS.patch
-	"${FILESDIR}"/${P}-change-default-sequence-to-use-utf8-table.patch
-	"${FILESDIR}"/${P}-install-missing-file.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	)
-
-src_prepare() {
-	sed \
-		-e 's:Fl c Ar:Fl f Ar:g' \
-		-i ${PN}.1 || die
-	epatch "${PATCHES[@]}"
-	sed \
-		-e '/detoxrc.sample/d' \
-		-i Makefile.in || die
-}
-
-src_configure() {
-	econf --with-popt="${EPREFIX}/usr"
-}
diff --git a/app-misc/detox/detox-1.4.2.ebuild b/app-misc/detox/detox-1.4.2.ebuild
new file mode 100644
index 000000000000..7a6a540e4cee
--- /dev/null
+++ b/app-misc/detox/detox-1.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Safely remove spaces and strange characters from filenames"
+HOMEPAGE="http://detox.sourceforge.net/ https://github.com/dharple/detox"
+SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
+
+RDEPEND="
+	!dev-python/detox"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+src_prepare() {
+	default
+	sed \
+		-e '/detoxrc.sample/d' \
+		-i Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	dodoc etc/${PN}rc.sample
+}
diff --git a/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch b/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch
deleted file mode 100644
index 3f0daa088010..000000000000
--- a/app-misc/detox/files/detox-1.2.0-LDFLAGS.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=2166388&group_id=101612&atid=630105
-
---- Makefile.in	2008-10-14 16:37:22 +0000
-+++ Makefile.in	2008-10-14 16:38:17 +0000
-@@ -70,10 +70,10 @@
- #
- 
- detox: ${detoxOBJS}
--	${CC} -o detox ${detoxOBJS} ${L_OPT}
-+	${CC} ${LDFLAGS} -o detox ${detoxOBJS} ${L_OPT}
- 
- inline-detox: ${inline-detoxOBJS}
--	${CC} -o inline-detox ${inline-detoxOBJS} ${L_OPT}
-+	${CC} ${LDFLAGS} -o inline-detox ${inline-detoxOBJS} ${L_OPT}
- 
- #
- # Special Source Compiles
-
diff --git a/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch b/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch
deleted file mode 100644
index 2e54642f45b9..000000000000
--- a/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Patch from Teemu Likonen <tlikonen@iki.fi>
-# to change the default sequence to use utf8 instead of iso8859-1
---- detox-1.2.0/detoxrc~	2006-07-03 19:45:54.000000000 +0300
-+++ detox-1.2.0/detoxrc	2009-05-28 15:34:26.497832449 +0300
-@@ -32,10 +32,10 @@
- #
- 
- #
--# Basically just ISO8859_1
-+# Basically just utf_8
- #
- sequence default {
--	iso8859_1;
-+	utf_8;
- 	safe;
- 	wipeup;
- };
diff --git a/app-misc/detox/files/detox-1.2.0-format-security.patch b/app-misc/detox/files/detox-1.2.0-format-security.patch
deleted file mode 100644
index c03a98aa046c..000000000000
--- a/app-misc/detox/files/detox-1.2.0-format-security.patch
+++ /dev/null
@@ -1,72 +0,0 @@
- parse_options_getopt.c | 8 ++++----
- parse_options_popt.c   | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/parse_options_getopt.c b/parse_options_getopt.c
-index 1f80966..ea2b266 100644
---- a/parse_options_getopt.c
-+++ b/parse_options_getopt.c
-@@ -98,9 +98,9 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
- #endif
- 		switch (optcode) {
- 			case 'h':
--				printf(usage_message);
-+				printf("%s", usage_message);
- 				printf("\n");
--				printf(help_message);
-+				printf("%s", help_message);
- 				exit(EXIT_SUCCESS);
- 
- 			case 'f':
-@@ -138,7 +138,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
- 				exit(EXIT_SUCCESS);
- 
- 			case '?':
--				printf(usage_message);
-+				printf("%s", usage_message);
- 				exit(EXIT_SUCCESS);
- 
- 			case 0:
-@@ -195,7 +195,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
- 	}
- 	else {
- #ifndef INLINE_MODE
--		printf(usage_message);
-+		printf("%s", usage_message);
- 		exit(EXIT_FAILURE);
- #endif
- 	}
-diff --git a/parse_options_popt.c b/parse_options_popt.c
-index 60dad7a..370c3cc 100644
---- a/parse_options_popt.c
-+++ b/parse_options_popt.c
-@@ -94,9 +94,9 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
- 	while ((c = poptGetNextOpt(optCon)) >= 0) {
- 		switch (c) {
- 			case 'h':
--				printf(usage_message);
-+				printf("%s", usage_message);
- 				printf("\n");
--				printf(help_message);
-+				printf("%s", help_message);
- 				exit(EXIT_SUCCESS);
- 
- 			case 'f':
-@@ -142,7 +142,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
- 				break;
- 
- 			case '?':
--				printf(usage_message);
-+				printf("%s", usage_message);
- 				exit(EXIT_SUCCESS);
- 
- 		}
-@@ -177,7 +177,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
- 
- #ifndef INLINE_MODE
- 	if (i == 0) {
--		fprintf(stderr, usage_message);
-+		fprintf(stderr, "%s", usage_message);
- 		exit(EXIT_FAILURE);
- 	}
- #endif
diff --git a/app-misc/detox/files/detox-1.2.0-install-missing-file.patch b/app-misc/detox/files/detox-1.2.0-install-missing-file.patch
deleted file mode 100644
index 97863268bc48..000000000000
--- a/app-misc/detox/files/detox-1.2.0-install-missing-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Patch by Nelson A. de Oliveira <naoliv@debian.org>
-#
-# Patch upstream Makefile to install missing safe.tbl (#566785)
-
---- detox-1.2.0/Makefile.in	2010-06-20 23:41:34.000000000 -0300
-+++ detox-1.2.0/Makefile.in	2010-06-20 23:42:34.000000000 -0300
-@@ -147,6 +147,11 @@
- 	else \
- 		echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
- 	fi
-+	@if [ ! -f ${DESTDIR}${datadir}/detox/safe.tbl ]; then \
-+		${INSTALL} -m 644 safe.tbl ${DESTDIR}${datadir}/detox; \
-+	else \
-+		echo "${DESTDIR}${datadir}/detox/safe.tbl exists, skipping"; \
-+	fi
- 
- install-unsafe-config: install-base
- 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
diff --git a/app-misc/detox/files/detox-1.2.0-parallel.patch b/app-misc/detox/files/detox-1.2.0-parallel.patch
deleted file mode 100644
index 73abd73d61b3..000000000000
--- a/app-misc/detox/files/detox-1.2.0-parallel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=2166387&group_id=101612&atid=630105
-
---- Makefile.in	2008-10-14 16:39:34 +0000
-+++ Makefile.in	2008-10-14 16:38:51 +0000
-@@ -131,7 +131,7 @@
- 	${INSTALL} -m 644 detox.1 ${DESTDIR}${mandir}/man1
- 	${INSTALL} -m 644 detoxrc.5 detox.tbl.5 ${DESTDIR}${mandir}/man5
- 
--install-safe-config:
-+install-safe-config: install-base
- 	@if [ ! -f ${DESTDIR}${sysconfdir}/detoxrc ]; then \
- 		${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}; \
- 	else \
-@@ -148,12 +148,12 @@
- 		echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
- 	fi
- 
--install-unsafe-config:
-+install-unsafe-config: install-base
- 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
- 	${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox
- 	${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox
- 
--install-sample-config:
-+install-sample-config: install-base
- 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}/detoxrc.sample
- 	${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox/iso8859_1.tbl.sample
- 	${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox/unicode.tbl.sample
-