From c5572b13d51970d6603acd131f27991cc1b66a79 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 19 Nov 2022 07:00:00 +0000
Subject: gentoo auto-resync : 19:11:2022 - 07:00:00

---
 app-arch/zip/Manifest                              |   4 +-
 .../files/zip-3.0-clang-15-configure-tests.patch   | 202 +++++++++++++++++++--
 app-arch/zip/zip-3.0-r6.ebuild                     |  74 --------
 app-arch/zip/zip-3.0-r7.ebuild                     |  74 ++++++++
 4 files changed, 260 insertions(+), 94 deletions(-)
 delete mode 100644 app-arch/zip/zip-3.0-r6.ebuild
 create mode 100644 app-arch/zip/zip-3.0-r7.ebuild

(limited to 'app-arch/zip')

diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 659adbae9e61..001fc6f978d9 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,5 +1,5 @@
 AUX zip-3.0-build.patch 923 BLAKE2B 0a8b7d8fb98f9bc8750c3bb6ff9a672db86481ca88349e5e08d2e96ae0cabac4ef75651a91e9b0fb8e70e1c075ea721060a3851bdd6e103b1f4c020a8b4f4979 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d
-AUX zip-3.0-clang-15-configure-tests.patch 1738 BLAKE2B 6db27295343d29fcc19a54bce9c54abdf63e56e8428360eeada2c07454837ce49f375baadeb27366a3abdcc64f15b3fe9a9243433fa4ef852e21d22607bf7a18 SHA512 99d8cc4fb5bd657433bff9427d8efe592b35011fa2d270fda217010567ac84468e8d011db2854c8d09332b91092d5994312a907a13adf646b0eee5ae0f173710
+AUX zip-3.0-clang-15-configure-tests.patch 5794 BLAKE2B 7eccad43d2f2ef4e56307e97da7ecfda9d0cb1460a0e7a7d649203beb257dc48b3db68663b0b4903ac59552d30ce26f7f386a980ad2882d5b20e9db349144431 SHA512 b209b66f46d19f1c7eae63ff5d8753be3d32fff584d0e2b793688eaff58667797b88e36aba763f399b22d6cf4ab14e65d93504ba485e6bf298f6cf19a3db4b34
 AUX zip-3.0-exec-stack.patch 548 BLAKE2B 3ded2568eea78c89422ea043bb68917d4a508d6ee6d8d65e9db6c22f6d5dbcac15836a94ad5d1209112cb73c1da4f266346e722cafcf3a6a91080261c4d5df93 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab
 AUX zip-3.0-format-security.patch 511 BLAKE2B ca5bfe9f839b1fb0ab8a4785b4448fa346ba9ccfb0cde40a61e7a3442a70f06a4481c57d6aa995654d7ef4482d2f1f7022b7a568b5e47b1149f0430de8110fbf SHA512 6d3514b9df21b6f8a40b037f7d584a4b4a0a5364676bd2cf40d31e32545bc7edd2e5cfeccdc72302c4f19b607852d81ad568c4420750a8c78bbd325c5cf78b8f
 AUX zip-3.0-natspec.patch 6464 BLAKE2B 4c032896c5b331e235a9ea55c91e696aa37b192c46be5ff4c85f4809473a299ba06e34b3cc30b1e47dfbb091da5058c5babdbea41b74677788e6ef5b7b0f0650 SHA512 91472cf73c943a2fbcae7640ca6862f4ef9c2212cf31bd2128fd6e157d46db76b6882b08db2aea9d6d2e3631c56d1393e16f8e76628ea7812d062e6471a085e6
@@ -8,5 +8,5 @@ AUX zip-3.0-pic.patch 502 BLAKE2B 6ac03408e40986fbbc7219fa1f96f8e2fdc448071dcc13
 AUX zip-3.0-zipnote-freeze.patch 1926 BLAKE2B 5976c4ad62d25f4ace8e17a85b77c99fb5ea75151d6ddd8fe27ee22cb7669d98281e26952c623b6e367fa880fce693d393a79fc619e13d8ba530b2aa38b8b70f SHA512 edd90964bc4f1bd3cc45f719905f3688ebd779aea5f10439b2331d668774ed55e645e025d9f408cedb8313848d4e26ba39726d019543e3533f79f1ef83620932
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
 EBUILD zip-3.0-r4.ebuild 1722 BLAKE2B 5b27ea8c51f13f55be7ae90ff5667dbbebd1a73aaf7d8eca141b121bc7f6f51c7f389a615057ac62bbe2dad70db20903fdfb923c356e52791ffb19945c6c12aa SHA512 53b2a7d6db243d0afc9996e2c1cf715117b01e3d9493205b55812960dbc61083119e1d417fe60b143c25e907b88c07292aabbaec36ea5992b1352edc909d4aca
