gentoo resync : 16.09.2020

4 files changed, 3 insertions, 67 deletions

diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 2263e98db225..8720a3520e4d 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -6,6 +6,5 @@ AUX zip-3.0-no-crypt.patch 1116 BLAKE2B a4f12f492b3f844a0e822f27f1acb81d826484dd
 AUX zip-3.0-pic.patch 502 BLAKE2B 6ac03408e40986fbbc7219fa1f96f8e2fdc448071dcc1321e7f047068468ce2ba21b30bbea3f5cbd33cff528fd8f5493ce47b42e1c9a6f61c09a38a0fd12c3bd SHA512 055396cb0cfbf994d5be95533c4e7a8ad35120e2250dd2df1757f54b2b722c32d413dda61ac4bb96f0af93965d0a184794626ba6ca37a14ed04f984e544ae9c5
 AUX zip-3.0-zipnote-freeze.patch 1926 BLAKE2B 5976c4ad62d25f4ace8e17a85b77c99fb5ea75151d6ddd8fe27ee22cb7669d98281e26952c623b6e367fa880fce693d393a79fc619e13d8ba530b2aa38b8b70f SHA512 edd90964bc4f1bd3cc45f719905f3688ebd779aea5f10439b2331d668774ed55e645e025d9f408cedb8313848d4e26ba39726d019543e3533f79f1ef83620932
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r3.ebuild 1716 BLAKE2B baf91e89edf2f731c805627392d7a3eb1b8f8bff52ca73facc0dd861c8911e0bbae9036593c4a988fbd53b557e76c80276d51de93b742d14e88a65ccc0de6d0f SHA512 cb41bb9e9f782c35197156cde2a69d6997c35f5896bd7e8cbe402da7dff03313445cd14d33cfa1e51d6d2d1782d4774f51c29cc13510090a778fff85107e2e29
-EBUILD zip-3.0-r4.ebuild 1699 BLAKE2B a2cb00ba7454d7ae5d5772c2a8207ba504b051193413c9069b8ab58243621fb170523990d694d6738c501b98bca4025020e4f39594bb2cec41c26fba05a55293 SHA512 98ac764c629f0ea208c5f01d937da2cdd31cd585b9400fe1f82020c16f421ca4868333ccbc3b7db9f0dc1cdff5064c0d4ff1a23332022e666ff501b80b96ce59
-MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
+EBUILD zip-3.0-r4.ebuild 1698 BLAKE2B 6f549516e94a4323ed29108f2349835f48c3762537aee5e8d9acf7427c998cb4dfb77abcf52e4c6c5d1fbf6d5c783e8d60dffb3a826a3c7ca115848271042588 SHA512 2541fb801ab128a1e3d1637913161b608e1d8bee756ea5fa1a60a6417305a14ea067f33ac0e8f5541ba925187e24871c94c8af94489f5e1aad38a4ad07468c1a
+MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/zip/metadata.xml b/app-arch/zip/metadata.xml
index 71d52343602a..564fd76677c8 100644
--- a/app-arch/zip/metadata.xml
+++ b/app-arch/zip/metadata.xml
@@ -5,7 +5,6 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<longdescription>Application that supports the Info Zip series of encryption.</longdescription>
 	<use>
 		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
 	</use>
diff --git a/app-arch/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
deleted file mode 100644
index 34ee51562039..000000000000
--- a/app-arch/zip/zip-3.0-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="bzip2 crypt natspec unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${P}-pic.patch
-	epatch "${FILESDIR}"/${P}-exec-stack.patch #122849
-	epatch "${FILESDIR}"/${P}-build.patch #200995
-	epatch "${FILESDIR}"/${P}-zipnote-freeze.patch #322047
-	epatch "${FILESDIR}"/${P}-format-security.patch #512414
-	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
-}
-
-src_configure() {
-	append-cppflags \
-		-DLARGE_FILE_SUPPORT \
-		-DUIDGID_NOT_16BIT \
-		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
-		-D$(usex crypt '' NO)CRYPT \
-		-D$(usex unicode '' NO)UNICODE_SUPPORT
-	# Third arg disables bzip2 logic as we handle it ourselves above.
-	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
-	if use bzip2 ; then
-		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
-	fi
-}
-
-src_compile() {
-	emake \
-		CPP="$(tc-getCPP)" \
-		-f unix/Makefile generic
-}
-
-src_install() {
-	dobin zip zipnote zipsplit
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}
diff --git a/app-arch/zip/zip-3.0-r4.ebuild b/app-arch/zip/zip-3.0-r4.ebuild
index 1c7fe0f1bc1b..09c1613a642e 100644
--- a/app-arch/zip/zip-3.0-r4.ebuild
+++ b/app-arch/zip/zip-3.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="bzip2 crypt natspec unicode"
 
 DEPEND="${RDEPEND}"