diff options
Diffstat (limited to 'app-arch/bzip2')
-rw-r--r-- | app-arch/bzip2/Manifest | 1 | ||||
-rw-r--r-- | app-arch/bzip2/bzip2-1.0.8-r5.ebuild (renamed from app-arch/bzip2/bzip2-1.0.8-r1.ebuild) | 53 | ||||
-rw-r--r-- | app-arch/bzip2/bzip2-9999.ebuild | 41 | ||||
-rw-r--r-- | app-arch/bzip2/metadata.xml | 3 |
4 files changed, 54 insertions, 44 deletions
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index a4b18f5d5bf2..099151807c27 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -1 +1,2 @@ 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.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild index 49d36f93d65a..8b2111a2bfcb 100644 --- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild +++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 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 @@ -6,17 +6,26 @@ EAPI=7 -inherit toolchain-funcs multilib-minimal usr-ldscript +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bzip2.gpg +inherit toolchain-funcs multilib multilib-minimal verify-sig DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" HOMEPAGE="https://sourceware.org/bzip2/" 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="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos" IUSE="static static-libs" +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-bzip2 ) +" +PDEPEND=" + app-alternatives/bzip2 +" + PATCHES=( "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch "${FILESDIR}"/${PN}-1.0.8-saneso.patch @@ -59,6 +68,11 @@ multilib_src_compile() { 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 @@ -72,21 +86,12 @@ multilib_src_install() { dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} done - # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. - # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. - # OK to remove one year after 2020-04-11. - if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then - dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0" - fi - use static-libs && dolib.a libbz2.a if multilib_is_native_abi ; then - gen_usr_ldscript -a bz2 - - dobin bzip2recover + dobin bzip2recover$(get_exeext) into / - dobin bzip2 + newbin bzip2$(get_exeext) bzip2-reference$(get_exeext) fi } @@ -97,7 +102,8 @@ multilib_src_install_all() { doins bzlib.h into /usr dobin bz{diff,grep,more} - doman *.1 + doman bz{diff,grep,more}.1 + newman bzip2.1 bzip2-reference.1 dosym bzdiff /usr/bin/bzcmp dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 @@ -105,18 +111,23 @@ multilib_src_install_all() { dosym bzmore /usr/bin/bzless dosym bzmore.1 /usr/share/man/man1/bzless.1 + dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1 local x - for x in bunzip2 bzcat bzip2recover ; do - dosym bzip2.1 /usr/share/man/man1/${x}.1 - done for x in bz{e,f}grep ; do dosym bzgrep /usr/bin/${x} dosym bzgrep.1 /usr/share/man/man1/${x}.1 done einstalldocs +} - # move "important" bzip2 binaries to /bin and use the shared libbz2.so - dosym bzip2 /bin/bzcat - dosym bzip2 /bin/bunzip2 +pkg_postinst() { + # ensure to preserve the symlinks before app-alternatives/bzip2 + # is installed + local x + for x in bzip2 bunzip2 bzcat; do + if [[ ! -h ${EROOT}/bin/${x} ]]; then + ln -s bzip2-reference$(get_exeext) "${EROOT}/bin/${x}$(get_exeext)" || die + fi + done } diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild index a5f4b823c2f1..e8b4774ac56e 100644 --- a/app-arch/bzip2/bzip2-9999.ebuild +++ b/app-arch/bzip2/bzip2-9999.ebuild @@ -1,24 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson-multilib usr-ldscript DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="https://gitlab.com/federicomenaquintero/bzip2" -if [[ "${PV}" == 9999 ]] ; then +HOMEPAGE="https://gitlab.com/bzip2/bzip2" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/bzip2/bzip2" inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git" else - SRC_URI="" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" fi + LICENSE="BZIP2" SLOT="0/1" # subslot = SONAME IUSE="static-libs" +PDEPEND=" + app-alternatives/bzip2 +" + multilib_src_configure() { local emesonargs=( -Ddefault_library=$(usex static-libs both shared) @@ -32,25 +36,19 @@ multilib_src_configure() { multilib_src_install() { meson_src_install - # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. - # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. - # OK to remove one year after 2020-04-11. - if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then - dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0" - fi - if multilib_is_native_abi ; then gen_usr_ldscript -a bz2 - - dodir /bin - mv "${ED}"/usr/bin/bzip2 "${ED}"/bin || die fi } multilib_src_install_all() { - # move "important" bzip2 binaries to /bin and use the shared libbz2.so - dosym bzip2 /bin/bzcat - dosym bzip2 /bin/bunzip2 + dodir /bin + mv "${ED}"/usr/bin/bzip2 "${ED}"/bin/bzip2-reference || die + mv "${ED}"/usr/share/man/man1/bzip2{,-reference}.1 || die + + # moved to app-alternatives/bzip2 + rm "${ED}"/usr/bin/{bzcat,bunzip2} || die + rm "${ED}"/usr/share/man/man1/{bzcat,bunzip2.1} || die dosym bzdiff /usr/bin/bzcmp dosym bzmore /usr/bin/bzless @@ -59,8 +57,7 @@ multilib_src_install_all() { dosym bzgrep /usr/bin/${x} done - dosym bzip2.1 /usr/share/man/man1/bzip2recover.1 + dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1 - local DOCS=( AUTHORS NEWS{,-pre-1.0.7} README.md ) einstalldocs } diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml index 83d6d32d00a6..e3880e673f7f 100644 --- a/app-arch/bzip2/metadata.xml +++ b/app-arch/bzip2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>base-system@gentoo.org</email> @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="cpe">cpe:/a:bzip:bzip2</remote-id> + <remote-id type="gitlab">bzip2/bzip2</remote-id> </upstream> </pkgmetadata> |