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.

Package-Manager: portage-2.1.2_pre3-r5

6 files changed, 134 insertions, 23 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/Manifest b/dev-libs/popt/Manifest
index d14633a95a6b..f396997a672c 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX popt-1.10.4-lib64.patch 930 RMD160 f164ac8b27609475114c1c123bce87ea3d94653c SHA1 9988e3d97767d2f6c0fa3cb5b43f9710097aaf5f SHA256 275670fd8084ec383382c9c01f87a755b3fdeec7d594b435e88dd36754980a5c
 MD5 8a936081f98e277545a42196582f0674 files/popt-1.10.4-lib64.patch 930
 RMD160 f164ac8b27609475114c1c123bce87ea3d94653c files/popt-1.10.4-lib64.patch 930
 SHA256 275670fd8084ec383382c9c01f87a755b3fdeec7d594b435e88dd36754980a5c files/popt-1.10.4-lib64.patch 930
-AUX popt-1.10.4-nls.patch 423 RMD160 e66ce45eba6dc0d6e3650bbbd31adaba8b5a85a7 SHA1 5e3c674a5b9e17d72264e0fcc73c4e59f8077765 SHA256 113c5c2e80be9833efb406c0ef2ff5e450eb4404f80461c1a8ad61e1796ebbab
-MD5 6e66bd4229d24d3f5f8d4eddc561cc10 files/popt-1.10.4-nls.patch 423
-RMD160 e66ce45eba6dc0d6e3650bbbd31adaba8b5a85a7 files/popt-1.10.4-nls.patch 423
-SHA256 113c5c2e80be9833efb406c0ef2ff5e450eb4404f80461c1a8ad61e1796ebbab files/popt-1.10.4-nls.patch 423
+AUX popt-1.10.4-nls.patch 1922 RMD160 c4cc1523a9f2618b5655b2625ffffb828525ba94 SHA1 a9936ba32a344ade12d13349ada4bf61546b60e5 SHA256 ea35416a55ef6a55ab5e79955d96a07b6bf49f29f21c7df47fe8308fba8e9de1
+MD5 0f7b3549b18a6a95717cb7cd65d1fef3 files/popt-1.10.4-nls.patch 1922
+RMD160 c4cc1523a9f2618b5655b2625ffffb828525ba94 files/popt-1.10.4-nls.patch 1922
+SHA256 ea35416a55ef6a55ab5e79955d96a07b6bf49f29f21c7df47fe8308fba8e9de1 files/popt-1.10.4-nls.patch 1922
 AUX popt-1.7-missing-tests.patch 552 RMD160 9e13b505de24b95e03f3b9fb930f01e0c76dad1a SHA1 cc82b360c466a1a19a81cfba09c3f91b88454fbd SHA256 50ab39942289a1ba728d025fab609556315669f6dc2a47161fcaf0c65c0e83d9
 MD5 65e91b3cbc5d3c136d141bae0629fc6a files/popt-1.7-missing-tests.patch 552
 RMD160 9e13b505de24b95e03f3b9fb930f01e0c76dad1a files/popt-1.7-missing-tests.patch 552
@@ -16,18 +19,22 @@ RMD160 0236a24dba80d233f330b304cec659479f525629 files/popt-1.7-nls.patch 374
 SHA256 1fa382ad289cbcd03fb345e7dc09a53b44486cb504aaf764c854dd618e8e6839 files/popt-1.7-nls.patch 374
 DIST popt-1.10.4.tar.gz 1169462 RMD160 c59c383f5e9f53b2fc17294bb2568cc46f204784 SHA1 10e6649c4c37ecfb6fb4296aeca609b5fdd5e34d SHA256 1ce47451c9ac9d81f42b2b7fcb11c2f211b4943e3e5d7d946da53ced7fb04114
 DIST popt-1.7.tar.gz 574549 RMD160 2942c28d82607501d5ae595063da27599b5b93da SHA1 66f3c77b87a160951b180447f4a6dce68ad2f71b SHA256 4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1
