patch for prefix, add keywords for ~x86-{macosx,freebsd}, bug #410737

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 109 insertions, 8 deletions

diff --git a/app-text/docbook-sgml-utils/ChangeLog b/app-text/docbook-sgml-utils/ChangeLog
index 96b33b30546b..703cda8187c7 100644
--- a/app-text/docbook-sgml-utils/ChangeLog
+++ b/app-text/docbook-sgml-utils/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for app-text/docbook-sgml-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.63 2012/03/31 08:40:59 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.64 2012/04/04 03:19:00 heroxbd Exp $
 
-  31 Mar 2012: XU Benda <heroxbd@gentoo.org>
+  04 Apr 2010: Benda XU <heroxbd@gentoo.org>
+  docbook-sgml-utils-0.6.14-r1.ebuild:
+  +docbook-utils-0.6.14-prefix.patch
+  patch for prefix, add keywords for ~x86-{macosx,freebsd}, bug #410737
+ 
+  31 Mar 2012: Benda XU <heroxbd@gentoo.org>
   docbook-sgml-utils-0.6.14-r1.ebuild:
   add keywords for ~{amd64,x86}-linux  
 
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 448e62685d8e..7a8671f5c067 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -1,7 +1,8 @@
 AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 RMD160 1c3993ffc08953c67632c26b11bc39ea3eade0fd SHA1 3ae3b00bc27eb707704d98566f09675c012d172a SHA256 b7d2b32232007bbaa3911ef98b2d20b127e9d9d193f7742348c36aae4291bca3
 AUX docbook-utils-0.6.14-elinks.patch 445 RMD160 e596d1099b4b428e3a67f3894cc8ba8aae3b2f87 SHA1 0de527f0bd1482c3e3309b613df5772143891cf0 SHA256 9e26e6ad17c2e2bd1d66a06aecc4ec6a077bb94ed2942acad0368f8fe923331b
+AUX docbook-utils-0.6.14-prefix.patch 3055 RMD160 fbf148a7c54bfeb74534f428878e672b5fc03b20 SHA1 3c27342a6dc81bc766ae1b65b16fe75969dd24e5 SHA256 363eba749fb9cb7f58a615168af7be5782a2f4c39dc2c3acf17292f160c214a9
 DIST docbook-utils-0.6.14.tar.gz 124998 RMD160 710fe047ea8a794cc6c0d944521184375a666e6b SHA1 aae596844930e0e4bb7f8824024be0982cc4fa85 SHA256 48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9
-EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1785 RMD160 2e7cd061eae8059a256114fa9a6d34f080ebe6ec SHA1 3a221fc370741b8b7d02ff6b27c3ab4de3f2684c SHA256 8658e4161b479d9f6b1442dc07ada23354319ac7b398cacaf9c4d44356172c08
+EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1985 RMD160 2b662a30ea653a401b15ed02bd9ad746dc28417e SHA1 e2f06b1d90ca9e343ad6d7561addfe584f8b418b SHA256 c9286cbdcdb33cd80f6ea94484d294de876c5ebbf9f5b5fcbcc7537e1b1f815a
 EBUILD docbook-sgml-utils-0.6.14.ebuild 1694 RMD160 46c7bd9f6b57cb16f0ab03e3670619ad9c561b82 SHA1 32c109980a7038dfeda09ee263a0939cba33162b SHA256 3c76f529c5b1947a2c6a69c2ba40fbd9a58dfbc95c0612aaef1d7a46243242b1
-MISC ChangeLog 9309 RMD160 0e1d8bddebd6e9cf2e8186633f04c6406369689f SHA1 a1f84e6eb8dcb03a3a5d0a882a74a31eab855d94 SHA256 c213b50b40a488d26157f55723023a841440dfee7cd3c38eeda2da406a6f8c36
+MISC ChangeLog 9504 RMD160 c008053846a710e7f21869a768c0cdbb22a286d7 SHA1 865df607f9839ff02adcf5611a1f56ffebd4a79d SHA256 44aa4643c808b139dec7afdc88245e1a6b549920292fc88253751bcc2726e9ef
 MISC metadata.xml 323 RMD160 1835a48ec162b7e88cd3fcc9dd3cd9b29bf705e7 SHA1 54b3b032dd4e44a61e4239d257dd7a87513dd986 SHA256 3bf8bdd7cf048f02dea3a3ca8b73b407ea345b13403696bd3c33fba1159f71a1
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
index 56497e02ea95..82791839424c 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild,v 1.8 2012/03/31 08:40:59 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild,v 1.9 2012/04/04 03:19:00 heroxbd Exp $
 
 EAPI=3
 
