Bug #166127, fix the collision with docbook-sgml-utils, patch from Alec Warner <antar...

Package-Manager: portage-2.1.2.3

diff --git a/app-text/docbook2X/ChangeLog b/app-text/docbook2X/ChangeLog
index f2352ffc7343861f39a3e544c3cef289f720fc40..1cfb5c5a457b35fd74a6cb4027dba805757fb268 100644 (file)
--- a/app-text/docbook2X/ChangeLog
+++ b/app-text/docbook2X/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/docbook2X
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.18 2007/01/28 05:42:06 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.19 2007/04/11 08:10:00 robbat2 Exp $
+
+*docbook2X-0.8.7-r1 (11 Apr 2007)
+
+  11 Apr 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +docbook2X-0.8.7-r1.ebuild:
+  Bug #166127, fix the collision with docbook-sgml-utils, patch from Alec
+  Warner <antarus@gentoo.org>. Also re-add missing ~amd64 and ~hppa keywords
+  that were dropped.
 
   28 Jan 2007; Marius Mauch <genone@gentoo.org> docbook2X-0.6.1-r2.ebuild:
   Replacing einfo with elog

diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index 7984428a2756eff005611a671c03beffa2cffb9b..f7c8b9c13f72527d5541d00ab7364abfd6d3a310 100644 (file)
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST docbook2X-0.6.1.tar.gz 231262 RMD160 78b7f0cff04093a2c35371803d34c5c32c7eb8a9 SHA1 df1c70b3fa531c97fe406bea06eb3b5da05d4d1c SHA256 fb162799d29a86e2d7b506b87edd9b88eb6b126ed4b9648ac658fcdd0ebe058f
 DIST docbook2X-0.8.7.tar.gz 656814 RMD160 89b40ffe563def5416139315e46e63b4f13d2307 SHA1 14aa84bc28080a74f9c47126dc21a9982a6cf7c0 SHA256 562c143f64091b7e537042a6dce582d98bd4120b08a500ded3f78815c334e5f4
 EBUILD docbook2X-0.6.1-r2.ebuild 1493 RMD160 9b71d505117606242cfbbbe9b1c127a9d6d9565c SHA1 0da44b91ee4c2891ef982cb9d9d09569ea37f4b6 SHA256 0046e0cf067e085addeaec0ff0e3617b9c70542870baa09a412f0b9ee9535359
 MD5 66b5b3c944ec8c16311c85cc1bbf9724 docbook2X-0.6.1-r2.ebuild 1493
 RMD160 9b71d505117606242cfbbbe9b1c127a9d6d9565c docbook2X-0.6.1-r2.ebuild 1493
 SHA256 0046e0cf067e085addeaec0ff0e3617b9c70542870baa09a412f0b9ee9535359 docbook2X-0.6.1-r2.ebuild 1493
+EBUILD docbook2X-0.8.7-r1.ebuild 929 RMD160 4fd1d02375775f5ade378f42db3df133abc2535b SHA1 19a4e96993ff2ca311b9c4ac79e4c03e6c3cc432 SHA256 967131335f98c5cb2981a351e1018418ff81a5c096f5d3ac1b95962b7913a1f8
+MD5 f94f88d62a906c179463c80cf8b35cf4 docbook2X-0.8.7-r1.ebuild 929
+RMD160 4fd1d02375775f5ade378f42db3df133abc2535b docbook2X-0.8.7-r1.ebuild 929
+SHA256 967131335f98c5cb2981a351e1018418ff81a5c096f5d3ac1b95962b7913a1f8 docbook2X-0.8.7-r1.ebuild 929
 EBUILD docbook2X-0.8.7.ebuild 754 RMD160 8c1fa647356844db913c2353329e2866139f695f SHA1 4e9995cb36c83569a4b5bc7992d8998bc2bf407b SHA256 7bfcc46ba01088846ef9801fc71f21078f8afbfd770fea38184ffd21c8990422
 MD5 6d6aa5f9bee4dca590932cee2e42da49 docbook2X-0.8.7.ebuild 754
 RMD160 8c1fa647356844db913c2353329e2866139f695f docbook2X-0.8.7.ebuild 754
 SHA256 7bfcc46ba01088846ef9801fc71f21078f8afbfd770fea38184ffd21c8990422 docbook2X-0.8.7.ebuild 754
