New version - correctly handles content and tooltips for links to anchor elements; does not reprocess book titles when title and bookinfo/title exist. FHS patch reworked to not require eautoreconf

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 139 insertions, 2 deletions

diff --git a/app-text/gnome-doc-utils/ChangeLog b/app-text/gnome-doc-utils/ChangeLog
index 1c9fd418dec4..7eb1aceeb6b7 100644
--- a/app-text/gnome-doc-utils/ChangeLog
+++ b/app-text/gnome-doc-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/gnome-doc-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.118 2008/08/12 23:22:24 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.119 2008/10/07 11:29:57 leio Exp $
+
+*gnome-doc-utils-0.14.0 (07 Oct 2008)
+
+  07 Oct 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/gnome-doc-utils-0.14.0-fhs.patch, +gnome-doc-utils-0.14.0.ebuild:
+  New version - correctly handles content and tooltips for links to anchor
+  elements; does not reprocess book titles when title and bookinfo/title
+  exist. FHS patch reworked to not require eautoreconf
 
   12 Aug 2008; Mart Raudsepp <leio@gentoo.org>
   -gnome-doc-utils-0.10.3.ebuild, gnome-doc-utils-0.12.0.ebuild,
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 081dc8a6c0a1..bc61c66f1b0c 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,7 +1,10 @@
 AUX gnome-doc-utils-0.12.2-fhs.patch 1776 RMD160 b403ff0b93ac1a99188f01f54e6656dc557526a1 SHA1 0329ebe4f45506cf0f430b29d34a4ff53b5c7a74 SHA256 a9bd1dd952aaa991fdb8f60d9ced7c090a3dc223fc8ae8a115e562f7c5c10684
+AUX gnome-doc-utils-0.14.0-fhs.patch 2692 RMD160 cd47ea0b057ffe3c2afdf1eaab6d9af391d355e2 SHA1 67d658b58da4c64eade03403e74c1424304d7e3f SHA256 46b4d212423344d19168e93522e928b2a26f29075e571978c854fef29ca3d8d6
 DIST gnome-doc-utils-0.12.0.tar.bz2 592073 RMD160 3ac9b6f04163ba2581b048282f64558f608ca44d SHA1 e20c74ad415b9ddfdf6c8d663e22bf27c0b939c4 SHA256 6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076
 DIST gnome-doc-utils-0.12.2.tar.bz2 595150 RMD160 79f204f78edbe44c5cb171630967309d5ede5afa SHA1 8006f6c2c3cf41c6be0295b4ba48df0d4d4f51d1 SHA256 8abda2b30ecccb3aedc9f465b667787b4fca9ae80b18e3292901c57ffc484747
+DIST gnome-doc-utils-0.14.0.tar.bz2 617417 RMD160 23743b6fc1e2389e306701d73523e2609ae0ac26 SHA1 e3de92c19f9140cbdee9f6ad0b179e4e797b3505 SHA256 c4aa79a1fb5aa990dcea8d203ed3e474c1acf7cedf655eff67464ca9f4fc60a6
 EBUILD gnome-doc-utils-0.12.0.ebuild 1060 RMD160 e01ec987b27ca611fdce42e747971d6531f04ce4 SHA1 3188ec0d2042eeaf6aa9ab68ba628c51f94acb30 SHA256 e145fec4e53ec75097549f17cc9db34985d446a1f107bfc0f6ac60d68fe3369b
 EBUILD gnome-doc-utils-0.12.2-r1.ebuild 1449 RMD160 506aa814221f95c1857ae133710ee5d8308f51b7 SHA1 90cff075390edbbb87289f726f65f2b58ff9c11d SHA256 664487c9002e0d4afc197b960214bfdd8ab4bc877b783d8067f938d46a21cfbb
-MISC ChangeLog 15280 RMD160 be00b4995d7b12eca15d71de4c04f3c9b7b58068 SHA1 0f1244c28aa6213439d391868b8e8d1406d95845 SHA256 e7beba98e2f4d59560361305728c3c3591dcb95653e9fa057dd4b7403674fb07
+EBUILD gnome-doc-utils-0.14.0.ebuild 1457 RMD160 19b3816c5fefa775793cb218f30556cc53c3e16e SHA1 f4bb844624e3b1ab5e202366800a44aae25e2e33 SHA256 200d8a44e3513aa65adbcab61088c2eaf3925ef58a2e639cae7cc889e3e25950
+MISC ChangeLog 15645 RMD160 86f24d1a7bdef02ff50801eca370407e8310cb63 SHA1 8ed80ea144d628c3886d1a893cf03270011c5900 SHA256 1093e66401c993ecb13a08c7a07ce90636ef607df828722a44b5897008e0835d
 MISC metadata.xml 180 RMD160 d5c2834323dbbb0fe95852a38d96f612f4fa5272 SHA1 ec8a7e682c2f7e2ac91ac2cb0c9a534e26a9a211 SHA256 7e56e5abb3b36de1c42bbb9e6b415baf540373a30426cabe655b4458bd864823