-inherit eutils
+inherit eutils autotools prefix
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
@@ -16,7 +16,7 @@ SRC_URI="ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${MY_P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
@@ -44,6 +44,11 @@ DEPEND=">=dev-lang/perl-5
 src_prepare() {
 	epatch "${FILESDIR}"/${MY_P}-elinks.patch
 	epatch "${FILESDIR}"/${P}-grep-2.7.patch
+	if use prefix; then
+		epatch "${FILESDIR}"/${MY_P}-prefix.patch
+		eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
+		eautoreconf
+	fi
 }
 
 src_install() {
diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
new file mode 100644
index 000000000000..29906c2046ad
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
@@ -0,0 +1,90 @@
+--- doc/HTML/Makefile.am~	2007-10-08 04:13:04 +0200
++++ doc/HTML/Makefile.am	2007-10-08 04:13:34 +0200
+@@ -23,7 +23,7 @@
+ 		$(top_srcdir)/doc/refentry/docbook2texi-spec.pl.sgml \
+ 		$(top_srcdir)/doc/refentry/frontend-spec.sgml \
+ 		$(top_srcdir)/doc/refentry/sgmldiff.sgml
+-	SGML_CATALOG_FILES=/etc/sgml/catalog \
++	SGML_CATALOG_FILES=@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog \
+ 	SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \
+ 		jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
+ 			-V '%use-id-as-filename%' $<
+--- doc/man/Makefile.am~	2007-10-08 04:14:16 +0200
++++ doc/man/Makefile.am	2007-10-08 04:14:29 +0200
+@@ -10,7 +10,7 @@
+ 
+ $(man1_MANS) $(man7_MANS): $(top_srcdir)/doc/docbook-utils.sgml \
+ 		$(top_srcdir)/helpers/docbook2man-spec.pl
+-	SGML_CATALOG_FILES=/etc/sgml/catalog \
++	SGML_CATALOG_FILES=@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog \
+ 	SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \
+ 		nsgmls $< | \
+ 		sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl
+--- bin/jw.in~	2007-10-08 04:27:18 +0200
++++ bin/jw.in	2007-10-08 04:28:40 +0200
+@@ -63,7 +63,7 @@
+ then
+   SGML_CONF=`sgmlwhich`
+ else
+-  SGML_CONF="/etc/sgml/sgml.conf"
++  SGML_CONF="@GENTOO_PORTAGE_EPREFIX@/etc/sgml/sgml.conf"
+ fi
+ 
+ # Set version message
+@@ -77,7 +77,7 @@
+ 
+ # Set SGML base directory and centralized catalogs directory
+ SGML_BASE_DIR="@prefix@/share/sgml"
+-SGML_CATALOGS_DIR="/etc/sgml"
++SGML_CATALOGS_DIR="@GENTOO_PORTAGE_EPREFIX@/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+   RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
+--- backends/txt~	2007-10-08 04:59:59 +0200
++++ backends/txt	2007-10-08 05:00:52 +0200
+@@ -2,21 +2,21 @@
+ # Send any comments to Eric Bischoff <eric@caldera.de>
+ # This program is under GPL license. See LICENSE file for details.
+ 
+-if [ -x /usr/bin/lynx ]
++if [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/lynx ]
+ then
+-  CONVERT=/usr/bin/lynx
++  CONVERT="@GENTOO_PORTAGE_EPREFIX@"/usr/bin/lynx
+   ARGS="-force_html -dump -nolist -width=72"
+-elif [ -x /usr/bin/links ]
++elif [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/links ]
+ then
+-  CONVERT=/usr/bin/links
++  CONVERT="@GENTOO_PORTAGE_EPREFIX@"/usr/bin/links
+   ARGS="-dump"
+-elif [ -x /usr/bin/elinks ]
++elif [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/elinks ]
+ then
+-  CONVERT=/usr/bin/elinks
++  CONVERT="@GENTOO_PORTAGE_EPREFIX@"/usr/bin/elinks
+   ARGS="-dump"
+-elif [ -x /usr/bin/w3m ]
++elif [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/w3m ]
+ then
+-  CONVERT=/usr/bin/w3m
++  CONVERT="@GENTOO_PORTAGE_EPREFIX@"/usr/bin/w3m
+   ARGS="-dump"
+ else
+   echo >&2 "No way to convert HTML to text found."
+--- configure.in~	2004-02-11 15:14:15 +0100
++++ configure.in	2007-10-14 10:40:51 +0200
+@@ -20,11 +20,11 @@
+ AC_SUBST(docdir)
+ 
+ dnl Checks for programs.
+-jade_bindirs="/usr/bin /usr/local/bin"
++jade_bindirs="@GENTOO_PORTAGE_EPREFIX@/usr/bin"
+ AC_FIND_PROGRAM(nsgmls, $jade_bindirs, jade_bindir)
+ AC_SUBST(jade_bindir)
+ 
+-perl_bindirs="/usr/bin /usr/local/bin"
++perl_bindirs="@GENTOO_PORTAGE_EPREFIX@/usr/bin"
+ AC_FIND_PROGRAM(perl, $perl_bindirs, perl_bindir)
+ AC_SUBST(perl_bindir)
+