Make

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 46 insertions, 7 deletions

diff --git a/app-text/gnome-doc-utils/ChangeLog b/app-text/gnome-doc-utils/ChangeLog
index a5f4c58111ae..40b9e830aea3 100644
--- a/app-text/gnome-doc-utils/ChangeLog
+++ b/app-text/gnome-doc-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/gnome-doc-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.209 2013/03/27 21:38:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.210 2013/05/10 11:06:02 eva Exp $
+
+  10 May 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-doc-utils-0.20.10-r1.ebuild,
+  +files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch:
+  Make
 
 *gnome-doc-utils-0.20.10-r1 (27 Mar 2013)
 
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 234e0bdb47a6..58f8efefdf2f 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 SHA256 bd9b785064554ab872175154a7e9fdd74f5566b66b057fef93cea6bfc323c958 SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c WHIRLPOOL eafde10cb49f211ffe315efbf58b1015136729be74b3617ba612a0091bf27e7b6a2f33881f5bd5667d38a4d8e19d706762b70a09e765bd4be79a38ad5e8215f1
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 SHA256 cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6 SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151 WHIRLPOOL b840fd722ba7994aa587a85159cb1873c710bf5074ce7c1c6c0cfb601847b5ae3aea1584f43daa4cbcbb4d486c0b6609115191c5eacf4c23f99d42a696791011
-EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1786 SHA256 a80342a47e89057f91bf7c5466ca76e41a98906a32e501f2499555c974325541 SHA512 069a285856ebf5b9da17ef9c4cb17ae938e50aa871fc1a048b0a1aa917b3858977c595758e095e7789235841ca3504b7bb8b4693ab1324039d8f646556877f21 WHIRLPOOL 1a720e7153bdd55f119eb294233cdc4cc65a7fcd195352070703d430587f2726a0ee061a60aa2396f989c0afa93badabbd723ee6f9220a0be536a1fbba21b3d1
+EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1890 SHA256 9bddc27283f83c4ade813a054cb63583c83c470f0368c794d321a5ca842a1e58 SHA512 e45bae23e8c9b8c39854bad579519314251829adea25f5671b1229cf2ff432c2538ddd0565f2d954f47476cf566f74616e2752060f674a05cef507411b996942 WHIRLPOOL 12a45abcd4240395d6bfa7b4b03a9a6a44183aa103228f0ba55565e3ebd39badf213be0379edf893e838c50163d30f0b525eba8883cf20c0507ee73e0341e200
 EBUILD gnome-doc-utils-0.20.10.ebuild 2010 SHA256 b7bf23c606b3f29fd460d7b95b22d36440a2ad5e468c8ccc3b1e645cbfb17262 SHA512 725c4ee90ad866565bbf420e4f1ba8b794796079f3a6aefba67405e33d4c65ff9d0a4f45e6b7b8715aa9766a5847d766d26f6c01cef14b82c878ffa1648bebd6 WHIRLPOOL d4a66b0accdc3814f6cf0fa8cb2b280c16b032d3bb17e873eec9b1c365ed268d69ba23c20b7c8a23ed3bc3c17594a3c4c4f9d4a74c97974aec8779f5753f7a35
-MISC ChangeLog 28262 SHA256 d227a985989bfeb2ccd43d256963d1da6e4eaa9037634e7a3cbe3c54384a54d2 SHA512 75cebe884a8deebd01eed6521d9587e37a158a1b8f6961036b447d4bfb00975594d40c520fc4b98769559afc15c225cbef4d0b3383d89fd9813dbb0d401c6a17 WHIRLPOOL e11c4e72e92a1fbaf0bf85ad45d855019f261e49de7347eac8e8178f1823f647b4c5a68e4c02c6eb62229a15dab0f9a4d7eb15544ab45263bdc9938a34b4e442
+MISC ChangeLog 28423 SHA256 02026ee5d6268095f4212e7cfc1b0971e8a128790f5ecbd9421807f5a5142398 SHA512 ec85969ab4226ce40ec767217a1d201b9c7afb9ac7dabd84e1560bf5cc871163d6d44fd8191cfe28215d376c6533749c236b09ccb960b66785448ab566a32f12 WHIRLPOOL 267d760b40d0324227a5276e32f294e7c6f873630d41ee2eb647f56612336472a2897cb21c1afd815f5689de9f12fd0553a34f3d8b968e9d9757edb0a1bde6b0
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFTZs0ACgkQ1fmVwcYIWAZLFwCg2302pxolGCLHXxjKyy0J1isW
-4YAAnj2M5VZJZxzoJfGQqxN4qD1+YtUh
-=2V2S
+iEYEAREIAAYFAlGM1JsACgkQ1fmVwcYIWAZb2ACfSlq+hUv4GS8tPeHiNYhLxXki
+OOkAn0XBWqlTknu6Z5czpM75H3D7bh/S
+=aPRg
 -----END PGP SIGNATURE-----
diff --git a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
new file mode 100644
index 000000000000..eecc54560695
--- /dev/null
+++ b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
@@ -0,0 +1,30 @@
+--- a/bootstrap.make	2013-04-11 20:34:59.015015386 +0200
++++ b/bootstrap.make	2013-04-11 20:35:26.710082615 +0200
+@@ -1,4 +1,4 @@
+-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
+ 
+ _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
+ _db2omf  = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
+--- a/doc/xslt/Makefile.in	2013-05-10 12:57:46.804104663 +0200
++++ b/doc/xslt/Makefile.in	2013-05-10 12:58:12.434908022 +0200
+@@ -340,7 +340,7 @@
+ _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
+ _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
+ _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
+-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
+ _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
+ _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
+ _chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
+--- a/doc/gnome-doc-make/Makefile.in	2013-05-10 12:57:46.804104663 +0200
++++ b/doc/gnome-doc-make/Makefile.in	2013-05-10 12:58:12.434908022 +0200
+@@ -340,7 +340,7 @@
+ _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
+ _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
+ _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
+-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
+ _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
+ _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
+ _chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
index 637f19eabd6d..5715d1a659d5 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.20.10-r1.ebuild,v 1.1 2013/03/27 21:38:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild,v 1.2 2013/05/10 11:06:02 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -35,6 +35,9 @@ DEPEND="${RDEPEND}
 # to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
 
 src_prepare() {
+	# Stop build from relying on installed package
+	epatch "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
+
 	gnome2_src_prepare
 
 	# Leave shebang alone