11 files changed, 31 insertions, 233 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index fc6bafa5eb36..5b8c66821878 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index e17150d4db93..ea0f72baee43 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,5 +1,3 @@
-DIST engrampa-1.24.1.tar.xz 1680000 BLAKE2B 3059f98e5db99aabe270a89d7edf334ddca8b9cfd963a34f8b7b99356a1b7a9b14c9f641ea6582f893a5f6e4fe46dde00e5375d7b1c71b80299a7f5121839549 SHA512 9d51f24987cecfdd2c560b1ac8f8699bb5ed010bcd5b4a449a1103f725bc63046d0813d28424a3ae7dfcee0568dbf2a282f27ac5512b1c342dafeaec5bcd3b4b
 DIST engrampa-1.24.2.tar.xz 1687432 BLAKE2B b2ef407aef77f9ecd3f8b06d2e991615a39fa2d4487678292d035a7cab882551bc8c757c6a15037b828cb51aaba14c2ec25e85e891770f6f8c9b453753d87b42 SHA512 1e0acecfe42e3945fe43729283522dfd56dc4cee92a4d5998c995a496f42f41b284ec10f01eb142139c1cec65e3b5a037299b168b73a2e6e828ae3ab4b9c777d
-EBUILD engrampa-1.24.1.ebuild 1692 BLAKE2B 2584960bbad9ba530780d3a7919b27cfc4c801e68fbe922193a2bf878aa8c1dc6dcfa0c4d48689bb2ea6b2addd629a02798bd5929378e05b06408df458b657a2 SHA512 771abb1dd041a396a708b3f1a908228e07367a0141bfb9102da72904dd960ccbd3f3157962dd3d3f5db2392e1a0f7615a8ec23c7122a6839d333b6fcc3c8e82c
 EBUILD engrampa-1.24.2.ebuild 1699 BLAKE2B 79545465856fc52234172d35976b482e52b2d059506bfb86e0e35f1e2ca1dde115161d3cf84feefe916ed2c5bb71db895249aa5c29bee92237e30cc0e56af4bc SHA512 fad518471e6e1e6235915b0661dcdf4d07a94e78576caf8db3adcd830de7e741217e24ae6b061084bfb116182178625d681c6fe7a0b8bf48b758d3ab4ec461e7
 MISC metadata.xml 591 BLAKE2B 9a58776d887b3437f4edccb14ba8cd85139acfadece0e4c7a9c7ed7f5f02d5276fc86d30affeb1b605eba15a8ed34a7c40847564436c320e2a8cef5a313de12f SHA512 b0ae271bbdb0046308b9e06df3259bb5dc9d43e406830e000e4513d817fddccfee4b0af956f1c218ad6800e21d79682deddb4561789a42226ee1afa005cc7b3b
