* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/
@ 2017-11-25 20:14 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2017-11-25 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 6aed06efc7083c2fbe73cf77dfd5935e192a1c47
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 20:13:51 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 20:13:51 2017 +0000
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/"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/
@ 2017-11-25 20:14 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2017-11-25 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 4c570c9b6e656bcbe5cf1e74184b82fc6821a430
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 20:11:45 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 20:11:45 2017 +0000
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..0000000000
--- 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..0000000000
--- 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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/
@ 2019-01-09 13:49 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2019-01-09 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 9c2df224bf4eff4c7357681ac08d46e93f89875b
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 13:48:47 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 13:49:01 2019 +0000
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 <grobian <AT> 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-09 13:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-09 13:49 [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/popt/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2017-11-25 20:14 Fabian Groffen
2017-11-25 20:14 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox