Patched 2.5.0 with fixes suggested on bug #140321. Removed redundant src_compile().

(Portage version: 2.1.2_rc2)

4 files changed, 85 insertions, 1 deletions

diff --git a/app-portage/euses/ChangeLog b/app-portage/euses/ChangeLog
index 0126a96bf255..b296b132d62d 100644
--- a/app-portage/euses/ChangeLog
+++ b/app-portage/euses/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/euses
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/euses/ChangeLog,v 1.17 2006/11/18 05:13:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/euses/ChangeLog,v 1.18 2006/11/18 22:28:00 jer Exp $
+
+*euses-2.5.0-r1 (18 Nov 2006)
+
+  18 Nov 2006; Jeroen Roovers <jer@gentoo.org> +files/euses-2.5.0.patch,
+  +euses-2.5.0-r1.ebuild:
+  Patched 2.5.0 with fixes suggested on bug #140321. Removed redundant
+  src_compile().
 
   18 Nov 2006; Jeroen Roovers <jer@gentoo.org> -euses-2.5.0_pre1.ebuild:
   Removed ancient preview.
diff --git a/app-portage/euses/euses-2.5.0-r1.ebuild b/app-portage/euses/euses-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..b5009622635a
--- /dev/null
+++ b/app-portage/euses/euses-2.5.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/euses/euses-2.5.0-r1.ebuild,v 1.1 2006/11/18 22:28:00 jer Exp $
+
+inherit toolchain-funcs autotools
+
+DESCRIPTION="look up USE flag descriptions fast"
+HOMEPAGE="http://www.xs4all.nl/~rooversj/gentoo"
+SRC_URI="http://www.xs4all.nl/~rooversj/gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DEPEND="sys-devel/autoconf
+	sys-devel/autoconf-wrapper"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cd "${S}"
+	unpack "${A}"
+	epatch "${FILESDIR}"/${P}.patch || die "epatch failed"
+	eautoreconf
+}
+
+src_install() {
+	dobin ${PN} || die
+	doman ${PN}.1 || die
+	dodoc ChangeLog || die
+}
diff --git a/app-portage/euses/files/digest-euses-2.5.0-r1 b/app-portage/euses/files/digest-euses-2.5.0-r1
new file mode 100644
index 000000000000..7bb8d713725d
--- /dev/null
+++ b/app-portage/euses/files/digest-euses-2.5.0-r1
@@ -0,0 +1,3 @@
+MD5 33fe32c742c3481c05070f862b7c53c4 euses-2.5.0.tar.bz2 16234
+RMD160 98fce4d78761fe9df0f4a152e8fc8bb3e3d2dbe0 euses-2.5.0.tar.bz2 16234
+SHA256 1c08392d5faa689b3949a8295b3f88ad74f739e63e392363cbbd4d296b0b1d3c euses-2.5.0.tar.bz2 16234
diff --git a/app-portage/euses/files/euses-2.5.0.patch b/app-portage/euses/files/euses-2.5.0.patch
new file mode 100644
index 000000000000..55397b0bc8e1
--- /dev/null
+++ b/app-portage/euses/files/euses-2.5.0.patch
@@ -0,0 +1,42 @@
+--- euses.c	2006-11-18 05:28:40.000000000 +0100
++++ euses.c	2006-11-18 23:06:44.000000000 +0100
+@@ -124,8 +124,6 @@
+ 	}
+ }
+ 
+-#define PORTDIR_SCRIPT " -c 'source /etc/make.globals; source /etc/make.conf; echo -n $PORTDIR'"
+-
+ static char *getportdir(char *portdir)
+ {
+ 	FILE *fd;
+@@ -135,8 +133,9 @@
+ 
+ 	/* or load it from make.{globals,conf} */
+ 	if (strlen(portdir) == 0) {
+-		/* Open a pipe to bash */
+-		fd = popen(BIN_BASH PORTDIR_SCRIPT, "r");
++		/* Open a pipe to sh */
++		fd = popen("source " "/etc/make.globals;" "source "
++			"/etc/make.conf" ";" "echo -n ${PORTDIR}", "r");
+ 
+ 		/* Get the first line from the pipe */
+ 		if (fgets(portdir, (int)FILENAME_MAX, fd) == NULL)
+--- Makefile.in	2006-11-18 05:28:40.000000000 +0100
++++ Makefile.in	2006-11-18 22:44:56.000000000 +0100
+@@ -1,14 +1,13 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@ -Wall -pedantic
+-BIN_BASH = $(shell which bash)
+ 
+ all: euses
+ 
+ euses: euses.c
+ 	@echo
+ 	@echo ' = Compiling $@ ='
+-	$(CC) $(CFLAGS) $(DEFS) -DBIN_BASH="\"$(BIN_BASH)\"" $< -o $@.o -c
+-	$(CC) $(CFLAGS) $(DEFS) -DBIN_BASH="\"$(BIN_BASH)\"" $@.o -o $@
++	$(CC) $(CFLAGS) $(DEFS) $< -o $@.o -c
++	$(CC) $(CFLAGS) $(DEFS) $@.o -o $@
+ 
+ test: euses
+ 	@echo