Version bump: Fixed nested command substitution in gnome-doc-utils.make (Chris Coleman), updated translations. Update homepage and remove old.

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

3 files changed, 60 insertions, 14 deletions

diff --git a/app-text/gnome-doc-utils/ChangeLog b/app-text/gnome-doc-utils/ChangeLog
index 99add99f9700..6900a82e439f 100644
--- a/app-text/gnome-doc-utils/ChangeLog
+++ b/app-text/gnome-doc-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/gnome-doc-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.174 2010/11/08 15:27:24 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.175 2010/12/31 17:57:00 pacho Exp $
+
+*gnome-doc-utils-0.20.3 (31 Dec 2010)
+
+  31 Dec 2010; Pacho Ramos <pacho@gentoo.org> -gnome-doc-utils-0.18.1.ebuild,
+  +gnome-doc-utils-0.20.3.ebuild:
+  Version bump: Fixed nested command substitution in gnome-doc-utils.make
+  (Chris Coleman), updated translations. Update homepage and remove old.
 
   08 Nov 2010; Jeremy Olexa <darkside@gentoo.org>
   gnome-doc-utils-0.20.2.ebuild:
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 24f4682fa6c0..83528c8abdf1 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,8 +1,18 @@
-DIST gnome-doc-utils-0.18.1.tar.bz2 783694 RMD160 b43bbfd7dd84a09b5aed998e0cea84bf679965f3 SHA1 40b1a812345474db8c15a5f8233ea4842c4f0cc6 SHA256 f601f602a99023fb8d46b3e5dec460357d719d9c6aae9600520f1b786d4f545f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-doc-utils-0.20.1.tar.bz2 714900 RMD160 335c143121d34184eb88831ac4bef1189f0f857d SHA1 7fa71459c20c7c98b052f4f8983bb53073230d31 SHA256 2a744dc0561fc9e2d8b1fc1c2dcf6e5dd07663affb3e908cd1fe5b1dd3cca26b
 DIST gnome-doc-utils-0.20.2.tar.bz2 707344 RMD160 c5b4d497f9cc68aea9105ac909df9282cd52c1e0 SHA1 afb77988153e3cae2567aa47f24345ac6ae41920 SHA256 f6c0124f61b9400c63da630dd3a9ac1b738eac0058da245661ff699fad267aca
-EBUILD gnome-doc-utils-0.18.1.ebuild 1572 RMD160 f26a3eaaa7348cfa4a5dbc9ced124020b4545a89 SHA1 63feefa38dccdd20cc28e7d690cbcfd42d3f4f73 SHA256 15c14a58fced9ee2885c62aaaaf482b6b33898804757d49dd62bdfd4d33d2e58
+DIST gnome-doc-utils-0.20.3.tar.bz2 706057 RMD160 1a35c0e79e9383f04cbf955c51e5e272d54ec90c SHA1 58ab7dbd0153ffdd9410eef48354ce0dcfb062bd SHA256 1a1812ebf216a868af7478c55d3d4778ef50ebe41bfc5d42342a547b796829b3
 EBUILD gnome-doc-utils-0.20.1.ebuild 1575 RMD160 fbeede9a9eec773f4142f3e86bd8d5938b19ee3e SHA1 bee15aa48c2f932e72490f65c5d7129f210d57cd SHA256 ac09bc023fcbe13f13b5485e30b7c46de72362ed9c93f3c9a3d5b35387a3d4be
 EBUILD gnome-doc-utils-0.20.2.ebuild 2115 RMD160 e07157bfaa2d6548d8143569792b0c1957d5e318 SHA1 dc58a3101321359acb191d92c6a055f9c0420750 SHA256 eb7df3779a1c06f579921c5df13a7771cd0acad2e38ea98781b662ce3eb7863d
-MISC ChangeLog 23105 RMD160 77af3c9b98a1587197f0a1269af5e157b3429510 SHA1 9d053bc327433ba38a1df48d5468b6529f137dbd SHA256 8337869e27191e5f297ed92ae82709652d94c9e7175b4eacb37bc1b0c5127590
+EBUILD gnome-doc-utils-0.20.3.ebuild 2126 RMD160 42a5fd77dfb2951e0bb8750e63c4bcca33c39832 SHA1 1f17645fe6e931c57f3eb06055da4387dbf90acd SHA256 4f1c3cdab8880b2c6494fd1bb31ee9b846f62fc7d6a1132fb790e6b3b9a3f919
+MISC ChangeLog 23401 RMD160 33f51c8dfeacf46f4913d43d87ed2af1f4a9b29e SHA1 c8a3d69f2717ce087e8efd18e3e38762a19e982c SHA256 215c7059247dc7b5b0ac4cd2d66f34f1aaeb5235558a953c9bede5265555e640
 MISC metadata.xml 180 RMD160 d5c2834323dbbb0fe95852a38d96f612f4fa5272 SHA1 ec8a7e682c2f7e2ac91ac2cb0c9a534e26a9a211 SHA256 7e56e5abb3b36de1c42bbb9e6b415baf540373a30426cabe655b4458bd864823
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0eGXEACgkQCaWpQKGI+9RZ9wCfVbeILYiVa39TnMTGXVYC5XSo
+JZYAn3KLBDVzjGQIgDBZlZNCbegZF7DP
+=l0E7
+-----END PGP SIGNATURE-----
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.18.1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.3.ebuild
index 939d765cbd49..406c3b79a95a 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.18.1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.3.ebuild
@@ -1,22 +1,26 @@
 # Copyright 1999-2010 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.18.1.ebuild,v 1.11 2010/07/21 11:04:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.3.ebuild,v 1.1 2010/12/31 17:57:00 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.4"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit gnome2 python
 
 DESCRIPTION="A collection of documentation utilities for the Gnome project"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://live.gnome.org/GnomeDocUtils"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.6.12[python]
 	 >=dev-libs/libxslt-1.1.8
-	 >=dev-lang/python-2.4"
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
@@ -25,8 +29,6 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper-dtd"
 # dev-libs/glib needed for eautofoo, bug #255114.
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 # FIXME: Highly broken with parallel make, see bug #286889
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -34,7 +36,9 @@ MAKEOPTS="${MAKEOPTS} -j1"
 # to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
 
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF} --disable-scrollkeeper"
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -43,15 +47,40 @@ src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -d -s
+}
+
+src_test() {
+	python_execute_function -d -s
+}
+
+src_install() {
+	installation() {
+		gnome2_src_install
+		python_convert_shebangs $(python_get_version) "${ED}"usr/bin/xml2po
+		mv "${ED}"usr/bin/xml2po "${ED}"usr/bin/xml2po-$(python_get_version)
+	}
+	python_execute_function -s installation
+	python_clean_installation_image
+
+	python_generate_wrapper_scripts -E -f "${ED}"usr/bin/xml2po
 }
 
 pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/xml2po
+	python_mod_optimize xml2po
 	gnome2_pkg_postinst
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/xml2po
+	python_mod_cleanup xml2po
 	gnome2_pkg_postrm
 }