diff options
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/gnome-user-docs/ChangeLog | 12 | ||||
| -rw-r--r-- | gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make-gdu.patch | 40 | ||||
| -rw-r--r-- | gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make.patch | 33 | ||||
| -rw-r--r-- | gnome-extra/gnome-user-docs/gnome-user-docs-2.26.2.ebuild | 44 | ||||
| -rw-r--r-- | gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild (renamed from gnome-extra/gnome-user-docs/gnome-user-docs-2.28.2.ebuild) | 15 |
5 files changed, 18 insertions, 126 deletions
diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog index a9862885b794..ed409e92afed 100644 --- a/gnome-extra/gnome-user-docs/ChangeLog +++ b/gnome-extra/gnome-user-docs/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-extra/gnome-user-docs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.47 2010/10/17 15:50:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.48 2010/10/29 21:48:19 pacho Exp $ + +*gnome-user-docs-2.32.0 (29 Oct 2010) + + 29 Oct 2010; Pacho Ramos <pacho@gentoo.org> + -files/gnome-user-docs-2.24.2-parallel-make.patch, + -files/gnome-user-docs-2.24.2-parallel-make-gdu.patch, + -gnome-user-docs-2.26.2.ebuild, -gnome-user-docs-2.28.2.ebuild, + +gnome-user-docs-2.32.0.ebuild: + Version bump for Gnome 2.32, let it compile when python3 is set as main + interpreter. Remove old. 17 Oct 2010; Raúl Porcel <armin76@gentoo.org> gnome-user-docs-2.30.1.ebuild: diff --git a/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make-gdu.patch b/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make-gdu.patch deleted file mode 100644 index 1e5835dfa48d..000000000000 --- a/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make-gdu.patch +++ /dev/null @@ -1,40 +0,0 @@ -# Fix parallel build issue in gnome-doc-utils makefile -# https://bugs.gentoo.org/show_bug.cgi?id=255479 ---- a/gnome-doc-utils.make -+++ b/gnome-doc-utils.make -@@ -251,6 +251,13 @@ _DOC_POFILES = $(if $(DOC_MODULE), - .PHONY: po - po: $(_DOC_POFILES) - -+## @ _DOC_MOFILES -+## The .mo files used for translating the document -+_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) -+ -+.PHONY: mo -+mo: $(_DOC_MOFILES) -+ - ## @ _DOC_LC_MODULES - ## The top-level documentation files in all other locales - _DOC_LC_MODULES = $(if $(DOC_MODULE), \ -@@ -311,15 +318,18 @@ $(_DOC_POFILES): - $(_xml2po) -e -u $(notdir $@) $$docs); \ - fi - -+$(_DOC_MOFILES): %.mo: %.po -+ msgfmt -o $@ $< -+ - # FIXME: fix the dependancy - # FIXME: hook xml2po up --$(_DOC_LC_DOCS) : $(_DOC_POFILES) -+$(_DOC_LC_DOCS) : $(_DOC_MOFILES) - $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ - (cd $(dir $@) && \ -- $(_xml2po) -e -p \ -- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \ -+ $(_xml2po) -e -t \ -+ "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo" \ - "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) - diff --git a/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make.patch b/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make.patch deleted file mode 100644 index e1051f24c6e2..000000000000 --- a/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/gnome2-accessibility-guide/Makefile.am 2009-01-11 22:50:31.000000000 +0100 -+++ b/gnome2-accessibility-guide/Makefile.am 2009-01-11 22:51:27.000000000 +0100 -@@ -14,7 +14,7 @@ - - DOC_LINGUAS = de el en_GB es fi fr hu it oc pt sv - --install-data-local: install-doc-pdf -+install-data-hook: install-doc-pdf - install-doc-pdf: - for lc in C $(DOC_LINGUAS); do \ - pdf="$$lc/$(DOC_MODULE).pdf"; \ ---- a/gnome2-user-guide/Makefile.am 2009-01-11 22:50:27.000000000 +0100 -+++ b/gnome2-user-guide/Makefile.am 2009-01-11 22:51:49.000000000 +0100 -@@ -17,7 +17,7 @@ - - DOC_LINGUAS = ar bg de el es fi fr hu it ja ko oc pa pt pt_BR ru sv th zh_CN - --install-data-local: install-doc-pdf -+install-data-hook: install-doc-pdf - install-doc-pdf: - for lc in C $(DOC_LINGUAS); do \ - pdf="$$lc/$(DOC_MODULE).pdf"; \ ---- a/gnome2-system-admin-guide/Makefile.am 2009-01-11 22:45:28.000000000 +0100 -+++ b/gnome2-system-admin-guide/Makefile.am 2009-01-11 22:50:16.000000000 +0100 -@@ -20,7 +20,7 @@ - - DOC_LINGUAS = ca de el es fi fr it ja ko oc pa pt sv zh_CN - --install-data-local: install-doc-pdf -+install-data-hook: install-doc-pdf - install-doc-pdf: - for lc in C $(DOC_LINGUAS); do \ - pdf="$$lc/$(DOC_MODULE).pdf"; \ diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.26.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.26.2.ebuild deleted file mode 100644 index d6ec0dd68dff..000000000000 --- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.26.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.26.2.ebuild,v 1.9 2010/07/20 02:19:03 jer Exp $ - -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 - -DESCRIPTION="GNOME end user documentation" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="FDL-1.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="test" - -RDEPEND="" -DEPEND="app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.5.6 - >=dev-util/pkgconfig-0.9 - test? ( - ~app-text/docbook-xml-dtd-4.1.2 - ~app-text/docbook-xml-dtd-4.3 )" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} --disable-scrollkeeper" -} - -src_unpack() { - gnome2_src_unpack - - # Fix parallel make, bug #252163 - epatch "${FILESDIR}/${PN}-2.24.2-parallel-make.patch" - epatch "${FILESDIR}/${PN}-2.24.2-parallel-make-gdu.patch" - - # Ugly ugly hack but gnome-doc-utils isn't actually - # parallel make safe. - sed "s/install-data-local/install-data-hook/" \ - -i gnome-doc-utils.make || die "sed failed" - - eautoreconf -} diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.28.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild index 71dbc3b1be4a..03e26741f43d 100644 --- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.28.2.ebuild +++ b/gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild @@ -1,17 +1,19 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.28.2.ebuild,v 1.6 2010/08/18 22:26:02 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild,v 1.1 2010/10/29 21:48:19 pacho Exp $ +EAPI="3" GCONF_DEBUG="no" +PYTHON_DEPEND="2" -inherit gnome2 +inherit gnome2 python DESCRIPTION="GNOME end user documentation" HOMEPAGE="http://www.gnome.org/" LICENSE="FDL-1.1" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="test" RDEPEND="" @@ -22,11 +24,8 @@ DEPEND="app-text/scrollkeeper ~app-text/docbook-xml-dtd-4.1.2 ~app-text/docbook-xml-dtd-4.3 )" -DOCS="AUTHORS ChangeLog NEWS README" - -# FIXME: Parallel make is badly broken, bug #260827 and #296375 -#MAKEOPTS="${MAKEOPTS} -j1" - pkg_setup() { G2CONF="${G2CONF} --disable-scrollkeeper" + DOCS="AUTHORS ChangeLog NEWS README" + python_set_active_version 2 } |