[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/, dev-libs/popt/files/
commit: 9bc96591382502e4c6d79de227c0028718fcd667
Author: Sam James gentoo org>
AuthorDate: Tue Dec 1 12:24:09 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 1 12:28:48 2020 +
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 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..00
--- 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..00
--- 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.0 -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..00
--- 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..00
--- 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..00
--- 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 || { {
[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/
commit: 9c2df224bf4eff4c7357681ac08d46e93f89875b
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Jan 9 13:48:47 2019 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Jan 9 13:49:01 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9c2df224
dev-libs/popt: configure actually checks for (lib)iconv
Package-Manager: Portage-2.3.54-prefix, Repoman-2.3.12
Signed-off-by: Fabian Groffen gentoo.org>
dev-libs/popt/popt-1.16-r2.ebuild | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild
b/dev-libs/popt/popt-1.16-r2.ebuild
index 9b2c7503fc..f35ad620a7 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,8 +13,10 @@ 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}] )"
-DEPEND="nls? ( sys-devel/gettext )"
+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
[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/
commit: 6aed06efc7083c2fbe73cf77dfd5935e192a1c47 Author: Fabian Groffen gentoo org> AuthorDate: Sat Nov 25 20:13:51 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Nov 25 20:13:51 2017 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6aed06ef dev-libs/popt: sync with gx86 Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4 dev-libs/popt/popt-1.16-r2.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild index d92bcb8105..9b2c7503fc 100644 --- a/dev-libs/popt/popt-1.16-r2.ebuild +++ b/dev-libs/popt/popt-1.16-r2.ebuild @@ -1,10 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.16-r2.ebuild,v 1.9 2015/03/13 19:55:13 zlogene Exp $ EAPI=5 - -inherit eutils libtool multilib-minimal +inherit eutils multilib-minimal libtool DESCRIPTION="Parse Options - Command line parser" HOMEPAGE="http://rpm5.org/";
[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/
commit: 4c570c9b6e656bcbe5cf1e74184b82fc6821a430
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Nov 25 20:11:45 2017 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Nov 25 20:11:45 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4c570c9b
dev-libs/popt: remove interrevision
Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4
dev-libs/popt/popt-1.16-r02.1.ebuild | 41 ---
dev-libs/popt/popt-1.16-r1.ebuild| 42
dev-libs/popt/popt-1.16-r2.ebuild| 4 ++--
3 files changed, 2 insertions(+), 85 deletions(-)
diff --git a/dev-libs/popt/popt-1.16-r02.1.ebuild
b/dev-libs/popt/popt-1.16-r02.1.ebuild
deleted file mode 100644
index d92bcb8105..00
--- a/dev-libs/popt/popt-1.16-r02.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.16-r2.ebuild,v 1.9
2015/03/13 19:55:13 zlogene Exp $
-
-EAPI=5
-
-inherit eutils libtool multilib-minimal
-
-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}] )"
-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
-
- 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
-}
diff --git a/dev-libs/popt/popt-1.16-r1.ebuild
b/dev-libs/popt/popt-1.16-r1.ebuild
deleted file mode 100644
index 6e00071c43..00
--- a/dev-libs/popt/popt-1.16-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.16-r1.ebuild,v 1.11
2014/01/18 05:05:46 vapier Exp $
-
-EAPI=3
-
-inherit eutils 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 ~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 )"
-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
-
- epatch "${FILESDIR}"/${PN}-1.15-mint.patch
- epatch "${FILESDIR}"/${PN}-1.13-no-wchar-hack.patch # for Interix and
MiNT
- elibtoolize # for FreeMiNT
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- $(use_enable static-libs static) \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc CHANGES README || die
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild
b/dev-libs/popt/popt-1.16-r2.ebuild
index 70a92d6b50..d92bcb8105 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz";
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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}] )"
@@ -22,7 +22,7 @@ src_prepare() {
epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558
sed -i -e 's:lt-test1:test1:' testit.sh || die
- epatch "${FILESDIR}"/${PN}-1.15-mint.patch
+ 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
}
[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/files/, dev-libs/popt/
commit: f640c119b2d25a65f54f1b8a1d1293edeb590477
Author: Michael Haubenwallner ssi-schaefer
com>
AuthorDate: Mon May 2 10:55:21 2016 +
Commit: Michael Haubenwallner gentoo org>
CommitDate: Mon May 2 10:55:44 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f640c119
popt: Cygwin port, check for glob_pattern_p
dev-libs/popt/files/popt-1.16-glob_pattern_p.patch | 47 ++
dev-libs/popt/popt-1.16-r02.1.ebuild | 41 +++
2 files changed, 88 insertions(+)
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
new file mode 100644
index 000..7fc3e2f
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.16-glob_pattern_p.patch
@@ -0,0 +1,47 @@
+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 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/popt-1.16-r02.1.ebuild
b/dev-libs/popt/popt-1.16-r02.1.ebuild
new file mode 100644
index 000..0bc07be
--- /dev/null
+++ b/dev-libs/popt/popt-1.16-r02.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.16-r2.ebuild,v 1.9
2015/03/13 19:55:13 zlogene Exp $
+
+EAPI=5
+
+inherit eutils libtool multilib-minimal
+
+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-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix
~amd64-linux ~ia64-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}] )"
+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
+
+ 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
+}
