From 78e0cf1d31d5565965e94f716bdbbdaf92ffe2a3 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 18 Nov 2006 22:28:00 +0000 Subject: [PATCH] Patched 2.5.0 with fixes suggested on bug #140321. Removed redundant src_compile(). Package-Manager: portage-2.1.2_rc2 --- app-portage/euses/ChangeLog | 9 +++- app-portage/euses/Manifest | 19 +++++++-- app-portage/euses/euses-2.5.0-r1.ebuild | 32 ++++++++++++++ app-portage/euses/files/digest-euses-2.5.0-r1 | 3 ++ app-portage/euses/files/euses-2.5.0.patch | 42 +++++++++++++++++++ 5 files changed, 100 insertions(+), 5 deletions(-) create mode 100644 app-portage/euses/euses-2.5.0-r1.ebuild create mode 100644 app-portage/euses/files/digest-euses-2.5.0-r1 create mode 100644 app-portage/euses/files/euses-2.5.0.patch 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 +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 -euses-2.5.0_pre1.ebuild: Removed ancient preview. diff --git a/app-portage/euses/Manifest b/app-portage/euses/Manifest index 18ad81eb1e80..b58e4329290e 100644 --- a/app-portage/euses/Manifest +++ b/app-portage/euses/Manifest @@ -1,17 +1,25 @@ +AUX euses-2.5.0.patch 1186 RMD160 0321fa9ff71130f133c6429ab65b721366bd8c44 SHA1 5f572994e38e804ef98d8c2efba80e1b58f55c6f SHA256 c4223db6aa4de9107bf9950ed13b5f453f5d55ba3a975a8e90bed8cf3df3cc5b +MD5 47a854d3a3d809977af94926eaf8b2f3 files/euses-2.5.0.patch 1186 +RMD160 0321fa9ff71130f133c6429ab65b721366bd8c44 files/euses-2.5.0.patch 1186 +SHA256 c4223db6aa4de9107bf9950ed13b5f453f5d55ba3a975a8e90bed8cf3df3cc5b files/euses-2.5.0.patch 1186 DIST euses-2.4.3.tar.bz2 15609 RMD160 187deba342085232e09b69cef923e26b268e09fd SHA1 42433a571071225084af0b4d58f7459b675d041e SHA256 818d003e448829f1d5c9e6f67deac92a4beec505c1a0f2ea30fd5730fc7502ac DIST euses-2.5.0.tar.bz2 16234 RMD160 98fce4d78761fe9df0f4a152e8fc8bb3e3d2dbe0 SHA1 585423fa362597d5f5d748168ba3a62a894d9bc5 SHA256 1c08392d5faa689b3949a8295b3f88ad74f739e63e392363cbbd4d296b0b1d3c EBUILD euses-2.4.3.ebuild 752 RMD160 bf935a1d0648afd650630cb77ca4c07389fef3e0 SHA1 4e3633f8782ae2c53562dc6442d545e03ee745b7 SHA256 98f4523a6a726a376244835cef13077ec5bcb0ca748793cc7c419c1f0931181a MD5 1f3249256dd8773948e51b37a66ad080 euses-2.4.3.ebuild 752 RMD160 bf935a1d0648afd650630cb77ca4c07389fef3e0 euses-2.4.3.ebuild 752 SHA256 98f4523a6a726a376244835cef13077ec5bcb0ca748793cc7c419c1f0931181a euses-2.4.3.ebuild 752 +EBUILD euses-2.5.0-r1.ebuild 747 RMD160 f7f639b01553a10789dbb9910b003ec12f532c43 SHA1 cddb10f4ce27d01bd1078a935ed005fb464c2fb3 SHA256 408df899103dd11dd883178a58bb083df2b1604c0d2843eacc8dadde8c46d113 +MD5 cd9e0d21354c5f26256027d646ea29ce euses-2.5.0-r1.ebuild 747 +RMD160 f7f639b01553a10789dbb9910b003ec12f532c43 euses-2.5.0-r1.ebuild 747 +SHA256 408df899103dd11dd883178a58bb083df2b1604c0d2843eacc8dadde8c46d113 euses-2.5.0-r1.ebuild 747 EBUILD euses-2.5.0.ebuild 691 RMD160 d2c371b1ba16c2b0539c4f2db5734304787f4fb2 SHA1 f7dab68321e8875b93305a3393e38c06255205e2 SHA256 77698722b73458365756c9deb40a17992c6c9ccdc4a655c7dc6fc96919850c46 MD5 3cb5fbc101ac9d3f8f91ff909d54ecbb euses-2.5.0.ebuild 691 RMD160 d2c371b1ba16c2b0539c4f2db5734304787f4fb2 euses-2.5.0.ebuild 691 SHA256 77698722b73458365756c9deb40a17992c6c9ccdc4a655c7dc6fc96919850c46 euses-2.5.0.ebuild 691 -MISC ChangeLog 2369 RMD160 38a364c0e2b70a3c39b801c5fc015d38bc31a431 SHA1 cec28ad87344811d2e7ddd242b3ca19bb9c7aa65 SHA256 125eeb3baf46a4154b059603b7645507868039ce746e5c3116225ea662f6db92 -MD5 58c9f2ea9b0e3b0b6c1de7442c3a1912 ChangeLog 2369 -RMD160 38a364c0e2b70a3c39b801c5fc015d38bc31a431 ChangeLog 2369 -SHA256 125eeb3baf46a4154b059603b7645507868039ce746e5c3116225ea662f6db92 ChangeLog 2369 +MISC ChangeLog 2588 RMD160 9cf4d03e187755a906c5fbaeb72a0b2c10d73b19 SHA1 b0a717931abcdd33e2564b4895f0018df1132224 SHA256 c38dba2243800892a3ee1660b775bfdb701e912742b8618f42cbff2b6d07a6a1 +MD5 e05b2535a4aeed140b8b4a9017c16772 ChangeLog 2588 +RMD160 9cf4d03e187755a906c5fbaeb72a0b2c10d73b19 ChangeLog 2588 +SHA256 c38dba2243800892a3ee1660b775bfdb701e912742b8618f42cbff2b6d07a6a1 ChangeLog 2588 MISC metadata.xml 253 RMD160 93b9db42bd6445302822c9cb8d410c39f69c2c97 SHA1 1cde90a1a0728b206feea6e542118fb029116f9c SHA256 d489d3114ed0b0d39e7a6bd731b12d4d3b2b065f280036cec547989ce2ac7e2b MD5 7b0d92203f6155ed9a9acd1e927ec119 metadata.xml 253 RMD160 93b9db42bd6445302822c9cb8d410c39f69c2c97 metadata.xml 253 @@ -22,3 +30,6 @@ SHA256 c763bfd00bee61a97be75cf9be6dc034d72458675bc6259349787facc1aad6b2 files/di MD5 fe4000cb82419e4d84b61c434a7847e7 files/digest-euses-2.5.0 235 RMD160 1fad1f7884045f5f97c9e0b7aac9fdd51063d14f files/digest-euses-2.5.0 235 SHA256 298c0ff8bff600be9e9d3234050ef1327da7679acf97ce4f97d5f29b65f8ee64 files/digest-euses-2.5.0 235 +MD5 fe4000cb82419e4d84b61c434a7847e7 files/digest-euses-2.5.0-r1 235 +RMD160 1fad1f7884045f5f97c9e0b7aac9fdd51063d14f files/digest-euses-2.5.0-r1 235 +SHA256 298c0ff8bff600be9e9d3234050ef1327da7679acf97ce4f97d5f29b65f8ee64 files/digest-euses-2.5.0-r1 235 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 -- 2.26.2