Add alternative dependency on app-misc/getopt for non-Linux platforms. Add ~x86-fbsd keyword.

Package-Manager: portage-2.1_rc2-r2

4 files changed, 48 insertions, 20 deletions

diff --git a/app-text/xmlto/ChangeLog b/app-text/xmlto/ChangeLog
index 7af0ca02de74..ef76d46e1dcb 100644
--- a/app-text/xmlto/ChangeLog
+++ b/app-text/xmlto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xmlto
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.37 2006/03/16 12:59:54 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/ChangeLog,v 1.38 2006/05/24 17:41:47 flameeyes Exp $
+
+  24 May 2006; Diego Pettenò <flameeyes@gentoo.org> xmlto-0.0.18.ebuild:
+  Add alternative dependency on app-misc/getopt for non-Linux platforms. Add
+  ~x86-fbsd keyword.
 
   16 Mar 2006; Martin Ehmsen <ehmsen@gentoo.org> xmlto-0.0.17.ebuild,
   xmlto-0.0.18.ebuild:
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 583dd3f50b29..34ec28305345 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,21 +1,38 @@
-MD5 e637b918ce6e70d975cdc480649893a1 ChangeLog 4746
-RMD160 02e2791fa29745ef4b3e1c9c649f5da289c2d84b ChangeLog 4746
-SHA256 1c78f6929d31bd0a2ae5e897d4cfa52cc6b5523cc61a89cf7379bb47a47381af ChangeLog 4746
-MD5 6dcff74be4bd4d52a3ed910aabaa6f63 files/digest-xmlto-0.0.17 64
-RMD160 87186528605140cc455cba12a6f9abe415b32383 files/digest-xmlto-0.0.17 64
-SHA256 ed2101cf70297908c7d7f4460af463c5e847c4165a4aacb80ca40c95f3f5f56c files/digest-xmlto-0.0.17 64
-MD5 cd347c7e58518ba9106284281d3b5aa0 files/digest-xmlto-0.0.18 64
-RMD160 d3e039891e815df8f6cee509e32a73237e4e9e08 files/digest-xmlto-0.0.18 64
-SHA256 8bd0d772df270d4fbbd18c7e571b76b36db7ff37927622085e9003bf7e3649e1 files/digest-xmlto-0.0.18 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xmlto-head-fix.patch 620 RMD160 5494f8899ac46628484db7d42663889144d2c890 SHA1 d8de632c5aa748c2e986607bb824fb9490bdc0c2 SHA256 de9df02ae3f0418c59bc80e50dc4de774ba16c20882d244edf9d7d36a13a8f9d
 MD5 f93a45750c50ece36b816d374dde7e28 files/xmlto-head-fix.patch 620
 RMD160 5494f8899ac46628484db7d42663889144d2c890 files/xmlto-head-fix.patch 620
 SHA256 de9df02ae3f0418c59bc80e50dc4de774ba16c20882d244edf9d7d36a13a8f9d files/xmlto-head-fix.patch 620
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
-SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+DIST xmlto-0.0.17.tar.bz2 89434
+DIST xmlto-0.0.18.tar.bz2 91275 RMD160 4b7232ad673c6b3a0ad015d0061cf5b77165478c SHA1 abee8925a80bfefcdf1543956a804b1facff7bec SHA256 64db67e1a3b32fada20370792493c97fa9a37bc2dafc767603689036de9b344b
+EBUILD xmlto-0.0.17.ebuild 1077 RMD160 ef94f61b37cac7e0447cd66efe58f56732b945b9 SHA1 643b25a1b628961d59f049fa24753c5bde22706d SHA256 111bc89021466c9632aed7936bc5c14644173fb06d87c50f295e11dce2d4e2d6
 MD5 556c641c5fc306f73c0b768129ecd6de xmlto-0.0.17.ebuild 1077
 RMD160 ef94f61b37cac7e0447cd66efe58f56732b945b9 xmlto-0.0.17.ebuild 1077
 SHA256 111bc89021466c9632aed7936bc5c14644173fb06d87c50f295e11dce2d4e2d6 xmlto-0.0.17.ebuild 1077