-EBUILD zip-3.0-r6.ebuild 1955 BLAKE2B 5cc5739a54653ffc38604ff28e11e1392c273bd2422d816cc8c645b146e95af780363c271f945a613ea6edfbc046b356597e9455ab3cf36230c076a7aed4e33d SHA512 e08a23f16b39bf0891449a831710caf58777575959b7900df9817ae992c1db0385968cb3d2766df88e634d8d704105e5e9e192aa551f1d7558bb5b26ad0540af
+EBUILD zip-3.0-r7.ebuild 1955 BLAKE2B 5cc5739a54653ffc38604ff28e11e1392c273bd2422d816cc8c645b146e95af780363c271f945a613ea6edfbc046b356597e9455ab3cf36230c076a7aed4e33d SHA512 e08a23f16b39bf0891449a831710caf58777575959b7900df9817ae992c1db0385968cb3d2766df88e634d8d704105e5e9e192aa551f1d7558bb5b26ad0540af
 MISC metadata.xml 477 BLAKE2B 48b8860bc3795c891ee9591fcb5b10980240b4d6f166fa5d59292643ced0a07946a398c9fab04f15b347039f8f510a2918a0e47deb9e4552b1508fca3009ea5b SHA512 3a1e527d6be6d1afddeb57623406d31f7f26029ca4878a873b5aa6b319dc20c7a1ef772aec406debc095be66eee7245c46c384a7f2f2ad019ae473c1ea6e097d
diff --git a/app-arch/zip/files/zip-3.0-clang-15-configure-tests.patch b/app-arch/zip/files/zip-3.0-clang-15-configure-tests.patch
index a32e1cee9bc0..f776fb3ac04f 100644
--- a/app-arch/zip/files/zip-3.0-clang-15-configure-tests.patch
+++ b/app-arch/zip/files/zip-3.0-clang-15-configure-tests.patch
@@ -3,14 +3,140 @@ https://bugs.gentoo.org/869203
 See also OE's variant: https://cgit.openembedded.org/openembedded-core/commit/?id=f898db2607ba3837f81292af92bc8cb605b96cb3
 --- a/unix/configure
 +++ b/unix/configure
