Version bump - uses python hashlib module instead of md5 module if available, as the latter is deprecated. Translation updates. Do patching in src_prepare as appropriate with EAPI-2

(Portage version: 2.2_rc22/cvs/Linux 2.6.29-gentoo-r1 x86_64)

3 files changed, 97 insertions, 10 deletions

diff --git a/app-text/gnome-doc-utils/ChangeLog b/app-text/gnome-doc-utils/ChangeLog
index 12506d05c225..72e2163908c4 100644
--- a/app-text/gnome-doc-utils/ChangeLog
+++ b/app-text/gnome-doc-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/gnome-doc-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.134 2009/04/12 20:42:27 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.135 2009/04/19 03:19:51 leio Exp $
+
+*gnome-doc-utils-0.16.1 (19 Apr 2009)
+
+  19 Apr 2009; Mart Raudsepp <leio@gentoo.org>
+  +files/gnome-doc-utils-0.16.1-fhs.patch, -gnome-doc-utils-0.14.1.ebuild,
+  +gnome-doc-utils-0.16.1.ebuild:
+  Version bump - uses python hashlib module instead of md5 module if
+  available, as the latter is deprecated. Translation updates.
+  Do patching in src_prepare as appropriate with EAPI 2.
 
   12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
   gnome-doc-utils-0.14.2.ebuild:
diff --git a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.16.1-fhs.patch b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.16.1-fhs.patch
new file mode 100644
index 000000000000..6c3b03e67dd2
--- /dev/null
+++ b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.16.1-fhs.patch
@@ -0,0 +1,73 @@
+diff -Naur gnome-doc-utils-0.16.0/xml2po/Makefile.am gnome-doc-utils-0.16.0.new/xml2po/Makefile.am
+--- gnome-doc-utils-0.16.0/xml2po/Makefile.am	2008-09-22 22:06:09.000000000 +0200
++++ gnome-doc-utils-0.16.0.new/xml2po/Makefile.am	2009-03-21 14:07:56.000000000 +0100
+@@ -3,7 +3,6 @@
+ nodist_bin_SCRIPTS = xml2po
+ CLEANFILES = xml2po
+ 
+-commondir = $(datadir)/xml2po
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xml2po.pc
+@@ -12,7 +11,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
+diff -Naur gnome-doc-utils-0.16.0/xml2po/Makefile.in gnome-doc-utils-0.16.0.new/xml2po/Makefile.in
+--- gnome-doc-utils-0.16.0/xml2po/Makefile.in	2009-03-16 18:52:17.000000000 +0100
++++ gnome-doc-utils-0.16.0.new/xml2po/Makefile.in	2009-03-21 14:07:09.000000000 +0100
+@@ -225,7 +225,6 @@
+ SUBDIRS = modes examples
+ nodist_bin_SCRIPTS = xml2po
+ CLEANFILES = xml2po
+-commondir = $(datadir)/xml2po
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xml2po.pc
+ man_MANS = xml2po.1
+@@ -631,7 +630,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
+diff -Naur gnome-doc-utils-0.16.0/xml2po/modes/Makefile.am gnome-doc-utils-0.16.0.new/xml2po/modes/Makefile.am
+--- gnome-doc-utils-0.16.0/xml2po/modes/Makefile.am	2008-09-22 22:06:09.000000000 +0200
++++ gnome-doc-utils-0.16.0.new/xml2po/modes/Makefile.am	2009-03-21 14:04:54.000000000 +0100
+@@ -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 -Naur gnome-doc-utils-0.16.0/xml2po/modes/Makefile.in gnome-doc-utils-0.16.0.new/xml2po/modes/Makefile.in
+--- gnome-doc-utils-0.16.0/xml2po/modes/Makefile.in	2009-03-16 18:52:17.000000000 +0100
++++ gnome-doc-utils-0.16.0.new/xml2po/modes/Makefile.in	2009-03-21 14:03:20.000000000 +0100
+@@ -205,7 +205,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 -Naur gnome-doc-utils-0.16.0/xml2po/xml2po.pc.in gnome-doc-utils-0.16.0.new/xml2po/xml2po.pc.in
+--- gnome-doc-utils-0.16.0/xml2po/xml2po.pc.in	2008-09-22 22:06:09.000000000 +0200
++++ gnome-doc-utils-0.16.0.new/xml2po/xml2po.pc.in	2009-03-21 14:04:24.000000000 +0100
+@@ -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
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.14.1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.16.1.ebuild
index 465792fefcda..0bc9cf373f43 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.14.1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.16.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2009 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.1.ebuild,v 1.2 2009/03/07 14:40:24 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.16.1.ebuild,v 1.1 2009/04/19 03:19:51 leio Exp $
 
 EAPI="2"
-inherit eutils python gnome2
+
+inherit eutils multilib python gnome2
 
 DESCRIPTION="A collection of documentation utilities for the Gnome project"
 HOMEPAGE="http://www.gnome.org/"
@@ -21,27 +22,31 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
 	~app-text/docbook-xml-dtd-4.4"
+# dev-libs/glib needed for eautofoo, bug #255114.
 
 DOCS="AUTHORS ChangeLog NEWS README"
-G2CONF="--disable-scrollkeeper"
 
-src_unpack() {
-	gnome2_src_unpack
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-scrollkeeper"
+}
+
+src_prepare() {
+	gnome2_src_prepare
 
 	# Make xml2po FHS compliant, bug #190798
-	epatch "${FILESDIR}/${PN}-0.14.0-fhs.patch"
+	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_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/xml2po
+	python_need_rebuild
+	python_mod_optimize $(python_get_sitedir)/xml2po
 	gnome2_pkg_postinst
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/lib/python*/site-packages/xml2po
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/xml2po
 	gnome2_pkg_postrm
 }