[gentoo-commits] repo/gentoo:master commit in: dev-libs/popt/, dev-libs/popt/files/

[Andreas Sturmlechner]

commit:     36e7caaa33842495e383cff0032583b7faef8db2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 08:53:51 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 19:31:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e7caaa

dev-libs/popt: Drop 1.16-r2, EAPI5--

Closes: https://bugs.gentoo.org/753410
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/popt/Manifest                             |  1 -
 .../popt/files/fix-popt-pkgconfig-libdir.patch     | 12 --------
 dev-libs/popt/popt-1.16-r2.ebuild                  | 36 ----------------------
 3 files changed, 49 deletions(-)

diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 3494d8a975c..650e16e6802 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,2 +1 @@
-DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5

diff --git a/dev-libs/popt/files/fix-popt-pkgconfig-libdir.patch b/dev-libs/popt/files/fix-popt-pkgconfig-libdir.patch
deleted file mode 100644
index 32e1bb35303..00000000000
--- a/dev-libs/popt/files/fix-popt-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u popt-1.16.orig/Makefile.in popt-1.16/Makefile.in
---- popt-1.16.orig/Makefile.in	2010-05-04 16:55:59.000000000 -0400
-+++ popt-1.16/Makefile.in	2010-12-23 22:45:42.843131000 -0500
-@@ -370,7 +370,7 @@
- libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
- libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ \
- 	$(am__append_1)
--pkgconfigdir = $(prefix)/lib/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = popt.pc
- man_MANS = popt.3
- BUILT_SOURCES = popt.pc # popt.lcd

diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
deleted file mode 100644
index 5e46e3a68b8..00000000000
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch multilib-minimal libtool ltprune
-
-DESCRIPTION="Parse Options - Command line parser"
-HOMEPAGE="http://rpm5.org/"
-SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558
-	sed -i -e 's:lt-test1:test1:' testit.sh || die
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls)
-}
-
-multilib_src_install_all() {
-	dodoc CHANGES README
-	prune_libtool_files --all
-}