-EBUILD popt-1.10.4-r1.ebuild 918 RMD160 24fb8bca2b80b94c4f77218a324290bbc747c186 SHA1 ef00d11e55275161fea9366fd0f343424fb00662 SHA256 c517b5d748bb0f1a603af81810793ddb980fcac498c06e2f78e4082b9268b1cd
-MD5 30bc22213f9f55ecba6275598174eeda popt-1.10.4-r1.ebuild 918
-RMD160 24fb8bca2b80b94c4f77218a324290bbc747c186 popt-1.10.4-r1.ebuild 918
-SHA256 c517b5d748bb0f1a603af81810793ddb980fcac498c06e2f78e4082b9268b1cd popt-1.10.4-r1.ebuild 918
+EBUILD popt-1.10.4-r1.ebuild 860 RMD160 fbc64e7fe5b906053c8f83f46cfd6e6c14c1db03 SHA1 81f208c979b43af171ff21c03b79a6ecc99c5e96 SHA256 7b62a1e90de970a3d52f2dae775db0b70670d8a42ed8eba6af9746775ba083fc
+MD5 825fe3dc0ad9b9ca33e214b748509f57 popt-1.10.4-r1.ebuild 860
+RMD160 fbc64e7fe5b906053c8f83f46cfd6e6c14c1db03 popt-1.10.4-r1.ebuild 860
+SHA256 7b62a1e90de970a3d52f2dae775db0b70670d8a42ed8eba6af9746775ba083fc popt-1.10.4-r1.ebuild 860
+EBUILD popt-1.10.4-r2.ebuild 916 RMD160 4dcdc0e0642fe0e0793ac67bfdc5e93092043a15 SHA1 e497c22385e192575672dea58bee3e56f80e9d8d SHA256 8652f1c64183b2f05f9ee984f2a6ac72120786d06df85b2314a849cf67e7a930
+MD5 e740e996d64210b2c5f07ef520aabcbc popt-1.10.4-r2.ebuild 916
+RMD160 4dcdc0e0642fe0e0793ac67bfdc5e93092043a15 popt-1.10.4-r2.ebuild 916
+SHA256 8652f1c64183b2f05f9ee984f2a6ac72120786d06df85b2314a849cf67e7a930 popt-1.10.4-r2.ebuild 916
 EBUILD popt-1.7-r1.ebuild 1032 RMD160 eb62701b3bb2bf276355fa1a8f7652172e27162f SHA1 af3b0da1637d986e2156c1ff2e6d5af3d059899c SHA256 3d753a65d735ef2cbee9109606ea046567bcdd8b90ee1bd24a22d2be07506d65
 MD5 dedd3cb67ab8f57acbf9f1dafd78ee93 popt-1.7-r1.ebuild 1032
 RMD160 eb62701b3bb2bf276355fa1a8f7652172e27162f popt-1.7-r1.ebuild 1032
 SHA256 3d753a65d735ef2cbee9109606ea046567bcdd8b90ee1bd24a22d2be07506d65 popt-1.7-r1.ebuild 1032
-MISC ChangeLog 5216 RMD160 93f17fae96414da8dbfb3faf7890ca8e6fdea18b SHA1 6bebd705b65e21979ed3bb36ffb9a4905c92109b SHA256 3b89f465608a4c30a55139b9a544ece7b85655b44175595aa297e36e24c089eb
-MD5 e67873f10b9a097845c1444591bd79e0 ChangeLog 5216
-RMD160 93f17fae96414da8dbfb3faf7890ca8e6fdea18b ChangeLog 5216
-SHA256 3b89f465608a4c30a55139b9a544ece7b85655b44175595aa297e36e24c089eb ChangeLog 5216
+MISC ChangeLog 5531 RMD160 2ef4b4490db12037528d684e6b0356c205752c9f SHA1 479f1d3e7099f41606c4f1ff122f4cee0a153160 SHA256 1d3d29f503f156786347d2cb5bacee6739b2e7238f58149668928d439382d0f2
+MD5 ee1362be1d7347708900a4c86f6d7b62 ChangeLog 5531
+RMD160 2ef4b4490db12037528d684e6b0356c205752c9f ChangeLog 5531
+SHA256 1d3d29f503f156786347d2cb5bacee6739b2e7238f58149668928d439382d0f2 ChangeLog 5531
 MISC metadata.xml 201 RMD160 84f5c130041f4ed38aa2d689e6c5faa4048e4124 SHA1 fc8b97ba1f227aef406eee81975083451a66704b SHA256 07c89cd922e9d70aed17db9b28f90676f57137cfadc39f18b082634557b89de6
 MD5 a55db6e9a92a8c7dacc74eee4e08d5dc metadata.xml 201
 RMD160 84f5c130041f4ed38aa2d689e6c5faa4048e4124 metadata.xml 201
@@ -35,6 +42,16 @@ SHA256 07c89cd922e9d70aed17db9b28f90676f57137cfadc39f18b082634557b89de6 metadata
 MD5 d7e804dbbef8fda403d02783f850e194 files/digest-popt-1.10.4-r1 238
 RMD160 6aa1853854f4ac00c49321b24d115c899f7ca590 files/digest-popt-1.10.4-r1 238
 SHA256 7105ccdb425cc4574413c5068a97947bd1fdb6127a19809dfe56ad190f0a5d61 files/digest-popt-1.10.4-r1 238
+MD5 d7e804dbbef8fda403d02783f850e194 files/digest-popt-1.10.4-r2 238
+RMD160 6aa1853854f4ac00c49321b24d115c899f7ca590 files/digest-popt-1.10.4-r2 238
+SHA256 7105ccdb425cc4574413c5068a97947bd1fdb6127a19809dfe56ad190f0a5d61 files/digest-popt-1.10.4-r2 238
 MD5 c4150da38b9b4dfabecb9734ccc6a538 files/digest-popt-1.7-r1 226
 RMD160 8d8f96da5bebaa712af0f571e912024d5e4c3c84 files/digest-popt-1.7-r1 226
 SHA256 ca02fb4b04a3255cf323e653dc5f48866f12ecd3f72c1fe40b1cbf8b52d2e62b files/digest-popt-1.7-r1 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOgeawmS/YhfgUiURAq/NAJ99GgNGjp0ZTXE/X3cgRJsTHcGf7ACeN+/a
+uvSYWomeTI9YXmz+0Ef/3bo=
+=hufk
+-----END PGP SIGNATURE-----
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
+}