old

Package-Manager: portage-2.1.4_rc4

9 files changed, 10 insertions, 209 deletions

diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 1504f36f0850..e3491d80d578 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -5,10 +5,6 @@ AUX popt-1.10.4-lib64.patch 499 RMD160 750431554c2c4f54216883701c85c05f355655f6
 MD5 24fe544142df626647ddc6a0623db858 files/popt-1.10.4-lib64.patch 499
 RMD160 750431554c2c4f54216883701c85c05f355655f6 files/popt-1.10.4-lib64.patch 499
 SHA256 df437ce0d85a42a1bc57710e7c8114d0495f113079f3b0f78bf2e8a9f1fd313d files/popt-1.10.4-lib64.patch 499
-AUX popt-1.10.4-nls.patch 1646 RMD160 44520dae22f7059e3533ebafe8e01dcf417c0f53 SHA1 4c8897540b2964653659726aaf9ad09959736e11 SHA256 8b8a095775314d5e90bf38963c783a94adf2235b32cd5fa9fe38400964d5ce19
-MD5 86c3bf505638988a2fb223d39351228c files/popt-1.10.4-nls.patch 1646
-RMD160 44520dae22f7059e3533ebafe8e01dcf417c0f53 files/popt-1.10.4-nls.patch 1646
-SHA256 8b8a095775314d5e90bf38963c783a94adf2235b32cd5fa9fe38400964d5ce19 files/popt-1.10.4-nls.patch 1646
 AUX popt-1.10.4-regression.patch 432 RMD160 7d2748d5b4a0269527291a98fd15e387adcfb644 SHA1 c0da2274c3a14b803e1c0af91728d3360464fcbc SHA256 aea460ab83c99a9f3284f78857a34eeeabdc75f5a62f74b7a41e8f6696913915
 MD5 fcde5ce8c66077ba90838f9eee193b77 files/popt-1.10.4-regression.patch 432
 RMD160 7d2748d5b4a0269527291a98fd15e387adcfb644 files/popt-1.10.4-regression.patch 432
@@ -17,29 +13,11 @@ AUX popt-1.10.7-scrub-lame-gettext.patch 851 RMD160 5181528e3c593280e6d96b8d511e
 MD5 30840eadff9bfdee49a72936149a5fc3 files/popt-1.10.7-scrub-lame-gettext.patch 851
 RMD160 5181528e3c593280e6d96b8d511eefd07b052417 files/popt-1.10.7-scrub-lame-gettext.patch 851
 SHA256 1208a409b3e9586feda797b0f0cf3a682601f3a17eaa7eb4340a256f0f6a8ae5 files/popt-1.10.7-scrub-lame-gettext.patch 851
