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.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 38 insertions, 23 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/Manifest b/gnome-extra/gucharmap/Manifest
index 12320a3420be..823e67df486c 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gucharmap-3.4.1.1-fix-doc.patch 348 SHA256 ae7f68febd1d5a711d2b27d8c5cc7bee284a2300a217be717b27d8cffe2c846f SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27 WHIRLPOOL 40facbc9ec88d0c15dab45a7a4a1e9d7ae7821a7e392e8f391744297153bc912849cdec977b3930052272269eb9932d9bb2d9a59094c54955cc3dbed883e94ac
 DIST gucharmap-2.32.1.tar.bz2 3242939 SHA256 fdef066f35f4301bc128b91f15a30d64a2459721cb50daa53f923789df315c28 SHA512 d98a1a152b371afe306eac4d5bb1293a8f80692ef5fe06f44d8430fc3f4bb3c8643363caecbe117054d860707f636262ad46d7fb7051097cdf1466a89a3cff54 WHIRLPOOL fbebaf3241d3da76e0bee330b643513024a69c955f627e8fbd0eb3f60d623544331aa19548fb3d528f4bada27167116c78d89e3856fc259f86d8085970c926f1
 DIST gucharmap-3.0.1.tar.bz2 3275481 SHA256 948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1 WHIRLPOOL 6c9aaaaf31428db5257f98da741513c192ca32371b5d19952471d09586900186b269192b8ae6902e430e7fb3116bccc7d6ed4bca050ad0ca58eb14d7817d569a
-DIST gucharmap-3.2.1.tar.xz 2678356 SHA256 b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff
+DIST gucharmap-3.2.1.tar.xz 2678356 SHA256 b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff SHA512 5499116e33ba6d392b234e8ea6b2e6c673555d3f17e50c6d6dbfa9a4a8f4fa7c74a48aa4f22e449ff2847fb49b4f3c1a39f7bc77a23cb8681eaf47ccf87d19bb WHIRLPOOL 34d7c5cb87d024c3d653796f2994be1d7f0a144579a06c6f7fe4067e03d05705d2132c1b2bbde610eaa0cc96d25a7fc6a954d1d50f5cb9840f6ad49b6ef771a9
 DIST gucharmap-3.2.2.tar.xz 2693128 SHA256 da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21 SHA512 a9b714e014c18c6de152c26a48769d42640c8d183a97d310c31e6852deb2043640e47adfd072e35fc590f68011c67ca344ca71f6602961924f9aad72bc69e329 WHIRLPOOL 27431bb4bf08ba273ebc863a8698690392e8946bbaaafee6777241727e3d60f0315e523c3b4d38c1046a5f795bf124319e587afb3a8fe15fe5c93163dad60b50
 DIST gucharmap-3.4.1.1.tar.xz 2761188 SHA256 52ea80e9e5f01232801dd24f7eb5c70eb36e7a85e429ad9113e8b71234d94c62 SHA512 ac7ec10537874a21761ea631aac9c07d31900fe2d1a4b86b4c37017a52bb844ede86f46a5cfe96103eb43faed25b496503f5095734b0e3a3b46ea8853ae6e227 WHIRLPOOL a21ac19488d7ace50cc2f6787cc454404116b45b68e269d598218daf66885f17b2d81f20107e5a4ed12d28e9c112138847ec2fb57f34cd62ea1f4e98c4856bd9
 EBUILD gucharmap-2.32.1.ebuild 1351 SHA256 5fa8d981499aaf626ead0086127da0c9d1b8ebe16e0cf9807695264ac073e00c SHA512 2702f14d1851a9e858d49e13b3504fa4c732390db429ed3de4947c703f5742bdda307d146635bd22cfffb71738119d89b37064c9582e801ededc654d1e47088b WHIRLPOOL 0fc2402e66d8706c5aedba8f3c18fb6abf08975dda567601b369bca3cf4ba924da2a2e22177c638a90c24f33b7e6c4c5ee5534fccc1540035e948239569de7c6
