Fix docs building (#436710 by Andrew Savchenko and Juergen Rose), 'doc' USE cannot be dropped as this is for building and installing it, otherwise docs are completely dropped. Remove old.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 30 insertions, 16 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index 28368bb1c89d..29e6cbc00fcc 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.184 2012/10/28 15:54:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.185 2012/11/15 19:51:04 pacho Exp $
+
+  15 Nov 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gucharmap-3.4.1.1-fix-doc.patch, gucharmap-3.0.1-r200.ebuild,
+  gucharmap-3.4.1.1.ebuild:
+  Fix docs building (#436710 by Andrew Savchenko and Juergen Rose), 'doc' USE
+  cannot be dropped as this is for building and installing it, otherwise docs
+  are completely dropped. Remove old.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gucharmap-3.4.1.1.ebuild:
   ia64/sh/sparc stable wrt #427544
diff --git a/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch b/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
new file mode 100644
index 000000000000..52696b5128a8
--- /dev/null
+++ b/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
@@ -0,0 +1,9 @@
+--- a/docs/reference/gucharmap-docs.sgml
++++ b/docs/reference/gucharmap-docs.sgml
+@@ -21,6 +21,5 @@
+     <xi:include href="xml/gucharmap-script-codepoint-list.xml"/>
+     <xi:include href="xml/gucharmap-chapters-view.xml"/>
+     <xi:include href="xml/gucharmap-unicode-info.xml"/>
+-    <xi:include href="xml/gucharmap.xml"/>
+   </chapter>
+ </book>
diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
index 2681f7b83bb7..48e2fc62d3d5 100644
--- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild,v 1.9 2012/07/15 16:26:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild,v 1.10 2012/11/15 19:51:04 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 
 DESCRIPTION="Unicode character map viewer library"
-HOMEPAGE="http://live.gnome.org/Gucharmap"
+HOMEPAGE="https://live.gnome.org/Gucharmap"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="cjk doc +introspection"
 
-RDEPEND=">=dev-libs/glib-2.16.3
+RDEPEND=">=dev-libs/glib-2.16.3:2
 	>=x11-libs/pango-1.2.1[introspection?]
 	>=x11-libs/gtk+-2.14.0:2[introspection?]
 
@@ -30,11 +31,9 @@ DEPEND="${RDEPEND}
 
 	doc? ( >=dev-util/gtk-doc-1.0 )"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-scrollkeeper
-		--disable-maintainer-mode
 		--with-gtk=2.0
 		--disable-charmap
 		--disable-gconf
@@ -42,14 +41,14 @@ pkg_setup() {
 		$(use_enable cjk unihan)"
 	# gconf is only needed for the gucharmap program
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
 
-src_prepare() {
 	# .desktop and schema files are only needed for the gucharmap program
 	sed -e 's:desktop_DATA\s*=.*:desktop_DATA = :' \
 		-e 's:schema_DATA\s*=.*:schema_DATA = :' \
 		-i Makefile.* || die "sed Makefile.* failed"
 
+	epatch "${FILESDIR}/${PN}-3.4.1.1-fix-doc.patch" # bug 436710, fixed in 3.6
+
 	gnome2_src_prepare
 }
 
diff --git a/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild b/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild
index 7bd189a61a76..2e85dc08b446 100644
--- a/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild,v 1.8 2012/10/28 15:54:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild,v 1.9 2012/11/15 19:51:04 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -9,7 +9,7 @@ GNOME2_LA_PUNT="yes"
 inherit gnome2
 
 DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="http://live.gnome.org/Gucharmap"
+HOMEPAGE="https://live.gnome.org/Gucharmap"
 
 LICENSE="GPL-3"
 SLOT="2.90"
@@ -34,20 +34,19 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1.0 )
 	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-scrollkeeper
 		$(use_enable introspection)
 		$(use_enable cjk unihan)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
 
-src_prepare() {
 	# prevent file collisions with slot 0
 	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
 		-i configure.ac configure || die "sed configure.ac configure failed"
 
+	epatch "${FILESDIR}/${P}-fix-doc.patch" # bug 436710, fixed in 3.6
+
 	gnome2_src_prepare
 
 	# avoid autoreconf