-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
-SHA256 50ab39942289a1ba728d025fab609556315669f6dc2a47161fcaf0c65c0e83d9 files/popt-1.7-missing-tests.patch 552
-AUX popt-1.7-nls.patch 374 RMD160 0236a24dba80d233f330b304cec659479f525629 SHA1 45f3e8684b99f9b9a3853abbaafbb2e2e3cb485f SHA256 1fa382ad289cbcd03fb345e7dc09a53b44486cb504aaf764c854dd618e8e6839
-MD5 935450b0eb6e446ec7fff46cfca6cfb7 files/popt-1.7-nls.patch 374
-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.10.7.tar.gz 728283 RMD160 d5342c1a5e1059f45d75a93ca7a3c997b2fef05d SHA1 c1a22bd3b50b24f64654c69a6f91142ca54ca853 SHA256 04d945f6a9fbfef248c594e2fee5c1446987ad40c31ec8cf9b5fdbcbb3d6e35c
-DIST popt-1.7.tar.gz 574549 RMD160 2942c28d82607501d5ae595063da27599b5b93da SHA1 66f3c77b87a160951b180447f4a6dce68ad2f71b SHA256 4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1
-EBUILD popt-1.10.4-r3.ebuild 969 RMD160 413dd583067547c27595d7eab33c3f7a46b08fc0 SHA1 c8de3670a64207e2c9c41458f0482602e51c12b8 SHA256 0d69d927fcaaac6689107d1b63b7fd3d4df1417c19eb0d59d7c861d263b82379
-MD5 f0b2cac8d61e9d2a1c9aea82f20e7065 popt-1.10.4-r3.ebuild 969
-RMD160 413dd583067547c27595d7eab33c3f7a46b08fc0 popt-1.10.4-r3.ebuild 969
-SHA256 0d69d927fcaaac6689107d1b63b7fd3d4df1417c19eb0d59d7c861d263b82379 popt-1.10.4-r3.ebuild 969
-EBUILD popt-1.10.7.ebuild 963 RMD160 20247889caf15e03f6cb9705679791df242fffd6 SHA1 3665e6d86a024ab07d7d491d7460a5b2d0895b08 SHA256 f35bab626de70ae79f26103d57d47963f23bf45aedfcf4793fd943a3492c81b9
-MD5 8b0f5dae5f0b94165ae49e2d76c6a8d5 popt-1.10.7.ebuild 963
-RMD160 20247889caf15e03f6cb9705679791df242fffd6 popt-1.10.7.ebuild 963
-SHA256 f35bab626de70ae79f26103d57d47963f23bf45aedfcf4793fd943a3492c81b9 popt-1.10.7.ebuild 963
-EBUILD popt-1.7-r1.ebuild 981 RMD160 27a1d5715bee8e326e352343437cc2a2fa9014f9 SHA1 2bca91c8d2e2d28adb450f4d63972df671525944 SHA256 6d785f5f5d8c3eac8d15b33529d142921569e96833d00efc460f947452711d32
-MD5 4920f54afc86850739bf07b583811d5b popt-1.7-r1.ebuild 981
-RMD160 27a1d5715bee8e326e352343437cc2a2fa9014f9 popt-1.7-r1.ebuild 981
-SHA256 6d785f5f5d8c3eac8d15b33529d142921569e96833d00efc460f947452711d32 popt-1.7-r1.ebuild 981
+EBUILD popt-1.10.7.ebuild 967 RMD160 2b433a002390adffd75a762169cec94c3d3dfe02 SHA1 4ad47966e8a03306b2f38d8492aac4eff7c2d80d SHA256 4c26d856cd54733ab9e9b5be0a10199d5eabfd4d3a71f6deef32a4c868195da0
+MD5 04e31d8c51dd48963d8a528193bd907c popt-1.10.7.ebuild 967
+RMD160 2b433a002390adffd75a762169cec94c3d3dfe02 popt-1.10.7.ebuild 967
+SHA256 4c26d856cd54733ab9e9b5be0a10199d5eabfd4d3a71f6deef32a4c868195da0 popt-1.10.7.ebuild 967
 MISC ChangeLog 8362 RMD160 2a7947b7fa2a4b877002368acc6f5a6d88b56a58 SHA1 ba53e061786320a3cb8897830c7790572ab2e1bc SHA256 f0b413fee452e623956a2b902b9850838e9a075f438e3f692c5e51f0b74ba2f4
 MD5 39fc193d61ac993da6f829550ee76669 ChangeLog 8362
 RMD160 2a7947b7fa2a4b877002368acc6f5a6d88b56a58 ChangeLog 8362
@@ -48,19 +26,13 @@ MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63d
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
 SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
-MD5 d7e804dbbef8fda403d02783f850e194 files/digest-popt-1.10.4-r3 238
-RMD160 6aa1853854f4ac00c49321b24d115c899f7ca590 files/digest-popt-1.10.4-r3 238
-SHA256 7105ccdb425cc4574413c5068a97947bd1fdb6127a19809dfe56ad190f0a5d61 files/digest-popt-1.10.4-r3 238
 MD5 ac19dfa3367a5653b0577b16d771d71f files/digest-popt-1.10.7 235
 RMD160 e65de4c03a0a734781ae8b6f5d045695158f5704 files/digest-popt-1.10.7 235
 SHA256 c94e27503efe4a9e26325db23ca8c77ed3e406677a6d42edbf82d234350d1342 files/digest-popt-1.10.7 235