-MISC ChangeLog 2530 RMD160 aeaa76dae3f1951d394cf9e71c4e8ffea475dc9f SHA1 cceb12cdd402a04bb27fcd320e512731fca5682d SHA256 7468b68557389eff6ee8529e56512712a1b76eb62d06fedfa85a262fab262faf
-MD5 3e3269a6c32f0dc46d943d03afa87b65 ChangeLog 2530
-RMD160 aeaa76dae3f1951d394cf9e71c4e8ffea475dc9f ChangeLog 2530
-SHA256 7468b68557389eff6ee8529e56512712a1b76eb62d06fedfa85a262fab262faf ChangeLog 2530
+MISC ChangeLog 2822 RMD160 facf0e06aaf4785fac7f0ac807cdb5224d577722 SHA1 456624c68db8d267f842b3b9a76dd8920d8b5ba8 SHA256 2a25317096370e6d559807de6be6a13aa6521ef1cd034580bb4ad7179cc3cb5c
+MD5 cb8aa017ce303c77f6ca597d3a110534 ChangeLog 2822
+RMD160 facf0e06aaf4785fac7f0ac807cdb5224d577722 ChangeLog 2822
+SHA256 2a25317096370e6d559807de6be6a13aa6521ef1cd034580bb4ad7179cc3cb5c ChangeLog 2822
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
@@ -25,10 +26,6 @@ SHA256 0088c30da08215bd252a360c672b1f33240de3af9c7170cecb91c6518863508d files/di
 MD5 f7d2b7a54b820c3bf8a360158afcd140 files/digest-docbook2X-0.8.7 247
 RMD160 7b6ae7a69e3ab0da96ad611f30b627f951c74790 files/digest-docbook2X-0.8.7 247
 SHA256 b075756191849565c3517a9bfa324c6237d3236e57810aa7131d3df8651307af files/digest-docbook2X-0.8.7 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFvDpY6J2i8a8J4okRAnsMAKDJem6hIdufMWmTJQzPukB43NJgcACdH0Ux
-yNhmyOQp2OMUEjNT+hk+fQk=
-=gjGG
------END PGP SIGNATURE-----
+MD5 f7d2b7a54b820c3bf8a360158afcd140 files/digest-docbook2X-0.8.7-r1 247
+RMD160 7b6ae7a69e3ab0da96ad611f30b627f951c74790 files/digest-docbook2X-0.8.7-r1 247
+SHA256 b075756191849565c3517a9bfa324c6237d3236e57810aa7131d3df8651307af files/digest-docbook2X-0.8.7-r1 247

diff --git a/app-text/docbook2X/docbook2X-0.8.7-r1.ebuild b/app-text/docbook2X/docbook2X-0.8.7-r1.ebuild
new file mode 100644 (file)
index 0000000..e4032da
--- /dev/null
+++ b/app-text/docbook2X/docbook2X-0.8.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.7-r1.ebuild,v 1.1 2007/04/11 08:10:00 robbat2 Exp $
+
+DESCRIPTION="Tools to convert docbook to man and info"
+SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
+HOMEPAGE="http://docbook2x.sourceforge.net"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~hppa"
+IUSE=""
+LICENSE="GPL-2"
+
+DEPEND=""
+
+RDEPEND=">=dev-perl/XML-Writer-0.4
+       >=dev-perl/XML-XSLT-0.31
+       >=dev-perl/SGMLSpm-1.03
+       dev-libs/libxslt"
+
+src_compile () {
+       cd "${S}"
+       econf \
+               --with-xslt-processor=libxslt \
+               --program-suffix=.pl \
+               || die "econf failed"
+       emake || die "emake failed"
+}
+
+src_install () {
+       make DESTDIR=${D} install || die "install failed"
+       elog "To avoid conflict with docbook-sgml-utils, which is much more widely used,"
+       elog "all executables have been renamed to *.pl."
+}

diff --git a/app-text/docbook2X/files/digest-docbook2X-0.8.7-r1 b/app-text/docbook2X/files/digest-docbook2X-0.8.7-r1
new file mode 100644 (file)
index 0000000..84e807c
--- /dev/null
+++ b/app-text/docbook2X/files/digest-docbook2X-0.8.7-r1
@@ -0,0 +1,3 @@
+MD5 bef029e10d29b182a7a782b483db1b36 docbook2X-0.8.7.tar.gz 656814
+RMD160 89b40ffe563def5416139315e46e63b4f13d2307 docbook2X-0.8.7.tar.gz 656814
+SHA256 562c143f64091b7e537042a6dce582d98bd4120b08a500ded3f78815c334e5f4 docbook2X-0.8.7.tar.gz 656814