commit: 9bc96591382502e4c6d79de227c0028718fcd667
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 1 12:24:09 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 12:28:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9bc96591
dev-libs/popt: migrate to ::gentoo
The interix/mint/cygwin patches no longer seem to:
1) be relevant, or
2) have been applied upstream.
This lets us grab a version bump and stop using the overlay version.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/popt/Manifest | 1 -
.../popt/files/fix-popt-pkgconfig-libdir.patch | 12 ------
dev-libs/popt/files/popt-1.10.4-lib64.patch | 14 -------
dev-libs/popt/files/popt-1.10.4-regression.patch | 13 ------
.../files/popt-1.10.7-scrub-lame-gettext.patch | 26 ------------
.../popt/files/popt-1.12-scrub-lame-gettext.patch | 27 -------------
.../popt/files/popt-1.13-no-acfunc-iconv.patch | 24 -----------
dev-libs/popt/files/popt-1.13-no-wchar-hack.patch | 17 --------
dev-libs/popt/files/popt-1.14-interix.patch | 19 ---------
dev-libs/popt/files/popt-1.15-check.patch | 21 ----------
dev-libs/popt/files/popt-1.15-interix.patch | 17 --------
dev-libs/popt/files/popt-1.15-mint.patch | 13 ------
dev-libs/popt/files/popt-1.16-glob_pattern_p.patch | 47 ----------------------
dev-libs/popt/metadata.xml | 8 ----
dev-libs/popt/popt-1.16-r2.ebuild | 41 -------------------
15 files changed, 300 deletions(-)
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
deleted file mode 100644
index 58bac3e2e6..0000000000
--- a/dev-libs/popt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST popt-1.16.tar.gz 702769 BLAKE2B
37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f
SHA512
bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
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 32e1bb3530..0000000000
--- 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/files/popt-1.10.4-lib64.patch
b/dev-libs/popt/files/popt-1.10.4-lib64.patch
deleted file mode 100644
index 3cc8ce820e..0000000000
--- a/dev-libs/popt/files/popt-1.10.4-lib64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-It doesnt matter if MARK64 gets set in the configure file as the toplevel
-makefile is the only thing that uses it ... plus we avoid re-running autotools
-
---- popt-1.10.4/Makefile.in
-+++ popt-1.10.4/Makefile.in
-@@ -35,7 +35,7 @@
-
- TESTS = testit.sh
- include_HEADERS = popt.h
--usrlibdir = $(libdir)@MARK64@
-+usrlibdir = $(libdir)
- usrlib_LTLIBRARIES = libpopt.la
- libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
- libpopt_la_LDFLAGS = -no-undefined @INTLLIBS@ $(am__append_1)
diff --git a/dev-libs/popt/files/popt-1.10.4-regression.patch
b/dev-libs/popt/files/popt-1.10.4-regression.patch
deleted file mode 100644
index 83ed0229e9..0000000000
--- a/dev-libs/popt/files/popt-1.10.4-regression.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- popt.c.bak
-+++ popt.c
-@@ -748,9 +748,7 @@
- if (origOptString == NULL) /* XXX can't happen */
- return POPT_ERROR_BADOPT;
-
-- if (con->restLeftover || *origOptString != '-' ||
-- (*origOptString == '-' && origOptString[1] == '\0'))
-- {
-+ if (con->restLeftover || *origOptString != '-') {
- if (con->flags & POPT_CONTEXT_POSIXMEHARDER)
- con->restLeftover = 1;
- if (con->flags & POPT_CONTEXT_ARG_OPTS) {
diff --git a/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch
b/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch
deleted file mode 100644
index 80c8245eb2..0000000000
--- a/dev-libs/popt/files/popt-1.10.7-scrub-lame-gettext.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-this serves no real purpose
-
---- configure
-+++ configure
-@@ -20471,21 +20471,6 @@
- fi
-
-
--if test ! -f ../rpm.c
--then
-- echo "$as_me:$LINENO: checking for GNU xgettext" >&5
--echo $ECHO_N "checking for GNU xgettext... $ECHO_C" >&6
-- xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || { { echo
"$as_me:$LINENO: error:
-- *** GNU gettext is required. The latest version
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/."; >&5
--echo "$as_me: error:
-- *** GNU gettext is required. The latest version
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/."; >&2;}
-- { (exit 1); exit 1; }; }
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--fi
--
- echo "$as_me:$LINENO: checking for setreuid" >&5
- echo $ECHO_N "checking for setreuid... $ECHO_C" >&6
- if test "${ac_cv_func_setreuid+set}" = set; then
diff --git a/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch
b/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch
deleted file mode 100644
index a247bcbf34..0000000000
--- a/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-this serves no real purpose
-
-http://bugs.gentoo.org/161988
-
---- configure
-+++ configure
-@@ -20981,20 +20981,6 @@
- fi
-
-
--if test ! -f ../rpm.c
--then
-- { echo "$as_me:$LINENO: checking for GNU xgettext" >&5
--echo $ECHO_N "checking for GNU xgettext... $ECHO_C" >&6; }
-- xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || { { echo
"$as_me:$LINENO: error:
-- *** GNU gettext is required. The latest version
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/."; >&5
--echo "$as_me: error:
-- *** GNU gettext is required. The latest version
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/."; >&2;}
-- { (exit 1); exit 1; }; }
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--fi
-
- { echo "$as_me:$LINENO: checking for setreuid" >&5
- echo $ECHO_N "checking for setreuid... $ECHO_C" >&6; }
diff --git a/dev-libs/popt/files/popt-1.13-no-acfunc-iconv.patch
b/dev-libs/popt/files/popt-1.13-no-acfunc-iconv.patch
deleted file mode 100644
index d32899c1a4..0000000000
--- a/dev-libs/popt/files/popt-1.13-no-acfunc-iconv.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru popt-1.13.orig/configure popt-1.13/configure
---- popt-1.13.orig/configure Fri Jan 18 13:33:27 2008
-+++ popt-1.13/configure Fri Jan 18 13:34:10 2008
-@@ -21220,7 +21220,7 @@
-
-
-
--for ac_func in getuid geteuid mtrace __secure_getenv setregid strerror iconv
-+for ac_func in getuid geteuid mtrace __secure_getenv setregid strerror
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
-#diff -ru popt-1.13.orig/configure.ac popt-1.13/configure.ac
-#--- popt-1.13.orig/configure.ac Fri Jan 18 13:33:27 2008
-#+++ popt-1.13/configure.ac Fri Jan 18 13:34:01 2008
-#@@ -92,7 +92,7 @@
-# AC_CHECK_FUNC(setreuid, [], [
-# AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null
;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
-# ])
-#-AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv)
-#+AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
-#
-# AM_GNU_GETTEXT([external])
-#
diff --git a/dev-libs/popt/files/popt-1.13-no-wchar-hack.patch
b/dev-libs/popt/files/popt-1.13-no-wchar-hack.patch
deleted file mode 100644
index 877cb7eaed..0000000000
--- a/dev-libs/popt/files/popt-1.13-no-wchar-hack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-popt contains a hack for wchars that is enabled by default
-but breaks the build (at least) on interix.
-
-diff -ru popt-1.13.orig/popthelp.c popt-1.13/popthelp.c
---- popt-1.13.orig/popthelp.c Fri Jan 18 13:58:02 2008
-+++ popt-1.13/popthelp.c Fri Jan 18 14:00:21 2008
-@@ -15,7 +15,9 @@
- #include <sys/ioctl.h>
- #endif
-
--#define POPT_WCHAR_HACK
-+#if !defined(__INTERIX) && !defined(__MINT__)
-+# define POPT_WCHAR_HACK
-+#endif
- #ifdef POPT_WCHAR_HACK
- #include <wchar.h> /* for mbsrtowcs */
- /*@access mbstate_t @*/
diff --git a/dev-libs/popt/files/popt-1.14-interix.patch
b/dev-libs/popt/files/popt-1.14-interix.patch
deleted file mode 100644
index d274e8915c..0000000000
--- a/dev-libs/popt/files/popt-1.14-interix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru popt-1.14.orig/popt.c popt-1.14/popt.c
---- popt-1.14.orig/popt.c 2009-08-04 16:20:49 +0200
-+++ popt-1.14/popt.c 2009-08-04 16:23:09 +0200
-@@ -1067,7 +1067,15 @@
- char *end = NULL;
-
- if (con->os->nextArg) {
-+ #ifdef __INTERIX
-+ /* interix only has strtol ... so long long not
supported here! */
-+ if(opt->arg == POPT_ARG_LONGLONG)
-+ return POPT_ERROR_BADNUMBER;
-+
-+ aNUM = strtol(con->os->nextArg, &end, 0);
-+ #else
- aNUM = strtoll(con->os->nextArg, &end, 0);
-+ #endif
- if (!(end && *end == '\0'))
- return POPT_ERROR_BADNUMBER;
- }
diff --git a/dev-libs/popt/files/popt-1.15-check.patch
b/dev-libs/popt/files/popt-1.15-check.patch
deleted file mode 100644
index 242643f264..0000000000
--- a/dev-libs/popt/files/popt-1.15-check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur popt-1.15.orig/testit.sh popt-1.15/testit.sh
---- popt-1.15.orig/testit.sh 2009-04-12 10:08:59.000000000 +0300
-+++ popt-1.15/testit.sh 2009-09-24 14:10:40.000000000 +0300
-@@ -111,7 +111,7 @@
- run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
-
- run test1 "test1 - 55" "\
--Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
-+Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
- [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
- [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG]
- [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT]
-@@ -120,7 +120,7 @@
- [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]"
--usage
-
- run test1 "test1 - 56" "\
--Usage: lt-test1 [OPTION...]
-+Usage: test1 [OPTION...]
- --arg1 First argument with a really long
- description. After all, we have to test
- argument help wrapping somehow, right?
diff --git a/dev-libs/popt/files/popt-1.15-interix.patch
b/dev-libs/popt/files/popt-1.15-interix.patch
deleted file mode 100644
index b8a048bdbc..0000000000
--- a/dev-libs/popt/files/popt-1.15-interix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- popt.c 2009-04-12 21:14:38 +0300
-+++ popt.c 2009-09-29 17:51:19 +0300
-@@ -958,7 +958,14 @@ static int poptSaveArg(poptContext con,
- unsigned int argInfo = poptArgInfo(con, opt);
-
- if (con->os->nextArg) {
-+#ifdef __INTERIX
-+/* interix only has strtol ... so long long not supported here! */
-+ if(opt->arg == POPT_ARG_LONGLONG)
-+ return POPT_ERROR_BADNUMBER;
-+ aNUM = strtol(con->os->nextArg, &end, 0);
-+#else
- aNUM = strtoll(con->os->nextArg, &end, 0);
-+#endif
- if (!(end && *end == '\0'))
- return POPT_ERROR_BADNUMBER;
- }
diff --git a/dev-libs/popt/files/popt-1.15-mint.patch
b/dev-libs/popt/files/popt-1.15-mint.patch
deleted file mode 100644
index cff88a84e5..0000000000
--- a/dev-libs/popt/files/popt-1.15-mint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=287343
-
---- poptconfig.c.old 2009-10-01 11:00:18.000000000 +0000
-+++ poptconfig.c 2009-10-01 11:00:52.000000000 +0000
-@@ -42,7 +42,7 @@
- /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
- #endif /* __LCLINT__ */
-
--#if !defined(__GLIBC__)
-+#if !defined(__GLIBC__) && !defined(__MINTLIB__)
- /* Return nonzero if PATTERN contains any metacharacters.
- Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
- static int
diff --git a/dev-libs/popt/files/popt-1.16-glob_pattern_p.patch
b/dev-libs/popt/files/popt-1.16-glob_pattern_p.patch
deleted file mode 100644
index 7fc3e2f6c2..0000000000
--- a/dev-libs/popt/files/popt-1.16-glob_pattern_p.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://rpm5.org/cvs/tktview?tn=93
-
---- configure.ac
-+++ configure.ac
-#@@ -82,7 +82,7 @@
- AC_CHECK_FUNC(setreuid, [], [
- AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null
;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
- ])
--AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy
strerror vasprintf srandom)
-+AC_CHECK_FUNCS(getuid geteuid glob_pattern_p iconv mtrace __secure_getenv
setregid stpcpy strerror vasprintf srandom)
-
- AM_GNU_GETTEXT([external])
- AM_ICONV_LINK
---- config.h.in
-+++ config.h.in
-@@ -34,6 +34,9 @@
- /* Define to 1 if you have the `getuid' function. */
- #undef HAVE_GETUID
-
-+/* Define to 1 if you have the `glob_pattern_p' function. */
-+#undef HAVE_GLOB_PATTERN_P
-+
- /* Define to 1 if you have the <glob.h> header file. */
- #undef HAVE_GLOB_H
-
---- configure
-+++ configure
-@@ -13505,7 +13505,7 @@
-
-
-
--for ac_func in getuid geteuid iconv mtrace __secure_getenv setregid stpcpy
strerror vasprintf srandom
-+for ac_func in getuid geteuid glob_pattern_p iconv mtrace __secure_getenv
setregid stpcpy strerror vasprintf srandom
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
---- poptconfig.c
-+++ poptconfig.c
-@@ -42,7 +42,7 @@
- /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
- #endif /* __LCLINT__ */
-
--#if !defined(__GLIBC__)
-+#if !defined(HAVE_GLOB_PATTERN_P)
- /* Return nonzero if PATTERN contains any metacharacters.
- Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
- static int
diff --git a/dev-libs/popt/metadata.xml b/dev-libs/popt/metadata.xml
deleted file mode 100644
index 3e60a9a347..0000000000
--- a/dev-libs/popt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Base System</name>
- </maintainer>
-</pkgmetadata>
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 f35ad620a7..0000000000
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib-minimal libtool
-
-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="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- virtual/libiconv"
-DEPEND="nls? ( sys-devel/gettext )
- virtual/libiconv"
-
-src_prepare() {
- epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558
- sed -i -e 's:lt-test1:test1:' testit.sh || die
-
- epatch "${FILESDIR}"/${PN}-1.16-glob_pattern_p.patch # for MiNT and
Cygwin
- epatch "${FILESDIR}"/${PN}-1.13-no-wchar-hack.patch # for Interix and
MiNT
- elibtoolize # for FreeMiNT
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-dependency-tracking \
- $(use_enable static-libs static) \
- $(use_enable nls)
-}
-
-multilib_src_install_all() {
- dodoc CHANGES README
- prune_libtool_files --all
-}
