Add a patch by Ryan Hill to remove incomplete tests #71610.

Package-Manager: portage-2.0.51.21-r1

4 files changed, 32 insertions, 7 deletions

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index fa3073c9944a..01cd82f71b0e 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/popt
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.20 2004/07/26 23:57:19 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.21 2005/05/10 22:50:15 vapier Exp $
+
+  10 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/popt-1.7-missing-tests.patch, popt-1.7-r1.ebuild:
+  Add a patch by Ryan Hill to remove incomplete tests #71610.
 
   26 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> popt-1.7-r1.ebuild:
   update source in src_unpack; use emake; tidy
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 22664683ca19..cb0a5dcd9d48 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,3 +1,4 @@
-MD5 c22a215cd22ae448ef9af6f546ab1ccb ChangeLog 2381
-MD5 8ca89f745ce6a95f793de6d64208f409 popt-1.7-r1.ebuild 828
+MD5 17ae50d624ce3495165629aa1c12e9dd ChangeLog 2550
+MD5 80397a9b5d8c3313bcbdbe99342f779a popt-1.7-r1.ebuild 912
 MD5 0933441e77d0a43c85e3d1471bbc2633 files/digest-popt-1.7-r1 60
+MD5 65e91b3cbc5d3c136d141bae0629fc6a files/popt-1.7-missing-tests.patch 552
diff --git a/dev-libs/popt/files/popt-1.7-missing-tests.patch b/dev-libs/popt/files/popt-1.7-missing-tests.patch
new file mode 100644
index 000000000000..e5d10e02ecff
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.7-missing-tests.patch
@@ -0,0 +1,18 @@
+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/popt-1.7-r1.ebuild b/dev-libs/popt/popt-1.7-r1.ebuild
index 22aa8fd8472a..f47ae7d81f2e 100644
--- a/dev-libs/popt/popt-1.7-r1.ebuild
+++ b/dev-libs/popt/popt-1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.20 2005/04/24 05:44:22 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.21 2005/05/10 22:50:15 vapier Exp $
 
 inherit libtool eutils flag-o-matic
 
@@ -10,15 +10,17 @@ 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 mips ppc ppc64 ppc-macos s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ppc-macos s390 sh sparc x86"
 IUSE="nls"
 
+RDEPEND=""
 DEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	elibtoolize
+	epatch "${FILESDIR}"/${P}-missing-tests.patch
 	use nls || touch ../rpm.c
 }
 
@@ -29,6 +31,6 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	make install DESTDIR="${D}" || die
 	dodoc CHANGES README
 }