build-docbook-catalog needs getopt wrt #277092

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

4 files changed, 19 insertions, 23 deletions

diff --git a/app-text/build-docbook-catalog/ChangeLog b/app-text/build-docbook-catalog/ChangeLog
index b505902dcf8a..2998555835ba 100644
--- a/app-text/build-docbook-catalog/ChangeLog
+++ b/app-text/build-docbook-catalog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/build-docbook-catalog
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/ChangeLog,v 1.24 2008/11/24 21:14:49 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/ChangeLog,v 1.25 2009/07/08 19:56:17 ssuominen Exp $
+
+  08 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  build-docbook-catalog-1.2.ebuild, build-docbook-catalog-1.4.ebuild:
+  build-docbook-catalog needs getopt wrt #277092
 
   24 Nov 2008; Brent Baude <ranger@gentoo.org>
   build-docbook-catalog-1.4.ebuild:
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 135e67f309a7..6365e44e73b6 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST build-docbook-catalog-1.2.bz2 3094 RMD160 195dff6781e9f9bbd2c2a2dfd874a6c43169c8ba SHA1 8a4bbf12f01faa1799218cff7e87ab26cfe38963 SHA256 cccceec14c2dc89eb03b0e3afa802105809905f3577d7e0104363f683c4dc4f6
 DIST build-docbook-catalog-1.4.bz2 3051 RMD160 5b55e774db345052aab32d9d49a44f01e16d1cbe SHA1 30e7a5e08982b485479332794f2e20b27d102e8a SHA256 ce0e9d5c988d165171ef1fde5e2de019c433af22d71db512e206356f3f0c149d
-EBUILD build-docbook-catalog-1.2.ebuild 569 RMD160 368a49e927f6ebbf07bb343e9779dc45c4ae949a SHA1 ca256117c92c90d139f399d2d87e556f592ed69f SHA256 044d3906e486d89c110dd9b0ab4cd125ba9e9309ab9f9c7e6b66047792bac542
-EBUILD build-docbook-catalog-1.4.ebuild 599 RMD160 dede61327006cc63d0f840a4eeb755567f8bb88d SHA1 49cae9ce943bb95488556318a6a509072e08dba5 SHA256 3568ffe001af050f8ac8a618ac02de5f966af762444c0196ad3e63b4096c2e93
-MISC ChangeLog 3323 RMD160 1e8f7def143545d21f456198d32a380406dcc2b8 SHA1 cfd626a3f6e3516061d242846c87f2ec449524d6 SHA256 7026a9925d48ebd6c79a6833be0ebf7dc5695ea3e5900670bb3dbbde7336a2a6
+EBUILD build-docbook-catalog-1.2.ebuild 629 RMD160 ef30954731ce9f12ee7a4e75ddb502396a209d74 SHA1 b9914eb00862b791a860ffc4c89036aab19cf6f0 SHA256 27a6fdc40b66f147c8ff08a133d7b758f09bac942137c5d32347ad44a1ebda37
+EBUILD build-docbook-catalog-1.4.ebuild 672 RMD160 58999904dd3dfadc77c9a1ac1ab13a19166ec0d0 SHA1 11f078438377635b580c358bad25ff9e045cef5e SHA256 e4db183db4b6f29652a5f3ce0f247efd727e8bec696bcf45f21b3feb906004cd
+MISC ChangeLog 3500 RMD160 481b61a8712a10fb4a0f0e9c743d66b0e2054ad4 SHA1 23eaf12d72abd71d2a777898232b2a9109cee702 SHA256 baec9ebfcbea9b2fec67333f7f7eb69b3cceab425a4b8e280b688ee3e8cb5eaa
 MISC metadata.xml 158 RMD160 0fc16223dcbd339480eed430d578705bd4494110 SHA1 03fe26d14d8f89333c04b9dc50f3045405b3e671 SHA256 a04e9a52e3c14409179292db0b287f4c54db24012b8321e0c2cf39fda4965aef
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk7t3IACgkQ67wieSYcaxfHRgCfafqAqPNWsihbAGgTV8zVpxUH
-4qkAoKLAc/J5xmgVVVf8wC7d0S1EzyBd
-=yvu8
------END PGP SIGNATURE-----
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.2.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.2.ebuild
index c22c4c481241..595cb934b4f6 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.2.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.2.ebuild,v 1.16 2007/03/01 17:21:10 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.2.ebuild,v 1.17 2009/07/08 19:56:17 ssuominen Exp $
 
 DESCRIPTION="DocBook XML catalog auto-updater"
 HOMEPAGE="http://unknown/"
@@ -11,11 +11,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
+RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 DEPEND=""
-RDEPEND=""
 
 S=${WORKDIR}
 
 src_install() {
-	newbin ${P} ${PN} || die
+	newbin ${P} ${PN} || die "newbin failed"
 }
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.4.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.4.ebuild
index 7411fa933d65..a64cd2361377 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.4.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.4.ebuild,v 1.8 2008/12/07 11:45:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.4.ebuild,v 1.9 2009/07/08 19:56:17 ssuominen Exp $
 
 DESCRIPTION="DocBook XML catalog auto-updater"
 HOMEPAGE="http://unknown/"
@@ -11,10 +11,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="!<app-text/docbook-xsl-stylesheets-1.73.1"
+RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
+	!<app-text/docbook-xsl-stylesheets-1.73.1"
+DEPEND=""
 
 S=${WORKDIR}
 
 src_install() {
-	newbin ${P} ${PN} || die
+	newbin ${P} ${PN} || die "newbin failed"
 }