-@@ -507,18 +507,18 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/
- # add NO_'function_name' to flags if missing
+@@ -32,7 +32,7 @@ CFLAGS_BZ=''
+ echo 'Check C compiler type (optimization options)'
+ # Sun C?
+ cat > conftest.c << _EOF_
+-int main()
++int main(void)
+ {
+ #ifndef __SUNPRO_C
+    bad code
+@@ -47,7 +47,7 @@ if test $? -eq 0; then
+ else
+   # Tru64 DEC/Compaq/HP C?
+   cat > conftest.c << _EOF_
+-int main()
++int main(void)
+ {
+ #ifndef __DECC
+    bad code
+@@ -62,7 +62,7 @@ _EOF_
+   else
+     # HP-UX HP C?
+     cat > conftest.c << _EOF_
+-int main()
++int main(void)
+ {
+ #ifdef __GNUC__
+    bad code
+@@ -88,7 +88,7 @@ _EOF_
+     else
+       # GNU C?
+       cat > conftest.c << _EOF_
+-int main()
++int main(void)
+ {
+ #ifndef __GNUC__
+    bad code
+@@ -197,7 +197,7 @@ else
+       echo "  Check if OS already has bzip2 library installed"
+       cat > conftest.c << _EOF_
+ #include "bzlib.h"
+-int main()
++int main(void)
+ {
+   bz_stream strm;
+   BZ2_bzCompressEnd(&strm);
+@@ -260,7 +260,7 @@ rm -f _match.s _match.o _crc_i386.s _crc_i386.o
  
+ echo Check for ANSI options
+ cat > conftest.c << _EOF_
+-int main()
++int main(void)
+ {
+ #ifndef __STDC__
+    forget it
+@@ -288,7 +288,7 @@ $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+ echo Check the handling of const
+ cat > conftest.c << _EOF_
+ typedef int charset[2];
+-int main()
++int main(void)
+ {
+   const charset x;
+   const char *foo;
+@@ -303,7 +303,7 @@ echo Check for time_t
+ cat > conftest.c << _EOF_
+ #include <sys/types.h>
+ #include <time.h>
+-int main()
++int main(void)
+ {
+   time_t t;
+   return 0;
+@@ -315,8 +315,9 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
+ 
+ echo Check for size_t
+ cat > conftest.c << _EOF_
++#include <stddef.h>
+ #include <sys/types.h>
+-int main()
++int main(void)
+ {
+   size_t s;
+   return 0;
+@@ -329,7 +330,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
+ echo Check for off_t
+ cat > conftest.c << _EOF_
+ #include <sys/types.h>
+-int main()
++int main(void)
+ {
+   off_t s;
+   return 0;
+@@ -353,7 +354,7 @@ cat > conftest.c << _EOF_
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <stdio.h>
+-int main()
++int main(void)
+ {
+   struct stat s;
+ 
+@@ -409,7 +410,7 @@ cat > conftest.c << _EOF_
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <stdio.h>
+-int main()
++int main(void)
+ {
+   off_t offset;
+   struct stat s;
+@@ -453,7 +454,7 @@ echo Check for wide char support
+ cat > conftest.c << _EOF_
+ #include <stdlib.h>
+ #include <stdio.h>
+-int main()
++int main(void)
+ {
+   int wsize;
+   wchar_t *wide_string;
+@@ -489,7 +490,7 @@ fi
+ echo Check for gcc no-builtin flag
+ # -fno-builtin since version 2
+ cat > conftest.c << _EOF_
+-int main()
++int main(void)
+ {
+ #if __GNUC__ >= 2
+    return 0;
+@@ -508,14 +509,14 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
  for func in rmdir strchr strrchr rename mktemp mktime mkstemp
  do
    echo Check for $func
 -  echo "int main(){ $func(); return 0; }" > conftest.c
-+  echo "char $func(); int main(){ return $func(); }" > conftest.c
++  echo "char $func(); int main(void){ return $func(); }" > conftest.c
    $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
    [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
  done
@@ -18,36 +144,76 @@ See also OE's variant: https://cgit.openembedded.org/openembedded-core/commit/?i
  
  echo Check for memset
 -echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
-+echo "int main(){ char memset(); return memset(); }" > conftest.c
++echo "int main(void){ char memset(); return memset(); }" > conftest.c
  $CC -o conftest conftest.c >/dev/null 2>/dev/null
  [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
  
- 
+@@ -523,7 +524,7 @@ $CC -o conftest conftest.c >/dev/null 2>/dev/null
  echo Check for memmove
-@@ -551,11 +551,11 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/
- [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_ERRNO"
- 
+ cat > conftest.c << _EOF_
+ #include <string.h>
+-int main() { int a; int b = 0; memmove( &a, &b, sizeof( a)); return a; }
++int main(void) { int a; int b = 0; memmove( &a, &b, sizeof( a)); return a; }
+ _EOF_
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_MEMMOVE"
+@@ -532,7 +533,7 @@ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ echo Check for strerror
+ cat > conftest.c << _EOF_
+ #include <string.h>
+-int main() { strerror( 0); return 0; }
++int main(void) { strerror(0); return 0; }
+ _EOF_
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_STRERROR"
+@@ -540,7 +541,7 @@ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ echo Check for errno declaration
+ cat > conftest.c << _EOF_
+ #include <errno.h>
+-main()
++int main(void)
+ {
+   errno = 0;
+   return 0;
+@@ -552,7 +553,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
  
  echo Check for directory libraries
  cat > conftest.c << _EOF_
 -int main() { return closedir(opendir(".")); }
-+int main() { char closedir(); char opendir(); return closedir(opendir()); }
++int main(void) { char closedir(); char opendir(); return closedir(opendir()); }
  _EOF_
  
  $CC -o conftest conftest.c >/dev/null 2>/dev/null
- if [ $? -ne 0 ]; then
-   OPT=""
-@@ -573,11 +573,11 @@ fi
- 
- 
+@@ -574,7 +575,7 @@ fi
  # Dynix/ptx 1.3 needed this
  
  echo Check for readlink
 -echo "int main(){ return readlink(); }" > conftest.c
-+echo "int main(){ char readlink(); return readlink(); }" > conftest.c
++echo "int main(void){ char readlink(); return readlink(); }" > conftest.c
  $CC -o conftest conftest.c >/dev/null 2>/dev/null
  if [ $? -ne 0 ]; then
    $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null
-   [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq"
- fi
-
+@@ -617,7 +618,7 @@ CFLAGS="${CFLAGS} ${OPT}"
+ 
+ echo Check for valloc
+ cat > conftest.c << _EOF_
+-main()
++int main(void)
+ {
+ #ifdef MMAP
+     valloc();
+@@ -652,12 +653,12 @@ elif [ -f /xenix ]; then
+   fi
+ elif uname -X >/dev/null 2>/dev/null; then
+ # SCO shared library check
+-  echo "int main() { return 0;}" > conftest.c
++  echo "int main(void) { return 0;}" > conftest.c
+   $CC -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null
+   [ $? -eq 0 ] && LFLAGS2="-lc_s -nointl"
+ else
+   SYSTEM=`uname -s 2>/dev/null` || SYSTEM="unknown"
+-  echo "int main() { return 0;}" > conftest.c
++  echo "int main(void) { return 0;}" > conftest.c
+   case $SYSTEM in
+      OSF1|ULTRIX)
+         echo Check for -Olimit option
diff --git a/app-arch/zip/zip-3.0-r6.ebuild b/app-arch/zip/zip-3.0-r6.ebuild
deleted file mode 100644
index f1f6d540e823..000000000000
--- a/app-arch/zip/zip-3.0-r6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="https://infozip.sourceforge.net/Zip.html"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="bzip2 crypt natspec unicode"
-
-DEPEND="${RDEPEND}"
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-crypt.patch # bug #238398
-	"${FILESDIR}"/${P}-pic.patch
-	"${FILESDIR}"/${P}-exec-stack.patch # bug #122849
-	"${FILESDIR}"/${P}-build.patch # bug #200995
-	"${FILESDIR}"/${P}-zipnote-freeze.patch # bug #322047
-	"${FILESDIR}"/${P}-format-security.patch # bug #512414
-	"${FILESDIR}"/${P}-clang-15-configure-tests.patch
-)
-
-src_prepare() {
-	# bug #275244
-	use natspec && PATCHES+=( "${FILESDIR}"/${PN}-3.0-natspec.patch )
-	default
-}
-
-src_configure() {
-	# Needed for Clang 16
-	append-flags -std=gnu89
-
-	append-cppflags \
-		-DLARGE_FILE_SUPPORT \
-		-DUIDGID_NOT_16BIT \
-		-D$(usev !bzip2 'NO')BZIP2_SUPPORT \
-		-D$(usev !crypt 'NO')CRYPT \
-		-D$(usev !unicode 'NO')UNICODE_SUPPORT
-
-	# - We use 'sh' because: 1. lacks +x bit, easier; 2. it tries to load bashdb
-	# - Third arg disables bzip2 logic as we handle it ourselves above.
-	edo sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}"
-
-	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-r7.ebuild b/app-arch/zip/zip-3.0-r7.ebuild
new file mode 100644
index 000000000000..f1f6d540e823
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="https://infozip.sourceforge.net/Zip.html"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="bzip2 crypt natspec unicode"
+
+DEPEND="${RDEPEND}"
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-crypt.patch # bug #238398
+	"${FILESDIR}"/${P}-pic.patch
+	"${FILESDIR}"/${P}-exec-stack.patch # bug #122849
+	"${FILESDIR}"/${P}-build.patch # bug #200995
+	"${FILESDIR}"/${P}-zipnote-freeze.patch # bug #322047
+	"${FILESDIR}"/${P}-format-security.patch # bug #512414
+	"${FILESDIR}"/${P}-clang-15-configure-tests.patch
+)
+
+src_prepare() {
+	# bug #275244
+	use natspec && PATCHES+=( "${FILESDIR}"/${PN}-3.0-natspec.patch )
+	default
+}
+
+src_configure() {
+	# Needed for Clang 16
+	append-flags -std=gnu89
+
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usev !bzip2 'NO')BZIP2_SUPPORT \
+		-D$(usev !crypt 'NO')CRYPT \
+		-D$(usev !unicode 'NO')UNICODE_SUPPORT
+
+	# - We use 'sh' because: 1. lacks +x bit, easier; 2. it tries to load bashdb
+	# - Third arg disables bzip2 logic as we handle it ourselves above.
+	edo sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}"
+
+	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
+}
-- 
cgit v1.2.3