diff --git a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.14.0-fhs.patch b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.14.0-fhs.patch
new file mode 100644
index 000000000000..1633a8147f73
--- /dev/null
+++ b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.14.0-fhs.patch
@@ -0,0 +1,72 @@
+diff -urNp gnome-doc-utils-0.12.2-orig/xml2po/Makefile.am gnome-doc-utils-0.12.2-new/xml2po/Makefile.am
+--- xml2po/Makefile.am	2008-04-14 22:24:58.000000000 +0530
++++ xml2po/Makefile.am	2008-04-14 23:40:00.000000000 +0530
+@@ -3,8 +3,6 @@ SUBDIRS = modes examples
+ nodist_bin_SCRIPTS = xml2po
+ CLEANFILES = xml2po
+ 
+-commondir = $(datadir)/xml2po
+-
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xml2po.pc
+ 
+@@ -12,7 +10,7 @@ man_MANS = xml2po.1
+ 
+ xml2po: xml2po.py
+ 	sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
+-	    -e "s+^submodes_path =.*+submodes_path = \"$(commondir)\"+" \
++	    -e "s+^submodes_path =.*+submodes_path = \"$(pythondir)/xml2po\"+" \
+ 	    -e "s+^#!.*python.*+#!$(PYTHON)+" \
+ 	  < $(srcdir)/xml2po.py > xml2po
+ 	chmod +x xml2po
+diff -urNp gnome-doc-utils-0.12.2-orig/xml2po/modes/Makefile.am gnome-doc-utils-0.12.2-new/xml2po/modes/Makefile.am
+--- xml2po/modes/Makefile.am	2008-04-14 22:24:58.000000000 +0530
++++ xml2po/modes/Makefile.am	2008-04-14 23:40:00.000000000 +0530
+@@ -1,4 +1,4 @@
+-commondir = $(datadir)/xml2po
++commondir = $(pythondir)/xml2po
+ common_DATA = docbook.py empty.py gs.py ubuntu.py xhtml.py
+ 
+ EXTRA_DIST = $(common_DATA)
+diff -urNp gnome-doc-utils-0.12.2-orig/xml2po/xml2po.pc.in gnome-doc-utils-0.12.2-new/xml2po/xml2po.pc.in
+--- xml2po/xml2po.pc.in	2008-04-14 22:24:58.000000000 +0530
++++ xml2po/xml2po.pc.in	2008-04-14 23:40:00.000000000 +0530
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+ datarootdir=@datarootdir@
+-modesdir=@datadir@/xml2po
++modesdir=@pythondir@/xml2po
+ 
+ Name: xml2po
+ Description: Tool for translating XML documents
+--- xml2po/Makefile.in.orig	2008-10-07 14:15:24.458846452 +0300
++++ xml2po/Makefile.in	2008-10-07 14:16:06.285478888 +0300
+@@ -224,7 +230,6 @@
+ SUBDIRS = modes examples
+ nodist_bin_SCRIPTS = xml2po
+ CLEANFILES = xml2po
+-commondir = $(datadir)/xml2po
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xml2po.pc
+ man_MANS = xml2po.1
+@@ -630,7 +635,7 @@
+ 
+ xml2po: xml2po.py
+ 	sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
+-	    -e "s+^submodes_path =.*+submodes_path = \"$(commondir)\"+" \
++	    -e "s+^submodes_path =.*+submodes_path = \"$(pythondir)/xml2po\"+" \
+ 	    -e "s+^#!.*python.*+#!$(PYTHON)+" \
+ 	  < $(srcdir)/xml2po.py > xml2po
+ 	chmod +x xml2po
+--- xml2po/modes/Makefile.in.orig	2008-10-07 14:15:31.235574920 +0300
++++ xml2po/modes/Makefile.in	2008-10-07 14:18:56.236324037 +0300
+@@ -204,7 +203,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-commondir = $(datadir)/xml2po
++commondir = $(pythondir)/xml2po
+ common_DATA = docbook.py empty.py gs.py ubuntu.py xhtml.py
+ EXTRA_DIST = $(common_DATA)
+ all: all-am
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.14.0.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.14.0.ebuild
new file mode 100644
index 000000000000..93138f358f3e
--- /dev/null
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.14.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.14.0.ebuild,v 1.1 2008/10/07 11:29:57 leio Exp $
+
+inherit eutils python gnome2
+
+DESCRIPTION="A collection of documentation utilities for the Gnome project"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.6.12
+	 >=dev-libs/libxslt-1.1.8
+	 >=dev-lang/python-2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	~app-text/docbook-xml-dtd-4.4"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Make xml2po FHS compliant, bug #190798
+	epatch "${FILESDIR}/${P}-fhs.patch"
+
+	# If there is a need to reintroduce eautomake or eautoreconf, make sure
+	# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
+}
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper"
+
+	if ! built_with_use dev-libs/libxml2 python; then
+		eerror "Please re-emerge dev-libs/libxml2 with the python use flag set"
+		die "dev-libs/libxml2 needs python use flag"
+	fi
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/xml2po
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/python*/site-packages/xml2po
+	gnome2_pkg_postrm
+}