From 0bb8253b38dc8638a46b66ba909c1bfd1054e1ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 Nov 2022 09:13:50 +0000 Subject: gentoo auto-resync : 04:11:2022 - 09:13:50 --- app-arch/Manifest.gz | Bin 16926 -> 16924 bytes app-arch/unzip/Manifest | 2 +- app-arch/unzip/unzip-6.0_p27-r1.ebuild | 95 +++++++++++++++++++++++++++++++++ app-arch/unzip/unzip-6.0_p27.ebuild | 93 -------------------------------- app-arch/zip/Manifest | 2 +- app-arch/zip/zip-3.0-r5.ebuild | 71 ------------------------ app-arch/zip/zip-3.0-r6.ebuild | 73 +++++++++++++++++++++++++ 7 files changed, 170 insertions(+), 166 deletions(-) create mode 100644 app-arch/unzip/unzip-6.0_p27-r1.ebuild delete mode 100644 app-arch/unzip/unzip-6.0_p27.ebuild delete mode 100644 app-arch/zip/zip-3.0-r5.ebuild create mode 100644 app-arch/zip/zip-3.0-r6.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index bcfb4e6d8e59..ea99bfb07493 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 082d299213c9..8a3f5303795b 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -6,5 +6,5 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04 DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f DIST unzip_6.0-27.debian.tar.xz 24980 BLAKE2B e53a96f12af0cf5227600c73a35003484fca5de138cd37991eb1eb25b97b80371c3a566d989feeb04deb1a93acd9444253b091cd7e920b23520c87c5f5a94eeb SHA512 e1e605f023c7b314a6c5b2857a3bd630350df2d7e4bf6bb38ab8594f967336384666b4db8afad931251b85261ee4e2c38d78641c74ac7e5fd02523f26e92ddb2 EBUILD unzip-6.0_p26.ebuild 2816 BLAKE2B 35b6b47a5700352e3755d1b58ccf7db9dfec22f66d13241b2442102895513a81e291bcfe95c2139146c3fb67309df5cea9dbce90ccd5383378e14cd9d7d0bb71 SHA512 669885c0afcbf3ae574bc37791be3da75659fd756f225e53b93bc724321458724f81c5962f995a4570738d3b803c8acc72140e6c64af7f8c7b7b823094380a39 -EBUILD unzip-6.0_p27.ebuild 2807 BLAKE2B 83400abfc41013e8410b2b30ed29ad36766eefc27e4a00129052925b3da8a748eef60f0210e2990309528052a59f97740613a43b246f6e26f02bcb49dab9a368 SHA512 e35f7f1d9ffd1b1827140b8052eb15bc16bf999d83d1725ed936ed5df3ba403546aa21af1419dca6bf0c2c3b1ddda948ede3cea0c8cb501012043752d2e8b61a +EBUILD unzip-6.0_p27-r1.ebuild 2833 BLAKE2B 8b98706b45de28d8faaef526bfd45e7d2a74179456068955631a06383a112c15496189cffe7ff829f7c6fbae555df4402d8d74aad287b0964dbe3a9205fe45e1 SHA512 75a7ed45efff2f9f9d9465ed297c54a9a8e3d1531dbc10411ad80cb22f7f3876ae930ada3b441acb4b78c9bcd8bc5a91d945b664ba060e655354df8b29d5ec0e MISC metadata.xml 587 BLAKE2B c2190274c146c5587ac7d6adf786fd98db897aa5a62433afdde4953d3a7ae4a6022837ee6b06f3e216633f5710ab89cccd2000504481094b5871b79300424957 SHA512 75b014ae98951f4484eaa909af92eac9ee955bf5f4ba6795a4bb40a5e40036ba4909a42471ccd2916dd4c9a33a500054590faec39faf9d4049f9c74201884c56 diff --git a/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/app-arch/unzip/unzip-6.0_p27-r1.ebuild new file mode 100644 index 000000000000..c466394b30d4 --- /dev/null +++ b/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib toolchain-funcs + +MY_PV="${PV//.}" +MY_PV="${MY_PV%_p*}" +MY_P="${PN}${MY_PV}" + +DESCRIPTION="unzipper for pkzip-compressed files" +HOMEPAGE="http://www.info-zip.org/" +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 natspec unicode" + +DEPEND="bzip2? ( app-arch/bzip2 ) + natspec? ( dev-libs/libnatspec )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${WORKDIR}"/debian/patches + "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + "${FILESDIR}"/${PN}-6.0-format-security.patch + "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch +) + +src_prepare() { + # bug #275244 + use natspec && PATCHES+=( "${FILESDIR}"/${PN}-6.0-natspec.patch ) + + rm "${WORKDIR}"/debian/patches/02-this-is-debian-unzip.patch || die + + default + + sed -i -r \ + -e '/^CFLAGS/d' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/^STRIP/s:=.*:=true:' \ + -e "s:\:CC=\"$(tc-getCC)\":" \ + -e "s:\:LD=\"$(tc-getCC)\":" \ + -e "s:\:AS=\"$(tc-getCC)\":" \ + -e 's:LF2 = -s:LF2 = :' \ + -e 's:LF = :LF = $(LDFLAGS) :' \ + -e 's:SL = :SL = $(LDFLAGS) :' \ + -e 's:FL = :FL = $(LDFLAGS) :' \ + -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \ + -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \ + unix/Makefile \ + || die "sed unix/Makefile failed" + + # Delete bundled code to make sure we don't use it. + rm -r bzip2 || die +} + +src_configure() { + case ${CHOST} in + i?86*-*linux*) TARGET="linux_asm" ;; + *linux*) TARGET="linux_noasm" ;; + i?86*-*bsd* | \ + i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm + *bsd* | *dragonfly*) TARGET="bsd" ;; + *-darwin*) TARGET="macosx" ;; + *-solaris*) TARGET="generic" ;; + *-cygwin*) TARGET="generic" ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + esac + + append-flags -std=gnu89 + + [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD + use bzip2 && append-cppflags -DUSE_BZIP2 + use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING + + # bug #281473 + append-cppflags -DLARGE_FILE_SUPPORT +} + +src_compile() { + ASFLAGS="${ASFLAGS} $(get_abi_CFLAGS)" emake -f unix/Makefile ${TARGET} +} + +src_install() { + dobin unzip funzip unzipsfx unix/zipgrep + dosym unzip /usr/bin/zipinfo + doman man/*.1 + dodoc BUGS History* README ToDo WHERE +} diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild deleted file mode 100644 index a0eef4ef040a..000000000000 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib toolchain-funcs - -MY_PV="${PV//.}" -MY_PV="${MY_PV%_p*}" -MY_P="${PN}${MY_PV}" - -DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/" -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz - mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" - -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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 natspec unicode" - -DEPEND="bzip2? ( app-arch/bzip2 ) - natspec? ( dev-libs/libnatspec )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${WORKDIR}"/debian/patches - "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch - "${FILESDIR}"/${PN}-6.0-format-security.patch - "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch -) - -src_prepare() { - # bug #275244 - use natspec && PATCHES+=( "${FILESDIR}"/${PN}-6.0-natspec.patch ) - - rm "${WORKDIR}"/debian/patches/02-this-is-debian-unzip.patch || die - - default - - sed -i -r \ - -e '/^CFLAGS/d' \ - -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ - -e '/^STRIP/s:=.*:=true:' \ - -e "s:\:CC=\"$(tc-getCC)\":" \ - -e "s:\:LD=\"$(tc-getCC)\":" \ - -e "s:\:AS=\"$(tc-getCC)\":" \ - -e 's:LF2 = -s:LF2 = :' \ - -e 's:LF = :LF = $(LDFLAGS) :' \ - -e 's:SL = :SL = $(LDFLAGS) :' \ - -e 's:FL = :FL = $(LDFLAGS) :' \ - -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \ - -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \ - unix/Makefile \ - || die "sed unix/Makefile failed" - - # Delete bundled code to make sure we don't use it. - rm -r bzip2 || die -} - -src_configure() { - case ${CHOST} in - i?86*-*linux*) TARGET="linux_asm" ;; - *linux*) TARGET="linux_noasm" ;; - i?86*-*bsd* | \ - i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm - *bsd* | *dragonfly*) TARGET="bsd" ;; - *-darwin*) TARGET="macosx" ;; - *-solaris*) TARGET="generic" ;; - *-cygwin*) TARGET="generic" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; - esac - - [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD - use bzip2 && append-cppflags -DUSE_BZIP2 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING - - # bug #281473 - append-cppflags -DLARGE_FILE_SUPPORT -} - -src_compile() { - ASFLAGS="${ASFLAGS} $(get_abi_CFLAGS)" emake -f unix/Makefile ${TARGET} -} - -src_install() { - dobin unzip funzip unzipsfx unix/zipgrep - dosym unzip /usr/bin/zipinfo - doman man/*.1 - dodoc BUGS History* README ToDo WHERE -} diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest index 592d2a9f1f73..062589fe7dbe 100644 --- a/app-arch/zip/Manifest +++ b/app-arch/zip/Manifest @@ -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 1706 BLAKE2B 53c14e019adc5917f3e5931aa0cbec5c13b61f01571171c398ab506ee2814940cf3600218f4426b8cc61b2e4c192a21278df84764a5d74575750fb97bbed6065 SHA512 7c0acaa20be859eb00940b4cf784b58dce26c66f35fe275267004f4191fdb3b5cff718633673f6af796f7a4f38b3ef0432d19a64bcf65cb607419c98ac31ae6a -EBUILD zip-3.0-r5.ebuild 1891 BLAKE2B 4f4dde8c73ac905532a7abd011ebd8c0ef6477290b7fed3881ea8cd699e41309b247fd58d921b8b7da71279781f44b8cb58ebe03dc5106acc757859055a398ef SHA512 8d409e4275671e2677a5e2ac2ae1224d79e03510595036ff0a8dcccd5855e2106c151f094984c963b39c322894c86eb6eb310e677556baffa27d31ad88c7456b +EBUILD zip-3.0-r6.ebuild 1917 BLAKE2B 1b9c094ecc08cd9c24b9be40e29b8a500f8b02591a81ed7792b30a9d3d6e0410b9dfdb57f9ad1d0eb458376e05a2ba405071349a776fc584340c932236608f0a SHA512 2c389c185b8a06973f4df0e5b84c267b6996c30428717185aeca92fbceb2645c03d247da0c18db9d2e21f39b18c39bd9e0709ab4a6ff37fefc376c206d60d6bb MISC metadata.xml 477 BLAKE2B 48b8860bc3795c891ee9591fcb5b10980240b4d6f166fa5d59292643ced0a07946a398c9fab04f15b347039f8f510a2918a0e47deb9e4552b1508fca3009ea5b SHA512 3a1e527d6be6d1afddeb57623406d31f7f26029ca4878a873b5aa6b319dc20c7a1ef772aec406debc095be66eee7245c46c384a7f2f2ad019ae473c1ea6e097d diff --git a/app-arch/zip/zip-3.0-r5.ebuild b/app-arch/zip/zip-3.0-r5.ebuild deleted file mode 100644 index 09244c8b2bb6..000000000000 --- a/app-arch/zip/zip-3.0-r5.ebuild +++ /dev/null @@ -1,71 +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="http://www.info-zip.org/" -SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip" -S="${WORKDIR}"/${MY_P} - -LICENSE="Info-ZIP" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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() { - 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-r6.ebuild b/app-arch/zip/zip-3.0-r6.ebuild new file mode 100644 index 000000000000..ebb7fe06e4b4 --- /dev/null +++ b/app-arch/zip/zip-3.0-r6.ebuild @@ -0,0 +1,73 @@ +# 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="http://www.info-zip.org/" +SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip" +S="${WORKDIR}"/${MY_P} + +LICENSE="Info-ZIP" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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() { + 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