diff options
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/bzip2/Manifest | 2 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.8-r3.ebuild (renamed from app-arch/bzip2/bzip2-1.0.6-r10.ebuild) | 39 |
2 files changed, 20 insertions, 21 deletions
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 03ffea8912..099151807c 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -1,2 +1,2 @@ -DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 +DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild index 990d3c1c6e..1c2b65d3b8 100644 --- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild +++ b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild @@ -1,33 +1,36 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly # (since we're building shared libs) ... -EAPI=6 +EAPI=7 -inherit toolchain-funcs multilib-minimal prefix +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg +inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig prefix DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" HOMEPAGE="https://sourceware.org/bzip2/" -SRC_URI="mirror://gentoo/${P}.tar.gz" +SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz" +SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )" LICENSE="BZIP2" SLOT="0/1" # subslot = SONAME KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="static static-libs" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )" +RDEPEND="!app-arch/lbzip2[symlink(-)] + !app-arch/pbzip2[symlink(-)]" + PATCHES=( "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch - "${FILESDIR}"/${PN}-1.0.6-saneso.patch + "${FILESDIR}"/${PN}-1.0.8-saneso.patch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 "${FILESDIR}"/${PN}-1.0.6-progress.patch "${FILESDIR}"/${PN}-1.0.3-no-test.patch - "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365 - "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573 - "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch - "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466 - "${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch + "${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573 + "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch ) DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) @@ -48,13 +51,6 @@ src_prepare() { hprefixify -w "/^PATH=/" bz{diff,grep,more} # this a makefile for Darwin, which already "includes" saneso cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die - - if [[ ${CHOST} == *-cygwin* ]] ; then - sed -i -e "s/-o libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \ - -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o cygbz2-${PV%%.*}.dll/" \ - -e "s/libbz2\.so/libbz2$(get_libname)/g" \ - Makefile-libbz2_so - fi } bemake() { @@ -67,7 +63,6 @@ bemake() { } multilib_src_compile() { - local checkopts= case "${CHOST}" in *-darwin*) bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all @@ -77,10 +72,15 @@ multilib_src_compile() { ;; esac # Make sure we link against the shared lib #504648 - ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) + ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) || die bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" } +multilib_src_test() { + cp "${S}"/sample* "${BUILD_DIR}" || die + bemake -f "${S}"/Makefile check +} + multilib_src_install() { into /usr @@ -89,7 +89,6 @@ multilib_src_install() { # .x.x - SONAME some distros use #338321 # .x - SONAME Gentoo uses dolib.so libbz2$(get_libname ${PV}) - [[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll local v for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v} |