xmlto needs sys-apps/which wrt #277092

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 17 insertions, 23 deletions

diff --git a/app-text/xmlto/ChangeLog b/app-text/xmlto/ChangeLog
index 434b7ef14fe0..871239b48588 100644
--- a/app-text/xmlto/ChangeLog
+++ b/app-text/xmlto/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/xmlto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.52 2009/07/08 14:52:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.53 2009/07/08 19:48:27 ssuominen Exp $
+
+  08 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> xmlto-0.0.22.ebuild:
+  xmlto needs sys-apps/which wrt #277092
 
   08 Jul 2009; Christian Faulhammer <fauli@gentoo.org> xmlto-0.0.22.ebuild:
   stable x86, bug 276677
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 21aa06e21542..ad1e90acaa5c 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 RMD160 4b64ec2f1e3d69f352a5eb35275aca4b55a5dab8 SHA1 6cd57ff4025e087eb51fb85df03e3886afedbeab SHA256 64c1df49f92a44d4219c10b60e60bee34063fc6b99ae5f0ed1b14e11b27ea16d
 AUX xmlto-0.0.22-parallelmake.patch 690 RMD160 27f1eca6d1e55f6aae6c8e12145d0cd5ea9aee4b SHA1 deb114420982577cb504e407ccba97177eb474db SHA256 24f2bdcf3a96ef983625b7ad58cf7f78bc4943519617e6ed125066b9760fcaf5
 DIST xmlto-0.0.18.tar.bz2 91275 RMD160 4b7232ad673c6b3a0ad015d0061cf5b77165478c SHA1 abee8925a80bfefcdf1543956a804b1facff7bec SHA256 64db67e1a3b32fada20370792493c97fa9a37bc2dafc767603689036de9b344b
 DIST xmlto-0.0.22.tar.bz2 103939 RMD160 7e2bf68d114473a6ca5162c2d88eaf46ed3a5f46 SHA1 dfe5a5a80bfd814d9e048be55cf8e3d176ad2d0a SHA256 afccc4712f22e0b1773d45803187d7998319662766b10a963f5452d83c0324aa
-EBUILD xmlto-0.0.18.ebuild 1264 RMD160 7b14c4c075c3e1555661265ca6fe52bebbb01bca SHA1 9f5934a1fa686846498f604b5250f24da85e4779 SHA256 999f7d483df7bae5b6a28864418859d5e3a8908f53f01ca5dce940043159bca6
-EBUILD xmlto-0.0.22.ebuild 1435 RMD160 49564e3fdf65fe4f757dc50c118abe15ae231ce3 SHA1 3206125c856277e489c236a9d1c4174a31eecd18 SHA256 26c7f4ad9858db0bf0c848e17ee83b12a145ba34a1b5b52ec6ed0715e4b61aee
-MISC ChangeLog 6810 RMD160 0a7e9b6bb61d9e8dfed72f39335453b95e64ebc6 SHA1 3a780f1384588ff5465a50d38e5afa502404ae09 SHA256 40bd29f4c336dfcdbab560c5a051dab60470802c23f50b898d7c872165950ee7
+EBUILD xmlto-0.0.18.ebuild 1285 RMD160 cbae46862ce62ffcda7df162514772bf1a732c73 SHA1 c89f240df6feaf54c20e3fc226575568c186b3bc SHA256 d58849e50592682ba33dfb8e92ac006bacd88a4254dd22b999ce9ef85e32e069
+EBUILD xmlto-0.0.22.ebuild 1459 RMD160 5bab4f47c8ae142fb77b2f6bc9c132934fb2a750 SHA1 b7842e18ceebe82543673992fcf8f330c85c8aba SHA256 4d01ad04c66880ee0a932cd164f40f0b23bb799a8fb196663420eca1f9449034
+MISC ChangeLog 6931 RMD160 180616eb10b8ba6c957ebeaaf87a066c3b3fd053 SHA1 94c911394d860df75c878153e9cea0db2a6b6223 SHA256 5fac3c7c504f695439e8af66e450db30be21f784199cede0cfd5237a006a6c81
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpUsqEACgkQNQqtfCuFneOaxgCgilQU30RPGMf4F21mRUN2uAuU
-Z20AoIL/UXolxL7uNWwnRg+s4oAzL0Ma
-=gloL
------END PGP SIGNATURE-----
diff --git a/app-text/xmlto/xmlto-0.0.18.ebuild b/app-text/xmlto/xmlto-0.0.18.ebuild
index caa474545f31..578fcf048923 100644
--- a/app-text/xmlto/xmlto-0.0.18.ebuild
+++ b/app-text/xmlto/xmlto-0.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.18.ebuild,v 1.25 2009/05/22 12:57:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.18.ebuild,v 1.26 2009/07/08 19:48:27 ssuominen Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="app-shells/bash
+RDEPEND="app-shells/bash
 	dev-libs/libxslt
 	>=app-text/docbook-xsl-stylesheets-1.62.0-r1
 	~app-text/docbook-xml-dtd-4.2
@@ -23,6 +23,7 @@ DEPEND="app-shells/bash
 	|| (
 		|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )
 		sys-freebsd/freebsd-ubin )"
+DEPEND="${RDEPEND}"
 
 #	tetex? ( >=app-text/passivetex-1.4 )"
 # Passivetex/xmltex need some sorting out <obz@gentoo.org>
diff --git a/app-text/xmlto/xmlto-0.0.22.ebuild b/app-text/xmlto/xmlto-0.0.22.ebuild
index 854d0519fbc0..d93037e2593e 100644
--- a/app-text/xmlto/xmlto-0.0.22.ebuild
+++ b/app-text/xmlto/xmlto-0.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.22.ebuild,v 1.5 2009/07/08 14:52:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.22.ebuild,v 1.6 2009/07/08 19:48:27 ssuominen Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -14,13 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="latex"
 
-RDEPEND="app-shells/bash
+RDEPEND="userland_GNU? ( sys-apps/which )
+	app-shells/bash
 	dev-libs/libxslt
 	>=app-text/docbook-xsl-stylesheets-1.62.0-r1
 	~app-text/docbook-xml-dtd-4.2
 	|| ( sys-apps/util-linux
 		app-misc/getopt )
-	|| ( || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp
 		sys-freebsd/freebsd-ubin )
 	latex? ( >=app-text/passivetex-1.25
 		>=dev-tex/xmltex-1.9-r2 )"
@@ -28,15 +29,14 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-format_fo_passivetex_check.patch
-	epatch "${FILESDIR}"/${P}-parallelmake.patch
-
+	epatch "${FILESDIR}"/${P}-format_fo_passivetex_check.patch \
+		"${FILESDIR}"/${P}-parallelmake.patch
 	eautoreconf
 }
 
 src_configure() {
 	local myconf
-	has_version sys-apps/util-linux || myconf+=" --with-getopt=getopt-long"
+	has_version sys-apps/util-linux || myconf="--with-getopt=getopt-long"
 	econf --prefix=/usr ${myconf}
 }