diff --git a/app-arch/engrampa/engrampa-1.24.1.ebuild b/app-arch/engrampa/engrampa-1.24.1.ebuild
deleted file mode 100644
index cd2d7638007a..000000000000
--- a/app-arch/engrampa/engrampa-1.24.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate optfeature readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/json-glib-0.14
-	virtual/libintl
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[X]
-	x11-libs/libSM
-	x11-libs/pango
-	caja? ( >=mate-base/caja-1.17.1 )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	!!app-arch/mate-file-archiver
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	optfeature "Support for 7-zip"  app-arch/p7zip
-	optfeature "Support for ace"  app-arch/unace
-	optfeature "Support for arj"  app-arch/arj
-	optfeature "Support for cpio"  app-arch/cpio
-	optfeature "Support for deb"  app-arch/dpkg
-	optfeature "Support for iso"  app-cdr/cdrtools
-	optfeature "Support for jar,zip"  app-arch/zip app-arch/unzip
-	optfeature "Support for lha"  app-arch/lha
-	optfeature "Support for lzma"  app-arch/xz-utils
-	optfeature "Support for lzop"  app-arch/lzop
-	optfeature "Support for rar"  app-arch/unrar
-	optfeature "Support for rpm"  app-arch/rpm
-	optfeature "Support for unstuff"  app-arch/stuffit
-	optfeature "Support for zoo"  app-arch/zoo
-}
diff --git a/app-arch/fastjar/Manifest b/app-arch/fastjar/Manifest
deleted file mode 100644
index 658d4f8edd69..000000000000
--- a/app-arch/fastjar/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.98-traversal.patch 3010 BLAKE2B 76450d561450aa9c7d5386f53328c0037d6ce9df2d6aac79deb1e47cee7651723cf2863a0d27cb6431a58525a9d0d3c554820b4f22a3099d1fe43b2ea7bec0d1 SHA512 7bfcfebd681f9556e8231786da3326d12ee7ab071e2cadf9a4c17ba4e4e750aeb7e3d7cd78634c36e05179df4a369aae2e04a22533d1954668ada95f1d53d311
-DIST fastjar-0.98.tar.gz 717984 BLAKE2B 1715f1917076799fc58c6c6cea8fb53fc3261a694fa2392c0dc6e30101a7d42de0c5c55cd593627b4d2d0ffa45e3d44ef220c9579caec669721c6b1b9996e43c SHA512 c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903
-EBUILD fastjar-0.98-r3.ebuild 507 BLAKE2B c893be4cba7a5c7926606d16b25044704064a6cb04387623199ff9020a3e260af39349667eb764fa53c06951d9c9b6bf83ca5945ecef016e066c51e9da1557c4 SHA512 9f40b1a6f9917e80462895e3772f293f5150607c110ed6b6860b8fc9475385ee7756b9064a28ffa64572bb78b551f9badb89d1e371d5715f3679e40db49669a4
-MISC metadata.xml 479 BLAKE2B 6d131ee719d4f588bf1b7e0928435aad880d51004205603b24802470d845c5d9c01c856266cb001612c81b896655c44c1e5536f405bde9093cb054e028d788c0 SHA512 721436fd78a8278ff8fba2aa2c2c1f2588ee6c9270b4c1a06aefde40bedfa678a69b1cecb1a3ba3c1ad740e1e56b22d920944247c532af5cdd1897265c906317
diff --git a/app-arch/fastjar/fastjar-0.98-r3.ebuild b/app-arch/fastjar/fastjar-0.98-r3.ebuild
deleted file mode 100644
index 77a5df7acc1a..000000000000
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A jar program written in C"
-HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="
-	${DEPEND}
-	!<=dev-java/kaffe-1.1.7-r5" # bug 188542
-
-PATCHES=(
-	# bug 325557
-	"${FILESDIR}"/0.98-traversal.patch
-)
diff --git a/app-arch/fastjar/files/0.98-traversal.patch b/app-arch/fastjar/files/0.98-traversal.patch
deleted file mode 100644
index 511f4c6cd838..000000000000
--- a/app-arch/fastjar/files/0.98-traversal.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- fastjar-0.98.orig/jartool.c
-+++ fastjar-0.98/jartool.c
-@@ -790,6 +790,7 @@
- 		   progname, jarfile);
- 	  return 1;
- 	}
-+      ze->filename[len] = '\0';
-       len = UNPACK_UB4(header, CEN_EFLEN);
-       len += UNPACK_UB4(header, CEN_COMLEN);
-       if (lseek (fd, len, SEEK_CUR) == -1)
-@@ -1257,7 +1258,7 @@
-       exit_on_error("write");
- 
-   /* write the file name to the zip file */
--  if (1 == write(jfd, fname, file_name_length))
-+  if (-1 == write(jfd, fname, file_name_length))
-     exit_on_error("write");
- 
-   if(verbose){
-@@ -1730,7 +1731,17 @@
-       struct stat sbuf;
-       int depth = 0;
- 
--      tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
-+      if(*filename == '/'){
-+	fprintf(stderr, "Absolute path names are not allowed.\n");
-+	exit(EXIT_FAILURE);
-+      }
-+
-+      tmp_buff = malloc(strlen((const char *)filename));
-+
-+      if(tmp_buff == NULL) {
-+	fprintf(stderr, "Out of memory.\n");
-+	exit(EXIT_FAILURE);
-+      }
- 
-       for(;;){
-         const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/');
-@@ -1738,25 +1749,28 @@
-         if(idx == NULL)
-           break;
-         else if(idx == start){
-+	  tmp_buff[idx - filename] = '/';
-           start++;
-           continue;
-         }
--        start = idx + 1;
- 
--        strncpy(tmp_buff, (const char *)filename, (idx - filename));
--        tmp_buff[(idx - filename)] = '\0';
-+	memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start));
-+	tmp_buff[idx - filename] = '\0';
- 
- #ifdef DEBUG    
-         printf("checking the existance of %s\n", tmp_buff);
- #endif
--	if(strcmp(tmp_buff, "..") == 0){
-+	if(idx - start == 2 && memcmp(start, "..", 2) == 0){
- 	  --depth;
- 	  if (depth < 0){
- 	    fprintf(stderr, "Traversal to parent directories during unpacking!\n");
- 	    exit(EXIT_FAILURE);
- 	  }
--	} else if (strcmp(tmp_buff, ".") != 0)
-+	} else if (idx - start != 1 || *start != '.')
- 	  ++depth;
-+
-+        start = idx + 1;
-+
-         if(stat(tmp_buff, &sbuf) < 0){
-           if(errno != ENOENT)
-             exit_on_error("stat");
-@@ -1765,6 +1779,7 @@
- #ifdef DEBUG    
-           printf("Directory exists\n");
- #endif
-+	  tmp_buff[idx - filename] = '/';
-           continue;
-         }else {
-           fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n",
-@@ -1781,10 +1796,11 @@
-         if(verbose && handle)
-           printf("%10s: %s/\n", "created", tmp_buff);
- 
-+	tmp_buff[idx - filename] = '/';
-       }
- 
-       /* only a directory */
--      if(strlen((const char *)start) == 0)
-+      if(*start == '\0')
-         dir = TRUE;
- 
- #ifdef DEBUG    
-@@ -1792,7 +1808,7 @@
- #endif
- 
-       /* If the entry was just a directory, don't write to file, etc */
--      if(strlen((const char *)start) == 0)
-+      if(*start == '\0')
-         f_fd = -1;
- 
-       free(tmp_buff);
-@@ -1876,7 +1892,8 @@
-       exit(EXIT_FAILURE);
-     }
- 
--    close(f_fd);
-+    if (f_fd != -1)
-+      close(f_fd);
- 
-     if(verbose && dir == FALSE && handle)
-       printf("%10s: %s\n",
diff --git a/app-arch/fastjar/metadata.xml b/app-arch/fastjar/metadata.xml
deleted file mode 100644
index a0a927b71617..000000000000
--- a/app-arch/fastjar/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
-		Fastjar is a version of Sun's 'jar' utility, written entirely in C,
-		and therefore quite a bit faster. Fastjar can be up to 100x faster
-		than the stock 'jar' program running without a JIT.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index cc6cd7f2442c..dccb622e9103 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,5 +2,5 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.11.tar.xz 804096 BLAKE2B c251066f0bded6a6557a5cbfe5d20090c6446051c31fad610af4f9f7b2537c28fed1cfab424a459452db73b7d1df1361e5aeba163a9e980fc611faf408cac128 SHA512 af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3
 EBUILD gzip-1.10.ebuild 1081 BLAKE2B af51b89c49e389fd2f38996790b6102730594d4bd66c7a4177de9643523c9c9142b5758f7aa610aba7150f4c03f9871c59bf32a3f125084d636de066f77fb4bd SHA512 5616d9ae48821f18464c7e9227aee73293179febfb6b76aca227efa97edf58ad5ba776c5e3b3c5852089ddc86e06a7edb99955176a5f9d3b05e10a630c1abf69
-EBUILD gzip-1.11.ebuild 1324 BLAKE2B 693f9cbdc28a916a2f63be4f78c2d8159523d80306d21f9dd3def5cc056a91a6509295debccb34d7649d61147c7b4490f0bbefcd467adede767877aaf3030066 SHA512 e04b3db6451b240339d0dcdc7a9abd667172d2e4bfb025322ff07f28dbca4a4fe6506b0a387e87b413313878c43ee13511a4baeefd36f338504f7c8ab989bd10
+EBUILD gzip-1.11.ebuild 1081 BLAKE2B 0fb0ab9f3b02ebc07df50f792285beab43b47c14fc0c6c118bd6d5fc4047ed99937f202dac5d3a976c17c99c83f0486e13c240b88657d294b0b65cf933fc8b47 SHA512 021e50cd93e467112de13d6f8dfa7ba573e5d7a1d8b89d7e8526bc25473d5354f3a09e8076ee8e41faccffeec85b94536857a2aac1e2dffc2cad86884aabd7b8
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.11.ebuild b/app-arch/gzip/gzip-1.11.ebuild
index 1c68d7110487..0d00a0f7aad3 100644
--- a/app-arch/gzip/gzip-1.11.ebuild
+++ b/app-arch/gzip/gzip-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,15 +20,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
 )
 
