diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2013-05-10 11:06:02 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-05-10 11:06:02 +0000 |
| commit | 80373415a6b42d4e015ab91fd46c22a4e099d888 (patch) | |
| tree | f41430fbabb895dd98da73da8720dde95e1527f6 /app-text | |
| parent | Stable for amd64/ppc/ppc64/x86, wrt to bug #469282, remove old (diff) | |
| download | gentoo-2-80373415a6b42d4e015ab91fd46c22a4e099d888.tar.gz gentoo-2-80373415a6b42d4e015ab91fd46c22a4e099d888.tar.bz2 gentoo-2-80373415a6b42d4e015ab91fd46c22a4e099d888.zip | |
Make
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'app-text')
3 files changed, 40 insertions, 2 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/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 |