# HG changeset patch # User Nathan Phillip Brink # Date 2010-09-07 16:38:22 # Node ID 8fde95ae1acde701b613ca7a65303d2d8d6f0774 # Parent 927c558864c76c0b862b123068c4c0cdf87016fc app-text/docbook2X: Drop old versions and upgrade docbook2X-0.8.8-r2 to EAPI=2. (Portage version: 2.2_rc69-r1/hg/Linux x86_64, signed Manifest commit) diff --git a/app-text/docbook2X/ChangeLog b/app-text/docbook2X/ChangeLog --- a/app-text/docbook2X/ChangeLog +++ b/app-text/docbook2X/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.38 2010/07/18 16:46:46 armin76 Exp $ + 07 Sep 2010; Nathan Phillip Brink (ohnobinki) + -docbook2X-0.6.1-r2.ebuild, + -docbook2X-0.8.7-r1.ebuild, -docbook2X-0.8.8.ebuild, + -docbook2X-0.8.8-r1.ebuild, docbook2X-0.8.8-r2.ebuild: + Drop old versions and upgrade docbook2X-0.8.8-r2 to EAPI=2. + 18 Jul 2010; Raúl Porcel docbook2X-0.8.8-r2.ebuild: alpha/arm/ia64/s390/sh/sparc stable wrt #321899 diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest --- a/app-text/docbook2X/Manifest +++ b/app-text/docbook2X/Manifest @@ -1,13 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 RMD160 b8994d28b83b62a3880291e4bc22a13166653754 SHA1 0802e9a73aa4fd146c5394f5cd200c7e452de18e SHA256 273eaa08cfff75bb5fab4975761d1e427e4180d82700da396901a59ed0546c0d AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 RMD160 18965f6a35d2604e85558b188ae74ae3028113bf SHA1 db6411e5ee48b83c1d9a2fed296020c4f00e17d3 SHA256 ac5755da0dbdd67e7131284e865d86df24a56ac26cfbcdcdbe561926a54999fd AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 RMD160 9d65c7e6cf48b0a99c7cb12e5ba2bfb48ebbf573 SHA1 eda3c5d507cd21c1f564110111c5f7a6c26c6fab SHA256 0f571f0e9576ef09a07c46da76723cd3f83085ccf8daf25dee15b9921455112a -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 DIST docbook2X-0.8.8.tar.gz 723909 RMD160 35c8dcbe86e91e787a67b1d17251bf00fed9aabf SHA1 7dc34d420f8aae2a0c0cdb39f52146ce005bf902 SHA256 4077757d367a9d1b1427e8d5dfc3c49d993e90deabc6df23d05cfe9cd2fcdc45 -EBUILD docbook2X-0.6.1-r2.ebuild 1493 RMD160 9b71d505117606242cfbbbe9b1c127a9d6d9565c SHA1 0da44b91ee4c2891ef982cb9d9d09569ea37f4b6 SHA256 0046e0cf067e085addeaec0ff0e3617b9c70542870baa09a412f0b9ee9535359 -EBUILD docbook2X-0.8.7-r1.ebuild 938 RMD160 719bbeb2fddde84764e532f597a91aa03a15b4cb SHA1 2d061cdfe0a924231edaa86f1ae7da42b944d02f SHA256 87138d6ef7e650e05a489a7815ed59a7a9838188f9df2ec6b628f0a0843e59f6 -EBUILD docbook2X-0.8.8-r1.ebuild 1032 RMD160 616b540f10794e7f4680e18886cce8dbd2718940 SHA1 6d64debc6b3107d887f68de29fd869c82ceb5bfd SHA256 04587c87194ca5f409296f43cbe20fb55fe5b5f6b52880cce3b4ecb385454d1d -EBUILD docbook2X-0.8.8-r2.ebuild 1608 RMD160 9b6fd376fb7eee27aa67feb69198d7916fb851fa SHA1 c917df811440293364ae57b9f64929001beebe6f SHA256 277c3a8bfff7da26d797c3cc3c0e3eb9f66f7d64d217200c579390801f65ac85 -EBUILD docbook2X-0.8.8.ebuild 1001 RMD160 7342631b1240fa4b8322aaa9bd00b92288cdffc6 SHA1 32de09cdd287df655697aaec6cd1bd0eaf67b0a3 SHA256 2cdf239aefe30673c829ae66b0ee1afd05d9e3e38fe558db8ff8f8a9d268055c -MISC ChangeLog 5817 RMD160 eb23f8a23eec6619c31986fb5329f65e0f94ac23 SHA1 b150d2699ca3d5c73d4a1925a0804be21d991255 SHA256 758acb0fb3dcbe7d2e85f9f39754ff6f576558b87e25a2407924eedb51665f73 +EBUILD docbook2X-0.8.8-r2.ebuild 1538 RMD160 611bbb812b7b38b2489e05e8ebfefe55e19ccb8b SHA1 a8e43a0546f547e1dae0c7e66c57d8c0ce5c0473 SHA256 d01f29410d4a7c77c5d4b538209040fa743395efccab70d856850466a7d88a03 +MISC ChangeLog 6101 RMD160 bb57ba4e36eddc7813185e9a4994e5eb883acfcf SHA1 94c02076b513174b02934e2485c0bd4f45ab4e55 SHA256 dd5a3d82711e8a179d5cec1a89de42b358a78465ee642c1b239b2a7803dd366e MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkyGor0ACgkQni8M22OVw8CJIQCgqrqzx975zB9NJiVa9qXNvTeF +aR4AoKpnAT7ACQmM0ca4vaX9C6FKnqR7 +=L3G+ +-----END PGP SIGNATURE----- diff --git a/app-text/docbook2X/docbook2X-0.6.1-r2.ebuild b/app-text/docbook2X/docbook2X-0.6.1-r2.ebuild deleted file mode 100644 --- a/app-text/docbook2X/docbook2X-0.6.1-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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.6.1-r2.ebuild,v 1.10 2007/01/28 05:42:06 genone Exp $ - -S=${WORKDIR}/${PN} -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="amd64 hppa ppc sparc x86" -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-0.5.0" - -src_install () { - - # Get current install Perl site arch directory. - eval `perl '-V:installsitearch'` - SITE_ARCH=${installsitearch} - - insinto ${SITE_ARCH}/XML/DOM - doins XML/DOM/Map.pm - insinto ${SITE_ARCH}/XML - doins XML/SGMLSpl.pm - insinto /usr/share/sgml/docbook/db2X-customization/common - doins xslt/common/* - insinto /usr/share/sgml/docbook/db2X-customization/lib - doins xslt/lib/* - insinto /usr/share/sgml/docbook/db2X-customization/texi - doins xslt/texi/* - insinto /usr/share/sgml/docbook/db2X-customization/dtd - doins dtd/Texi-XML - exeinto /usr/bin - for exe in docbook2man docbook2manxml docbook2texi docbook2texixml texi_xml man_xml - do - mv ${exe} ${exe}.pl - doexe ${exe}.pl - done - doexe docbook2man-spec.pl docbook2texi-spec.pl manpage_makelinks.pl - 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/docbook2X-0.8.7-r1.ebuild b/app-text/docbook2X/docbook2X-0.8.7-r1.ebuild deleted file mode 100644 --- a/app-text/docbook2X/docbook2X-0.8.7-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2009 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.3 2009/11/17 21:40:15 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-perl/XML-SAX - dev-libs/libxslt" - -src_compile () { - 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/docbook2X-0.8.8-r1.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r1.ebuild deleted file mode 100644 --- a/app-text/docbook2X/docbook2X-0.8.8-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r1.ebuild,v 1.1 2008/04/09 09:27:21 pva 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="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="" -LICENSE="MIT" - -DEPEND="" - -RDEPEND=">=dev-perl/XML-Writer-0.4 - >=dev-perl/XML-XSLT-0.31 - >=dev-perl/SGMLSpm-1.03 - dev-perl/XML-SAX - dev-libs/libxslt" - -src_compile() { - econf \ - --with-xslt-processor=libxslt \ - --program-transform-name='s,\(docbook2.*\),\1.pl,' \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make "DESTDIR=${D}" install || die "install failed" - - dodoc AUTHORS ChangeLog NEWS README THANKS TODO -} - -pkg_postinst() { - 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/docbook2X-0.8.8-r2.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild --- a/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild +++ b/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild,v 1.15 2010/07/18 16:46:46 armin76 Exp $ +EAPI=2 + # bug 318297 WANT_AUTOMAKE="1.10" @@ -18,20 +20,16 @@ LICENSE="MIT" # dev-perl/XML-LibXML - although not mentioned upstream is required # for make check to complete. -DEPEND="dev-lang/perl +RDEPEND="dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2*" - -RDEPEND="${DEPEND}" +DEPEND="test? ( ${RDEPEND} )" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # Patches from debian, for description see patches itself. epatch "${FILESDIR}"/${P}-filename_whitespace_handling.patch epatch "${FILESDIR}"/${P}-preprocessor_declaration_syntax.patch @@ -40,18 +38,15 @@ src_unpack() { eautoreconf #290284 } -src_compile() { +src_configure() { econf \ --with-xslt-processor=libxslt \ - --program-transform-name='s,\(docbook2.*\),\1.pl,' \ - || die "econf failed" - - emake || die "emake failed" + --program-transform-name='s,\(docbook2.*\),\1.pl,' } src_install() { - make DESTDIR="${D}" install || die "install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO + make DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die } pkg_postinst() { diff --git a/app-text/docbook2X/docbook2X-0.8.8.ebuild b/app-text/docbook2X/docbook2X-0.8.8.ebuild deleted file mode 100644 --- a/app-text/docbook2X/docbook2X-0.8.8.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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.8.ebuild,v 1.3 2007/08/22 18:39:37 ticho 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="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="" -LICENSE="MIT" - -DEPEND="" - -RDEPEND=">=dev-perl/XML-Writer-0.4 - >=dev-perl/XML-XSLT-0.31 - >=dev-perl/SGMLSpm-1.03 - dev-perl/XML-SAX - dev-libs/libxslt" - -src_compile() { - econf \ - --with-xslt-processor=libxslt \ - --program-suffix=.pl \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make "DESTDIR=${D}" install || die "install failed" - - dodoc AUTHORS ChangeLog NEWS README THANKS TODO -} - -pkg_postinst() { - elog "To avoid conflict with docbook-sgml-utils, which is much more widely used," - elog "all executables have been renamed to *.pl." -}