-src_prepare() {
-	default
-	if [[ ${CHOST} == *darwin* && ${CHOST##*darwin} -le 17 ]] ; then
-		# Fix older Darwin inline definition problem
-		sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \
-			lib/config.hin || die
-	fi
-}
-
 src_configure() {
 	use static && append-flags -static
 	# avoid text relocation in gzip
diff --git a/app-arch/tarlz/Manifest b/app-arch/tarlz/Manifest
index ce5ae3dc562d..8be637471473 100644
--- a/app-arch/tarlz/Manifest
+++ b/app-arch/tarlz/Manifest
@@ -1,3 +1,5 @@
 DIST tarlz-0.21.tar.lz 104780 BLAKE2B c3aacda3e8ab25757758d811d9cdc153777835950436dbb4827cf75d801f6c3035475330512a2657a8c9733f6afdf452d9689d7d72d11ba8ef968fceab671ed4 SHA512 1ad671da7ee115762163af57aad69ec754753e68a99ef8c4f38e880ecbb75a5b021f38794390eabcdbef4963cbc0c0e2abe36011da4135baf2c21dc22f020f4a
+DIST tarlz-0.22.tar.lz 105724 BLAKE2B 7921f7085d63f553f745cf8b7fee43ece32346a0804e41227806efae0ab338c48ee1830a8b087f03000a27fcf44338b3dba6d52d37f4de790d8b7bc5f0234ade SHA512 4e241ea0571e421c93fbeeb54a20e73fd4a7e9c85dc3b24295caec1a52e156cdcf5e85f4ee41f5dfae712b851d17fe0e96955380bb86306d8002f4187d0c60ec
 EBUILD tarlz-0.21.ebuild 600 BLAKE2B cab0c047e1b090a27e9e8e02b8690b8d03a35a722ca8f7799a14636dd156eddb3d1a6c51f46f004b62428d6f3ab164c297aafa8564f28947105ad1a909d3fbaa SHA512 2b118efeb86175cc4ba794eb2ed4deabf587800710c0f88111bbf40c44e0e3a950fbc81e78e327067ba586ff13fe837e603d5d1488f31ef9839acb78f1e310c7
+EBUILD tarlz-0.22.ebuild 597 BLAKE2B d979a14acef2e2ed74faee6ff31ccb4e837a5a0ffa6257f7b25348dbc0008a4bc54f8fd20b5b585be9e8343808aeb3f89d8bc0576eb95f4a79d8b6a4f5960ee1 SHA512 cbed097b80261ec94de345eccc3ed60517aacb6fe2e4509cd64f0ea751a8624ce8527161b9c097c1db58f8092acc51c31d0a896a14c6b3b9f6be1dd5d695886f
 MISC metadata.xml 247 BLAKE2B 3cfe29afe8370e5f5195d26e19732debac8a921204f9788b2f0c2b803a4ffdb479c89b0a53f1b592764c1980ad587b5982c288b33e6fe522ecdcf5be3ed81750 SHA512 a9c3ee4b936ac1f2e739f4a46249a25e3b980b3a63f7ebc573743a33bf745cb8af2513e6724da71f73dc61931f69f4ff351df94a2dad348d4910a9d6f71d2d4c
diff --git a/app-arch/tarlz/tarlz-0.22.ebuild b/app-arch/tarlz/tarlz-0.22.ebuild
new file mode 100644
index 000000000000..88450fc9523f
--- /dev/null
+++ b/app-arch/tarlz/tarlz-0.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs unpacker
+
+DESCRIPTION="A parallel archiver combining tar and lzip"
+HOMEPAGE="https://www.nongnu.org/lzip/tarlz.html"
+SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.lz"
+LICENSE="GPL-2+"
+
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-arch/lzlib-1.12"
+DEPEND="${RDEPEND}"
+BDEPEND="$(unpacker_src_uri_depends)"
+
+src_configure() {
+	econf \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}