diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-08 19:48:27 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-08 19:48:27 +0000 |
commit | 68866ee8b15cc00752ba7ce1f903838f1575ee8f (patch) | |
tree | 89f55645d8d1fd7d8ae1f3a6288085c00e372f64 /app-text/xmlto | |
parent | Version bumped. (diff) | |
download | gentoo-2-68866ee8b15cc00752ba7ce1f903838f1575ee8f.tar.gz gentoo-2-68866ee8b15cc00752ba7ce1f903838f1575ee8f.tar.bz2 gentoo-2-68866ee8b15cc00752ba7ce1f903838f1575ee8f.zip |
xmlto needs sys-apps/which wrt #277092
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-text/xmlto')
-rw-r--r-- | app-text/xmlto/ChangeLog | 5 | ||||
-rw-r--r-- | app-text/xmlto/xmlto-0.0.18.ebuild | 5 | ||||
-rw-r--r-- | app-text/xmlto/xmlto-0.0.22.ebuild | 14 |
3 files changed, 14 insertions, 10 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/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} } |