commit: 94c6e08a7720f558bb603793f8e4c2d70283c08f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 6 08:04:09 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 6 08:04:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c6e08a
sys-libs/zlib: drop 1.2.13-r1, 1.2.13-r2, 1.3-r1 Bug: https://bugs.gentoo.org/916484 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/zlib/Manifest | 2 - sys-libs/zlib/zlib-1.2.13-r1.ebuild | 181 ----------------------------------- sys-libs/zlib/zlib-1.2.13-r2.ebuild | 184 ------------------------------------ sys-libs/zlib/zlib-1.3-r1.ebuild | 176 ---------------------------------- 4 files changed, 543 deletions(-) diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index de5404f10c8a..95af1a3ddd57 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -1,4 +1,2 @@ -DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8 SHA512 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725 -DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274 SHA512 ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621 DIST zlib-1.3.tar.xz 1295740 BLAKE2B 5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a SHA512 3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2 DIST zlib-1.3.tar.xz.asc 235 BLAKE2B 5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb SHA512 8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6 diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sys-libs/zlib/zlib-1.2.13-r1.ebuild deleted file mode 100644 index 109771cd690f..000000000000 --- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports. -AUTOTOOLS_AUTO_DEPEND="no" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc -inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig - -DESCRIPTION="Standard (de)compression library" -HOMEPAGE="https://zlib.net/"; -SRC_URI="https://zlib.net/${P}.tar.xz - https://zlib.net/fossils/${P}.tar.xz - https://zlib.net/current/beta/${P}.tar.xz - verify-sig? ( https://zlib.net/${P}.tar.xz.asc )" - -LICENSE="ZLIB" -SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="minizip static-libs" - -RDEPEND="!sys-libs/zlib-ng[compat]" -DEPEND="${RDEPEND}" -BDEPEND=" - minizip? ( ${AUTOTOOLS_DEPEND} ) - verify-sig? ( sec-keys/openpgp-keys-madler ) -" - -PATCHES=( - # Don't install unexpected & unused crypt.h header (which would clash with other pkgs) - # Pending upstream. bug #658536 - "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch - - # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628 - "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch - - # Respect LDFLAGS during configure tests. Pending upstream - "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch - - # Fix building on sparc with older binutils, we pass it in ebuild instead - "${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch -) - -src_prepare() { - default - - if use minizip ; then - cd contrib/minizip || die - eautoreconf - fi - - case ${CHOST} in - *-mingw*|mingw*) - # Uses preconfigured Makefile rather than configure script - multilib_copy_sources - - ;; - esac -} - -echoit() { echo "$@"; "$@"; } - -multilib_src_configure() { - # We pass manually instead of relying on the configure script/makefile - # because it would pass it even for older binutils. - use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments) - - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi - - case ${CHOST} in - *-mingw*|mingw*) - ;; - - *) - # bug #347167 - local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) - - local myconf=( - --shared - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - ${uname:+--uname=${uname}} - ) - - # Not an autoconf script, so can't use econf - echoit "${S}"/configure "${myconf[@]}" || die - - ;; - esac - - if use minizip ; then - local minizipdir="contrib/minizip" - mkdir -p "${BUILD_DIR}/${minizipdir}" || die - - cd ${minizipdir} || die - ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static) - fi -} - -multilib_src_compile() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- - sed \ - -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ - -e 's|@exec_prefix@|${prefix}|g' \ - -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@includedir@|${prefix}/include|g' \ - -e 's|@VERSION@|'${PV}'|g' \ - zlib.pc.in > zlib.pc || die - ;; - - *) - emake - - ;; - esac - - use minizip && emake -C contrib/minizip -} - -sed_macros() { - # Clean up namespace a little, bug #383179 - # We do it here so we only have to tweak 2 files - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die -} - -multilib_src_install() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc install \ - BINARY_PATH="${ED}/usr/bin" \ - LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ - INCLUDE_PATH="${ED}/usr/include" \ - SHARED_MODE=1 - - # Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136 - insinto /usr/$(get_libdir)/pkgconfig - doins zlib.pc - - ;; - - *) - emake install DESTDIR="${D}" LDCONFIG=: - gen_usr_ldscript -a z - - ;; - esac - - sed_macros "${ED}"/usr/include/*.h - - if use minizip ; then - emake -C contrib/minizip install DESTDIR="${D}" - sed_macros "${ED}"/usr/include/minizip/*.h - - # This might not exist if slibtool is used. - # bug #816756 - rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die - fi - - if ! use static-libs ; then - # bug #419645 - rm "${ED}"/usr/$(get_libdir)/libz.a || die - fi -} - -multilib_src_install_all() { - dodoc FAQ README ChangeLog doc/*.txt - - if use minizip ; then - dodoc contrib/minizip/*.txt - doman contrib/minizip/*.1 - fi -} diff --git a/sys-libs/zlib/zlib-1.2.13-r2.ebuild b/sys-libs/zlib/zlib-1.2.13-r2.ebuild deleted file mode 100644 index b90fde773c5f..000000000000 --- a/sys-libs/zlib/zlib-1.2.13-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports. -AUTOTOOLS_AUTO_DEPEND="no" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc -inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig - -DESCRIPTION="Standard (de)compression library" -HOMEPAGE="https://zlib.net/"; -SRC_URI="https://zlib.net/${P}.tar.xz - https://zlib.net/fossils/${P}.tar.xz - https://zlib.net/current/beta/${P}.tar.xz - verify-sig? ( https://zlib.net/${P}.tar.xz.asc )" - -LICENSE="ZLIB" -SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="minizip static-libs" - -RDEPEND="!sys-libs/zlib-ng[compat]" -DEPEND="${RDEPEND}" -BDEPEND=" - minizip? ( ${AUTOTOOLS_DEPEND} ) - verify-sig? ( sec-keys/openpgp-keys-madler ) -" - -PATCHES=( - # Don't install unexpected & unused crypt.h header (which would clash with other pkgs) - # Pending upstream. bug #658536 - "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch - - # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628 - "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch - - # Respect LDFLAGS during configure tests. Pending upstream - "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch - - # Fix building on sparc with older binutils, we pass it in ebuild instead - "${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch - - # CVE-2023-45853 (bug #916484) - "${FILESDIR}"/${PN}-1.2.13-CVE-2023-45853.patch -) - -src_prepare() { - default - - if use minizip ; then - cd contrib/minizip || die - eautoreconf - fi - - case ${CHOST} in - *-mingw*|mingw*) - # Uses preconfigured Makefile rather than configure script - multilib_copy_sources - - ;; - esac -} - -echoit() { echo "$@"; "$@"; } - -multilib_src_configure() { - # We pass manually instead of relying on the configure script/makefile - # because it would pass it even for older binutils. - use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments) - - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi - - case ${CHOST} in - *-mingw*|mingw*) - ;; - - *) - # bug #347167 - local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) - - local myconf=( - --shared - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - ${uname:+--uname=${uname}} - ) - - # Not an autoconf script, so can't use econf - echoit "${S}"/configure "${myconf[@]}" || die - - ;; - esac - - if use minizip ; then - local minizipdir="contrib/minizip" - mkdir -p "${BUILD_DIR}/${minizipdir}" || die - - cd ${minizipdir} || die - ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static) - fi -} - -multilib_src_compile() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- - sed \ - -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ - -e 's|@exec_prefix@|${prefix}|g' \ - -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@includedir@|${prefix}/include|g' \ - -e 's|@VERSION@|'${PV}'|g' \ - zlib.pc.in > zlib.pc || die - ;; - - *) - emake - - ;; - esac - - use minizip && emake -C contrib/minizip -} - -sed_macros() { - # Clean up namespace a little, bug #383179 - # We do it here so we only have to tweak 2 files - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die -} - -multilib_src_install() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc install \ - BINARY_PATH="${ED}/usr/bin" \ - LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ - INCLUDE_PATH="${ED}/usr/include" \ - SHARED_MODE=1 - - # Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136 - insinto /usr/$(get_libdir)/pkgconfig - doins zlib.pc - - ;; - - *) - emake install DESTDIR="${D}" LDCONFIG=: - gen_usr_ldscript -a z - - ;; - esac - - sed_macros "${ED}"/usr/include/*.h - - if use minizip ; then - emake -C contrib/minizip install DESTDIR="${D}" - sed_macros "${ED}"/usr/include/minizip/*.h - - # This might not exist if slibtool is used. - # bug #816756 - rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die - fi - - if ! use static-libs ; then - # bug #419645 - rm "${ED}"/usr/$(get_libdir)/libz.a || die - fi -} - -multilib_src_install_all() { - dodoc FAQ README ChangeLog doc/*.txt - - if use minizip ; then - dodoc contrib/minizip/*.txt - doman contrib/minizip/*.1 - fi -} diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild deleted file mode 100644 index 801eb15ff21a..000000000000 --- a/sys-libs/zlib/zlib-1.3-r1.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports. -AUTOTOOLS_AUTO_DEPEND="no" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc -inherit autotools edo multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig - -DESCRIPTION="Standard (de)compression library" -HOMEPAGE="https://zlib.net/"; -SRC_URI=" - https://zlib.net/${P}.tar.xz - https://zlib.net/fossils/${P}.tar.xz - https://zlib.net/current/beta/${P}.tar.xz - https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz - verify-sig? ( - https://zlib.net/${P}.tar.xz.asc - https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz.asc - ) -" - -LICENSE="ZLIB" -SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="minizip static-libs" - -RDEPEND="!sys-libs/zlib-ng[compat]" -DEPEND="${RDEPEND}" -BDEPEND=" - minizip? ( ${AUTOTOOLS_DEPEND} ) - verify-sig? ( sec-keys/openpgp-keys-madler ) -" - -PATCHES=( - # Don't install unexpected & unused crypt.h header (which would clash with other pkgs) - # Pending upstream. bug #658536 - "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch - - # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628 - "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch - - # Respect LDFLAGS during configure tests. Pending upstream - "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch - - # Fix building on sparc with older binutils, we pass it in ebuild instead - "${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch -) - -src_prepare() { - default - - if use minizip ; then - cd contrib/minizip || die - eautoreconf - fi - - case ${CHOST} in - *-mingw*|mingw*) - # Uses preconfigured Makefile rather than configure script - multilib_copy_sources - - ;; - esac -} - -multilib_src_configure() { - # We pass manually instead of relying on the configure script/makefile - # because it would pass it even for older binutils. - use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments) - - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi - - case ${CHOST} in - *-mingw*|mingw*) - ;; - - *) - # bug #347167 - local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) - - local myconf=( - --shared - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - ${uname:+--uname=${uname}} - ) - - # Not an autoconf script, so can't use econf - edo "${S}"/configure "${myconf[@]}" - - ;; - esac - - if use minizip ; then - local minizipdir="contrib/minizip" - mkdir -p "${BUILD_DIR}/${minizipdir}" || die - - cd ${minizipdir} || die - ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static) - fi -} - -multilib_src_compile() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- - sed \ - -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ - -e 's|@exec_prefix@|${prefix}|g' \ - -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@includedir@|${prefix}/include|g' \ - -e 's|@VERSION@|'${PV}'|g' \ - zlib.pc.in > zlib.pc || die - ;; - - *) - emake - - ;; - esac - - use minizip && emake -C contrib/minizip -} - -multilib_src_install() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc install \ - BINARY_PATH="${ED}/usr/bin" \ - LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ - INCLUDE_PATH="${ED}/usr/include" \ - SHARED_MODE=1 - - # Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136 - insinto /usr/$(get_libdir)/pkgconfig - doins zlib.pc - - ;; - - *) - emake install DESTDIR="${D}" LDCONFIG=: - gen_usr_ldscript -a z - - ;; - esac - - if use minizip ; then - emake -C contrib/minizip install DESTDIR="${D}" - - # This might not exist if slibtool is used. - # bug #816756 - rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die - fi - - if ! use static-libs ; then - # bug #419645 - rm "${ED}"/usr/$(get_libdir)/libz.a || die - fi -} - -multilib_src_install_all() { - dodoc FAQ README ChangeLog doc/*.txt - - if use minizip ; then - dodoc contrib/minizip/*.txt - doman contrib/minizip/*.1 - fi -}
