diff options
Diffstat (limited to 'app-arch/unzip')
| -rw-r--r-- | app-arch/unzip/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/unzip/unzip-6.0_p25.ebuild (renamed from app-arch/unzip/unzip-6.0_p20.ebuild) | 42 |
2 files changed, 22 insertions, 24 deletions
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 1d4148012169..ea59933ad627 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -2,8 +2,8 @@ AUX unzip-6.0-format-security.patch 4424 BLAKE2B c76ac7c9874238ff20c85e35d8bab80 AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1ddfee1abc810e57cef52780482abd8c25950cf0da4d976d89745f4aa65b6269f21d0eac290230621b782fa1e0d06 SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda 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-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 -EBUILD unzip-6.0_p20.ebuild 2546 BLAKE2B b050ea480f15c7d760a0326566661c877d1b6709ce9886f5a068731db112678c3817b54311ddb46411b80566f15a7fed01ae886f60c17102fb76e12241c2c58f SHA512 7eb1315729c287c0f5b18fcf812837c955e879f447632968bd5e516d799c66143cd4c272b264e1d2ae5c1ddc3062bcacb1fd642794cab70dd4f05fe103d6cff5 +DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21 EBUILD unzip-6.0_p21-r2.ebuild 2593 BLAKE2B f626ff277131a9d5cc952bdfcbef19677acf487435835c0f50a438e74db7c3f8e795d0f95a51f51c14e7517ee90cd5906cf7e3c94206d46796c010d6ffd074ab SHA512 934edfb2983a9e423bd6c48d9bd7d71531c50a3578c8311b2310a126b21012986fe0a2726e40890c841fff13f5d75c56f6bfc48823f495cd227377d0b3bc4268 +EBUILD unzip-6.0_p25.ebuild 2606 BLAKE2B 19fc6e70ec6ea38deff1c0433b7d7367535967919d6b5e9efa15ba1d291d3e4a1203efc41afedac544187193aa2eb4058fd0f46a80106b78d1b38361b1036a6f SHA512 1497ff9cad0d17caaca2045e1adf075ad3bda34985cb73da9bae84f2941b746eeeee9195c26591dccbbbfc67463b09adc0a0998c8105b5a9acae46cded5c8729 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653 diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index 65112b3cb15f..dcd460f9f049 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils toolchain-funcs flag-o-matic +inherit toolchain-funcs flag-o-matic MY_PV="${PV//.}" MY_PV="${MY_PV%_p*}" @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 ) @@ -27,14 +27,12 @@ S="${WORKDIR}/${MY_P}" src_prepare() { local deb="${WORKDIR}"/debian/patches - rm \ - "${deb}"/series \ - "${deb}"/02-branding-patch-this-is-debian-unzip \ - || die - epatch "${deb}"/* + rm "${deb}"/02-this-is-debian-unzip.patch || die + eapply "${deb}"/*.patch - epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch - use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 + eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + eapply "${FILESDIR}"/${PN}-6.0-format-security.patch + use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 sed -i -r \ -e '/^CFLAGS/d' \ -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ @@ -54,30 +52,30 @@ src_prepare() { # Delete bundled code to make sure we don't use it. rm -r bzip2 || die - epatch_user + eapply_user } 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" ;; - *-cygwin*) TARGET="cygwin" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + 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" ;; + *-cygwin*) TARGET="cygwin" ;; + *) 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 + use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING append-cppflags -DLARGE_FILE_SUPPORT #281473 } src_compile() { ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ - emake -f unix/Makefile ${TARGET} + emake -f unix/Makefile ${TARGET} } src_install() { |