-MD5 9ffbb9fc2da843119584a262b3e2116f xmlto-0.0.18.ebuild 1009
-RMD160 8c514494cca7102a1a4bda00d0317302cf6a2bc4 xmlto-0.0.18.ebuild 1009
-SHA256 ad6a4a58a23390093714a10ed4334a5f58d131ab10ee6e1de1c4fb1528b79620 xmlto-0.0.18.ebuild 1009
+EBUILD xmlto-0.0.18.ebuild 1156 RMD160 21a66735191a00be172c999b82848ed8223c3528 SHA1 74943bd6de7f81def5a19b097cc23ef0c741173e SHA256 85ce1ad8e201e91a297000c197ffa3f6a6c0e4f4835e5fb6b9bedc842f809133
+MD5 68fa717575373f6be8d993dc67b0f33e xmlto-0.0.18.ebuild 1156
+RMD160 21a66735191a00be172c999b82848ed8223c3528 xmlto-0.0.18.ebuild 1156
+SHA256 85ce1ad8e201e91a297000c197ffa3f6a6c0e4f4835e5fb6b9bedc842f809133 xmlto-0.0.18.ebuild 1156
+MISC ChangeLog 4922 RMD160 8dc72ac14ec323c0104f1cc63db51cee657ae6f0 SHA1 5f3353e90a239dd92468877fb122b51c3cbc3242 SHA256 6567242db651af1ee37c8cafa0094a6024a29da871260fc0e8e190ee48967eb6
+MD5 2efc6fb026b3f1c5943142b5b82b07a1 ChangeLog 4922
+RMD160 8dc72ac14ec323c0104f1cc63db51cee657ae6f0 ChangeLog 4922
+SHA256 6567242db651af1ee37c8cafa0094a6024a29da871260fc0e8e190ee48967eb6 ChangeLog 4922
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+MD5 6dcff74be4bd4d52a3ed910aabaa6f63 files/digest-xmlto-0.0.17 64
+RMD160 87186528605140cc455cba12a6f9abe415b32383 files/digest-xmlto-0.0.17 64
+SHA256 ed2101cf70297908c7d7f4460af463c5e847c4165a4aacb80ca40c95f3f5f56c files/digest-xmlto-0.0.17 64
+MD5 ad4abbb38e03449e1e60bfaba9436863 files/digest-xmlto-0.0.18 238
+RMD160 c48db12d19ccd73068d3b9c0de08140713506573 files/digest-xmlto-0.0.18 238
+SHA256 6ea102a1baad62b545d78afa017120ccfa207bfd14cad7c5cd6df2160f95f7b7 files/digest-xmlto-0.0.18 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEdJrjAiZjviIA2XgRApDMAJ0XzsG7Hhi5riPTxZi2z/VGlj4ucACggZzG
+OUelyXlDAEXe30jzm8yUa6k=
+=jNzW
+-----END PGP SIGNATURE-----
diff --git a/app-text/xmlto/files/digest-xmlto-0.0.18 b/app-text/xmlto/files/digest-xmlto-0.0.18
index 0df382fad7f5..50e67b2f3f9d 100644
--- a/app-text/xmlto/files/digest-xmlto-0.0.18
+++ b/app-text/xmlto/files/digest-xmlto-0.0.18
@@ -1 +1,3 @@
 MD5 1a06471b70eb27a6aca5d1b3a144f9b0 xmlto-0.0.18.tar.bz2 91275
+RMD160 4b7232ad673c6b3a0ad015d0061cf5b77165478c xmlto-0.0.18.tar.bz2 91275
+SHA256 64db67e1a3b32fada20370792493c97fa9a37bc2dafc767603689036de9b344b xmlto-0.0.18.tar.bz2 91275
diff --git a/app-text/xmlto/xmlto-0.0.18.ebuild b/app-text/xmlto/xmlto-0.0.18.ebuild
index 9bb23a6dd8ab..222072eadf57 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-2006 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.16 2006/03/16 12:59:54 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.18.ebuild,v 1.17 2006/05/24 17:41:47 flameeyes Exp $
 
 inherit eutils
 
@@ -10,20 +10,25 @@ SRC_URI="http://cyberelk.net/tim/data/xmlto/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="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"
+	|| ( sys-apps/util-linux app-misc/getopt )"
 
 #	tetex? ( >=app-text/passivetex-1.4 )"
 # Passivetex/xmltex need some sorting out <obz@gentoo.org>
 
 src_compile() {
-	econf || die
+	local myconf
+
+	has_version sys-apps/util-linux \
+		|| myconf="${myconf} --with-getopt=getopt-long"
+
+	econf ${myconf} || die
 	emake -j1 || die
 }