From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0CEDE138334 for ; Thu, 11 Apr 2019 11:40:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 405BBE0871; Thu, 11 Apr 2019 11:40:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0240AE0871 for ; Thu, 11 Apr 2019 11:40:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FDEC340D1C for ; Thu, 11 Apr 2019 11:40:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EDF35A5 for ; Thu, 11 Apr 2019 11:40:37 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1554982832.e9354176a82b0c5556e149f6ca068da873085eae.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/zlib/zlib-1.2.11-r1.ebuild sys-libs/zlib/zlib-1.2.11.ebuild X-VCS-Directories: sys-libs/zlib/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e9354176a82b0c5556e149f6ca068da873085eae X-VCS-Branch: master Date: Thu, 11 Apr 2019 11:40:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 57d03720-4738-43e7-9095-f01034fed701 X-Archives-Hash: 8104964688be95d468df1e1340a06d6a commit: e9354176a82b0c5556e149f6ca068da873085eae Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 11 11:40:00 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 11 11:40:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9354176 sys-libs/zlib: Removed old. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-libs/zlib/zlib-1.2.11-r1.ebuild | 122 ------------------------------------ sys-libs/zlib/zlib-1.2.11.ebuild | 120 ----------------------------------- 2 files changed, 242 deletions(-) diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild deleted file mode 100644 index aeddd1a694d..00000000000 --- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -AUTOTOOLS_AUTO_DEPEND="no" - -inherit autotools toolchain-funcs multilib multilib-minimal - -DESCRIPTION="Standard (de)compression library" -HOMEPAGE="https://zlib.net/" -SRC_URI="https://zlib.net/${P}.tar.gz - http://www.gzip.org/zlib/${P}.tar.gz - http://www.zlib.net/current/beta/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/1" # subslot = SONAME -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="minizip static-libs" - -DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" -RDEPEND="! zlib.pc || die - ;; - *) - emake - ;; - esac - use minizip && emake -C contrib/minizip -} - -sed_macros() { - # clean up namespace a little #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 #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 - fi - - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645 -} - -multilib_src_install_all() { - dodoc FAQ README ChangeLog doc/*.txt - use minizip && dodoc contrib/minizip/*.txt -} diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11.ebuild deleted file mode 100644 index a7d2cb8d2a9..00000000000 --- a/sys-libs/zlib/zlib-1.2.11.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -AUTOTOOLS_AUTO_DEPEND="no" - -inherit autotools toolchain-funcs multilib multilib-minimal - -DESCRIPTION="Standard (de)compression library" -HOMEPAGE="https://zlib.net/" -SRC_URI="https://zlib.net/${P}.tar.gz - http://www.gzip.org/zlib/${P}.tar.gz - http://www.zlib.net/current/beta/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/1" # subslot = SONAME -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="minizip static-libs" - -DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" -RDEPEND="! zlib.pc || die - ;; - *) - emake - ;; - esac - use minizip && emake -C contrib/minizip -} - -sed_macros() { - # clean up namespace a little #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 #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 - fi - - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645 -} - -multilib_src_install_all() { - dodoc FAQ README ChangeLog doc/*.txt - use minizip && dodoc contrib/minizip/*.txt -}