From fae5c40540ab2ebf93e2291bfec510022df02bdc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 25 Aug 2022 08:49:31 +0100 Subject: gentoo auto-resync : 25:08:2022 - 08:49:31 --- app-arch/Manifest.gz | Bin 16745 -> 16745 bytes app-arch/brotli/Manifest | 4 +- app-arch/brotli/brotli-1.0.9-r4.ebuild | 87 ------------------------------ app-arch/brotli/brotli-1.0.9-r5.ebuild | 94 +++++++++++++++++++++++++++++++++ app-arch/brotli/brotli-9999.ebuild | 7 +++ app-arch/unzip/Manifest | 2 + app-arch/unzip/unzip-6.0_p27.ebuild | 93 ++++++++++++++++++++++++++++++++ 7 files changed, 198 insertions(+), 89 deletions(-) delete mode 100644 app-arch/brotli/brotli-1.0.9-r4.ebuild create mode 100644 app-arch/brotli/brotli-1.0.9-r5.ebuild create mode 100644 app-arch/unzip/unzip-6.0_p27.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 7ade6a6347c3..d53af63648d1 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest index 6facc2a343fb..25c8684d2851 100644 --- a/app-arch/brotli/Manifest +++ b/app-arch/brotli/Manifest @@ -2,6 +2,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B 571c95c541b3def87351a232b69bd291dc0d50b9676a08a7a2a0a757d5fc993bad72efab1dc29c37302b2126370b5356d1571b232c9b520c43ea176247bbfc9b SHA512 e159729140a4e9046ec5a850dd7fb1d3f22c32adfc6b54748512abcf7aac0a266852a769814aea9a0219b2076c35cfa7b3b0dd33c6dfc1a0b05dbbb315f69ef9 -EBUILD brotli-1.0.9-r4.ebuild 1824 BLAKE2B f7d32683b5a0eb543e70ee63635b8bf23193b83cae6c0817676e26d2602236b2df523640dd64b1a6281cd139819bfc7c2fb8a64703077289d450487a0f322e26 SHA512 d09035c96481d6011e659af2ad5536223f4dd5056c060b335f7dd555cd110b08e31d1a95f6c0d9ee0d5eaf76ce50d60d68e8ae7fe9f91771a9e033e432aced71 -EBUILD brotli-9999.ebuild 1824 BLAKE2B f7d32683b5a0eb543e70ee63635b8bf23193b83cae6c0817676e26d2602236b2df523640dd64b1a6281cd139819bfc7c2fb8a64703077289d450487a0f322e26 SHA512 d09035c96481d6011e659af2ad5536223f4dd5056c060b335f7dd555cd110b08e31d1a95f6c0d9ee0d5eaf76ce50d60d68e8ae7fe9f91771a9e033e432aced71 +EBUILD brotli-1.0.9-r5.ebuild 1957 BLAKE2B 19739b25c1c80b731078ba6b7151b5222c678e346ff90b1207c322533142f820b27415e1c37a4715b47427fbe3bd744c2175db9629af284f92a1f6209c1ed62f SHA512 4d55c8cace3f8de9d87b045773aa6a58c8192fd81227c8479a8740c24f2c5285bcd572244a9f9edc4d6464a2feb4bbb11aba60875b12b65958c78b7658bad2f4 +EBUILD brotli-9999.ebuild 1957 BLAKE2B 19739b25c1c80b731078ba6b7151b5222c678e346ff90b1207c322533142f820b27415e1c37a4715b47427fbe3bd744c2175db9629af284f92a1f6209c1ed62f SHA512 4d55c8cace3f8de9d87b045773aa6a58c8192fd81227c8479a8740c24f2c5285bcd572244a9f9edc4d6464a2feb4bbb11aba60875b12b65958c78b7658bad2f4 MISC metadata.xml 770 BLAKE2B 6e73f34b47e5edbb8007e253191dbc0dd399d1d3f9f1817df851fa6f56bb6e71c90ffed925e5251041a479d0ff6e8084734c45a0d8c56a914a890992c121fedc SHA512 5b43dbaadb8a7c53ec111335ffc57682ade5f30beba4e98cb53a64244fb835baaf3394ffa210763ed36b0abe6c444263117499d4046c4138d644e924683d931a diff --git a/app-arch/brotli/brotli-1.0.9-r4.ebuild b/app-arch/brotli/brotli-1.0.9-r4.ebuild deleted file mode 100644 index c61d17cd14ae..000000000000 --- a/app-arch/brotli/brotli-1.0.9-r4.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_OPTIONAL="1" -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} pypy3 ) - -inherit cmake-multilib distutils-r1 - -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/google/${PN}.git" - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI=" - https://github.com/google/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz - test? ( - https://dev.gentoo.org/~mgorny/dist/${P}.testdata.tar.xz - ) - " -fi - -DESCRIPTION="Generic-purpose lossless compression algorithm" -HOMEPAGE="https://github.com/google/brotli/" - -LICENSE="MIT python? ( Apache-2.0 )" -SLOT="0/$(ver_cut 1)" -IUSE="python static-libs test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND="python? ( ${DISTUTILS_DEPS} )" - -DOCS=( README.md CONTRIBUTING.md ) - -PATCHES=( "${FILESDIR}/${PV}-linker.patch" ) - -src_prepare() { - cmake_src_prepare - use python && distutils-r1_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING="$(usex test)" - ) - cmake_src_configure -} - -src_configure() { - cmake-multilib_src_configure - use python && distutils-r1_src_configure -} - -src_compile() { - cmake-multilib_src_compile - use python && distutils-r1_src_compile -} - -python_test() { - eunittest -s python -p "*_test.py" -} - -src_test() { - cmake-multilib_src_test - use python && distutils-r1_src_test -} - -multilib_src_install() { - cmake_src_install - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.a || die - fi -} - -multilib_src_install_all() { - use python && distutils-r1_src_install -} diff --git a/app-arch/brotli/brotli-1.0.9-r5.ebuild b/app-arch/brotli/brotli-1.0.9-r5.ebuild new file mode 100644 index 000000000000..bae6d9625256 --- /dev/null +++ b/app-arch/brotli/brotli-1.0.9-r5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL="1" +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} pypy3 ) + +inherit cmake-multilib distutils-r1 + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/google/${PN}.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI=" + https://github.com/google/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz + test? ( + https://dev.gentoo.org/~mgorny/dist/${P}.testdata.tar.xz + ) + " +fi + +DESCRIPTION="Generic-purpose lossless compression algorithm" +HOMEPAGE="https://github.com/google/brotli/" + +LICENSE="MIT python? ( Apache-2.0 )" +SLOT="0/$(ver_cut 1)" +IUSE="python static-libs test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +RDEPEND=" + python? ( ${PYTHON_DEPS} ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND="python? ( ${DISTUTILS_DEPS} )" + +DOCS=( README.md CONTRIBUTING.md ) + +PATCHES=( "${FILESDIR}/${PV}-linker.patch" ) + +src_prepare() { + cmake_src_prepare + use python && distutils-r1_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +} + +src_configure() { + cmake-multilib_src_configure + use python && distutils-r1_src_configure +} + +src_compile() { + cmake-multilib_src_compile + use python && distutils-r1_src_compile +} + +python_test() { + eunittest -s python -p "*_test.py" +} + +src_test() { + cmake-multilib_src_test + use python && distutils-r1_src_test +} + +multilib_src_install() { + cmake_src_install + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/*.a || die + fi +} + +multilib_src_install_all() { + use python && distutils-r1_src_install + + doman docs/brotli.1 + + local page + for page in constants decode encode types ; do + newman docs/${page}.h.3 ${PN}_${page}.h.3 + done +} diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild index c61d17cd14ae..bae6d9625256 100644 --- a/app-arch/brotli/brotli-9999.ebuild +++ b/app-arch/brotli/brotli-9999.ebuild @@ -84,4 +84,11 @@ multilib_src_install() { multilib_src_install_all() { use python && distutils-r1_src_install + + doman docs/brotli.1 + + local page + for page in constants decode encode types ; do + newman docs/${page}.h.3 ${PN}_${page}.h.3 + done } diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 6e8015a7adfb..b58821d15089 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -4,5 +4,7 @@ AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1dd AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d 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 2814 BLAKE2B 98fc6c254161be3de03272319c0a0bd318e0ba5836f196e6b2b7d13938a560c7bd6170fdd4a4afc82c3c7889c6c963b8a51f48157297fa48e0f7b7319768a248 SHA512 6a8d1631a94c70f8e25be1d74c3c3ac6fa5d124a86354d961dddc462aafc7447feace34aac813c3e730f28312a8a0c45d606b700a5c83f5955a992be97eda487 MISC metadata.xml 587 BLAKE2B c2190274c146c5587ac7d6adf786fd98db897aa5a62433afdde4953d3a7ae4a6022837ee6b06f3e216633f5710ab89cccd2000504481094b5871b79300424957 SHA512 75b014ae98951f4484eaa909af92eac9ee955bf5f4ba6795a4bb40a5e40036ba4909a42471ccd2916dd4c9a33a500054590faec39faf9d4049f9c74201884c56 diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild new file mode 100644 index 000000000000..bfa8c139f8c9 --- /dev/null +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -0,0 +1,93 @@ +# 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 +} -- cgit v1.2.3