-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 v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG0K/sp/wUKkr7RBoRAqhCAKC6g0k1Aito1ZfZVLgKBc4ZyGMEQQCdEIOP
-jyyJn6EbsF+mORos7LY3nY0=
-=/l/P
+iD8DBQFHW2fop/wUKkr7RBoRAraJAJ92tkI7cowOSPDTySc3292m3yx3vQCgwq9q
+HM3khU4L1WRwYngXsQSmCVo=
+=CCRu
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/popt/files/digest-popt-1.10.4-r3 b/dev-libs/popt/files/digest-popt-1.10.4-r3
deleted file mode 100644
index 7e169cde2429..000000000000
--- a/dev-libs/popt/files/digest-popt-1.10.4-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-popt-1.7-r1 b/dev-libs/popt/files/digest-popt-1.7-r1
deleted file mode 100644
index 034252d7fae8..000000000000
--- a/dev-libs/popt/files/digest-popt-1.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5988e7aeb0ae4dac8d83561265984cc9 popt-1.7.tar.gz 574549
-RMD160 2942c28d82607501d5ae595063da27599b5b93da popt-1.7.tar.gz 574549
-SHA256 4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1 popt-1.7.tar.gz 574549
diff --git a/dev-libs/popt/files/popt-1.10.4-nls.patch b/dev-libs/popt/files/popt-1.10.4-nls.patch
deleted file mode 100644
index 0bb2b6cd5393..000000000000
--- a/dev-libs/popt/files/popt-1.10.4-nls.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- popt-1.10.4.orig/configure.ac
-+++ popt-1.10.4.my/configure.ac
-@@ -92,14 +92,6 @@
-               [ : ] )
- AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
- 
--if test ! -f ../rpm.c
--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])
---- popt-1.10.4.orig/Makefile.am
-+++ popt-1.10.4.my/Makefile.am
-@@ -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/files/popt-1.7-missing-tests.patch b/dev-libs/popt/files/popt-1.7-missing-tests.patch
deleted file mode 100644
index e5d10e02ecff..000000000000
--- a/dev-libs/popt/files/popt-1.7-missing-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Disable tests that are incomplete.
-
-Patch by Ryan Hill.
-
-http://bugs.gentoo.org/71610
-
---- testit.sh
-+++ testit.sh
-@@ -92,9 +92,5 @@
- run test1 "test1 - 39" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
- run test1 "test1 - 40" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
- 
--run_diff test3 "test3 - 41" test3-data/01.input test3-data/01.answer
--run_diff test3 "test3 - 42" test3-data/02.input test3-data/02.answer
--run_diff test3 "test3 - 43" test3-data/03.input test3-data/03.answer
--
- echo ""
- echo "Passed."
diff --git a/dev-libs/popt/files/popt-1.7-nls.patch b/dev-libs/popt/files/popt-1.7-nls.patch
deleted file mode 100644
index cc8b3c45bb6c..000000000000
--- a/dev-libs/popt/files/popt-1.7-nls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: popt-1.7/Makefile.am
-===================================================================
---- popt-1.7.orig/Makefile.am
-+++ popt-1.7/Makefile.am
-@@ -34,6 +34,7 @@ TESTS = testit.sh
- include_HEADERS = popt.h
- lib_LTLIBRARIES = libpopt.la
- libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
-+libpopt_la_LIBADD = $(LTLIBINTL)
- 
- man_MANS = popt.3
- 
diff --git a/dev-libs/popt/popt-1.10.4-r3.ebuild b/dev-libs/popt/popt-1.10.4-r3.ebuild
deleted file mode 100644
index a209353ae92e..000000000000
--- a/dev-libs/popt/popt-1.10.4-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 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-r3.ebuild,v 1.8 2007/08/25 22:39:24 vapier Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-
-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="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-lib64.patch
-	epatch "${FILESDIR}"/${P}-regression.patch
-	use nls || epatch "${FILESDIR}"/${P}-nls.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc CHANGES README
-}
diff --git a/dev-libs/popt/popt-1.10.7.ebuild b/dev-libs/popt/popt-1.10.7.ebuild
index 7e260eaa419b..9085615e9a85 100644
--- a/dev-libs/popt/popt-1.10.7.ebuild
+++ b/dev-libs/popt/popt-1.10.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.7.ebuild,v 1.11 2007/06/11 17:47:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.7.ebuild,v 1.12 2007/12/09 03:58:26 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://jbj.org/pub/rpm-4.4.x/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-libs/popt/popt-1.7-r1.ebuild b/dev-libs/popt/popt-1.7-r1.ebuild
deleted file mode 100644
index a7b7e20710f1..000000000000
--- a/dev-libs/popt/popt-1.7-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.26 2007/01/09 19:05:52 sanchan Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.6"
-
-inherit libtool eutils flag-o-matic autotools
-
-DESCRIPTION="Parse Options - Command line parser"
-HOMEPAGE="http://www.rpm.org/"
-SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-missing-tests.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	use nls || touch ../rpm.c
-
-	eautomake
-	elibtoolize
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc CHANGES README
-}