Removed nls patch from 1.10.4-r1 now DEPENDing on gettext. Added 1.10.4-r2 masked for testing, nls patch updated discarding any gettext reference. Repoman cmplains against badindev from sparc-fbsd, please check fbsd deps.

(Portage version: 2.1.2_pre3-r5)

5 files changed, 105 insertions, 11 deletions

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index 29222d157a45..376089bd6bc1 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/popt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.37 2006/10/17 11:36:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.38 2006/10/21 11:45:40 sanchan Exp $
+
+*popt-1.10.4-r2 (21 Oct 2006)
+
+  21 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org>
+  files/popt-1.10.4-nls.patch, popt-1.10.4-r1.ebuild,
+  +popt-1.10.4-r2.ebuild:
+  Removed nls patch from 1.10.4-r1 now DEPENDing on gettext. Added 1.10.4-r2
+  masked for testing, nls patch updated discarding any gettext reference.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> popt-1.10.4-r1.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/dev-libs/popt/files/digest-popt-1.10.4-r2 b/dev-libs/popt/files/digest-popt-1.10.4-r2
new file mode 100644
index 000000000000..7e169cde2429
--- /dev/null
+++ b/dev-libs/popt/files/digest-popt-1.10.4-r2
@@ -0,0 +1,3 @@
+MD5 dd22a6873b43d00f75e1c1b7dcfd1ff7 popt-1.10.4.tar.gz 1169462
+RMD160 c59c383f5e9f53b2fc17294bb2568cc46f204784 popt-1.10.4.tar.gz 1169462
+SHA256 1ce47451c9ac9d81f42b2b7fcb11c2f211b4943e3e5d7d946da53ced7fb04114 popt-1.10.4.tar.gz 1169462
diff --git a/dev-libs/popt/files/popt-1.10.4-nls.patch b/dev-libs/popt/files/popt-1.10.4-nls.patch
index a1f59d3b63d4..7550add87b13 100644
--- a/dev-libs/popt/files/popt-1.10.4-nls.patch
+++ b/dev-libs/popt/files/popt-1.10.4-nls.patch
@@ -1,11 +1,57 @@
---- popt-1.10.4.orig/configure.ac	2006-10-09 20:27:18.326914000 +0200
-+++ popt-1.10.4/configure.ac	2006-10-09 20:28:14.826914000 +0200
-@@ -101,7 +101,7 @@
+diff -ur popt-1.10.4.orig/configure.ac popt-1.10.4.my/configure.ac
+--- popt-1.10.4.orig/configure.ac	2006-10-21 13:14:32.000000000 +0200
++++ popt-1.10.4.my/configure.ac	2006-10-21 13:13:24.000000000 +0200
+@@ -92,14 +92,6 @@
                [ : ] )
  AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
  
 -if test ! -f ../rpm.c
-+if /bin/false
- then
-   AC_MSG_CHECKING(for GNU xgettext)
-   xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
+-then
+-  AC_MSG_CHECKING(for GNU xgettext)
+-  xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
+-  *** GNU gettext is required. The latest version
+-  *** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
+-  AC_MSG_RESULT(yes)
+-fi
+ 
+ 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])
+@@ -107,11 +99,9 @@
+ AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
+ 
+ 
+-AM_GNU_GETTEXT
+-
+ POPT_SOURCE_PATH="`pwd`"
+ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
+ 	[Full path to popt top_srcdir.])
+ AC_SUBST(POPT_SOURCE_PATH)
+ 
+-AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
++AC_OUTPUT([Doxyfile Makefile])
+diff -ur popt-1.10.4.orig/Makefile.am popt-1.10.4.my/Makefile.am
+--- popt-1.10.4.orig/Makefile.am	2006-10-21 13:14:32.000000000 +0200
++++ popt-1.10.4.my/Makefile.am	2006-10-21 13:10:09.000000000 +0200
+@@ -9,8 +9,6 @@
+ 	po/*.in po/*.po po/popt.pot \
+ 	popt.ps
+ 
+-SUBDIRS = intl po
+-
+ INCLUDES = -I. -I$(top_srcdir)
+ 
+ noinst_HEADERS = findme.h poptint.h system.h
+@@ -39,10 +37,11 @@
+ usrlib_LTLIBRARIES = libpopt.la
+ 
+ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+-libpopt_la_LDFLAGS = -no-undefined @INTLLIBS@
+ 
+ if HAVE_LD_VERSION_SCRIPT
+-libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
++libpopt_la_LDFLAGS = -no-undefined -Wl,--version-script=$(srcdir)/libpopt.vers
++else
++libpopt_la_LDFLAGS = -no-undefined 
+ endif
+ 
+ man_MANS = popt.3
diff --git a/dev-libs/popt/popt-1.10.4-r1.ebuild b/dev-libs/popt/popt-1.10.4-r1.ebuild
index c99f94547e85..83770bd0c83c 100644
--- a/dev-libs/popt/popt-1.10.4-r1.ebuild
+++ b/dev-libs/popt/popt-1.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.4-r1.ebuild,v 1.10 2006/10/17 11:36:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.4-r1.ebuild,v 1.11 2006/10/21 11:45:40 sanchan Exp $
 
 inherit flag-o-matic autotools
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc-macos ~ppc64 ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
-DEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-devel/gettext"
 
 #test fail. I can't figure out why.
 RESTRICT=test
@@ -23,7 +23,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-lib64.patch
-	use nls || epatch "${FILESDIR}"/${P}-nls.patch
 	eautoreconf
 }
 
diff --git a/dev-libs/popt/popt-1.10.4-r2.ebuild b/dev-libs/popt/popt-1.10.4-r2.ebuild
new file mode 100644
index 000000000000..6e3dd048a158
--- /dev/null
+++ b/dev-libs/popt/popt-1.10.4-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.4-r2.ebuild,v 1.1 2006/10/21 11:45:40 sanchan Exp $
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="Parse Options - Command line parser"
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="ftp://jbj.org/pub/rpm-4.4.x/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc-macos ~ppc64 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+#test fail. I can't figure out why.
+RESTRICT=test
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-lib64.patch
+	use nls || epatch "${FILESDIR}"/${P}-nls.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable nls) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc CHANGES README
+}