-EBUILD gucharmap-3.0.1-r200.ebuild 1625 SHA256 1df6ba2c7e4abaf8929d9b2839d18615bc81e158421ded3fdd50b4a1d3087bb5 SHA512 902c1b59eae835f5fa790dad7c2fb70850a8dcf72767028029f33d9a0786cea20ccf3c31a073c7821f0cf4d9c8e609a2b7e0de7467e32e3fa18cf03e916e01dd WHIRLPOOL 2a0716f969d64f2a467386da35a3c3ff8ec98cc478d98f596799b8efbc412744d171c72054a27168c785c8ac94e8b980905553d167652c1c077fb00f67d13fd2
+EBUILD gucharmap-3.0.1-r200.ebuild 1663 SHA256 96fe723314b9ea273e2926582ddf6c7e3edc9707a922f411468a1b47ea899f5e SHA512 5aeadbc50e396d779415de82ac98369060d9b381d5e6eb0498e64169717303950bab22755f22947de4b06cd200ed387efcd8b1d2224727ebb194c20b5e03517b WHIRLPOOL e5600db1405a6d88cc6037a106aa32511386c0446b511e425366abbd56853143a8c5f05c221a4b608e9faffb8a68fe5119c01e7f8378c332c3078830424a8c58
 EBUILD gucharmap-3.2.1.ebuild 1455 SHA256 cb37ac683820ea30d0fd7a488dce043171230692a63a65d412f9b731ae3815a7 SHA512 e147f12e4b0158da7e94564e062ba36237d914ecfc972d4657b43892b395ca1390a883bb78062d981307deb0bdff3cd40dd5d9732dd82a7f0f547f78fbf49600 WHIRLPOOL 7308e6a4e2d57b686fb32870f893e40cba7032a7f08273d8b8c0c864ba61afa238ac0376412e6edbdfdc916b728aa39a7041619928c3468a3ec6cb6827cfd089
 EBUILD gucharmap-3.2.2.ebuild 1448 SHA256 d5cf69bdb45b478f05cc527fb83e0c71431cf044c2fa780e265e535b136f6788 SHA512 c7b5fb97605deb01ba0f28cca721939977bffd39343e53a51bb82adc08fa88f6fd85a499160ced7d4ac72c081681d001a5539c0f3812d14b27d408efd1c9d924 WHIRLPOOL 9155edd697319258d098d35c6ae2dcca12a5372a6ac92ff85095f4e8ff6c8bfd47e7cf72542b3e2af1900aeafe096f6deddd0f2dd521d843d0f0ac162904c624
-EBUILD gucharmap-3.4.1.1.ebuild 1461 SHA256 a5689c9cd6ec9951529a573d7e3f8254297e0eac9deafb5aa3aa1769545ac5e1 SHA512 418919ed412b3261d59eb17f0cbc818940a21e4a02923f6b582aeabe8419150b83d31dac41477a58fe6c5beaba3c672e24b2d8335c1b409f079a7400a6581028 WHIRLPOOL c621703368d2cd13f716f2dafbee41f8010ef7e7bfe52961c043e6229905b04d0c5e36f670cd82dd85a222a014a87a519b63d8a875e2a7032eb6076cd5abd64f
-MISC ChangeLog 23766 SHA256 209c6a9b100a981d135da064da5335bf4270df74c1981ebd44ce94e0a3a5bd46 SHA512 265e872647c5cc93959a16feeb872bdafa1d175a8f580c9c6b9515ced43c7ad5cce1820b003ca9a05f626525a99fd8a2a3c0a59cf62a28c1a71de44f6977fb1e WHIRLPOOL 5c673d59e4bd6f496540b701d749ed662f05d14d72bf30cab74b8d983c2614fc42a7e3fa199ec3859f1f66168f438b5017795d493d5ec4e7097a0a8571477fec
+EBUILD gucharmap-3.4.1.1.ebuild 1488 SHA256 a00c54d8cf4d59cb55831507c1fcd5cf2f64cf8cea5f7e027e48720c6fe5482d SHA512 b76c4db3089e91021297ce91b70dccbe25608f6bfebc186065e6983515ade75da40229d54aaa435c3e6424ebfc870e74f7911a5d28ae356eae209c3984ab82df WHIRLPOOL a8167eb1f1c2db72f87eb8e5f0fa470f4d18bf11553e6d9bff2ae19672a518487b0990cba56eaeb07ab2cf6f88078e9dc9478de2cc4194eef79441b824c7cd87
+MISC ChangeLog 24104 SHA256 75af2a8c50967ec119a4633bb9f02c7cab342827fac9aa4b28f66412356a2689 SHA512 b42fd45097f67a774bf246539715e2a0d977c26f4362837b9fd96bccb10a07a0dbbd88524b0c50ee4f2a11f8b09c918ee53fe30ad9ff1412df5dcfc031c7e319 WHIRLPOOL 047f6099c43b99dc6fafb4bf5a83e4774896145d093339e3b4c00f041297251e22583b1b6a16a577574d65541bea8d349f77fe9455d71c3d2f060a5d81cfbf00
 MISC metadata.xml 272 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314 SHA512 f3e9cc433eb6e6475a4281ad4dbb021bd050e00e194e9dd1b7ea619ea55a7f09ea2f4952e1e192e38764aba9260a6b15f06082685def060aa9ac7ead67d97237 WHIRLPOOL ed5cb90610d66f50314f1269b41424aff0990c4ff733c10d2f1424492cd01e4f7de682f1677c15b3e70508fe72dca8d04fccac6282395f0adb27b0df99a307cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNVTsACgkQuQc30/atMkBVPACgjzjysgIgONi5oFEvTttTrFDH
-0+0AoKnkErMM6MI3aurDJoQZX98Pe3aQ
-=hwOi
+iEYEAREIAAYFAlClR6kACgkQCaWpQKGI+9RLHgCfRUWPYJ0+7orHOvUWnVMVM08W
+dGMAn2nAOOLkg2K5ZX5hWywNVSftnnaq
+=ZlIY
 -----END PGP SIGNATURE-----
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