Drop useless USE=doc, it only regenerated documentation.

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

4 files changed, 21 insertions, 25 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index a114bb43ce82..46e26ad2b8f2 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.542 2012/10/06 21:17:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.543 2012/10/10 07:26:34 tetromino Exp $
+
+  10 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  glib-2.32.4-r1.ebuild, glib-2.34.0.ebuild:
+  Drop useless USE=doc, it only regenerated documentation.
 
   06 Oct 2012; Anthony G. Basile <blueness@gentoo.org> glib-2.32.4-r1.ebuild:
   stable ppc ppc64, bug #427544
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index af76e7e09f73..f191fedc4fed 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -28,15 +28,19 @@ DIST glib-2.34.0.tar.xz 6368532 SHA256 f69b112f8848be35139d9099b62bc81649241f78f
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
 EBUILD glib-1.2.10-r5.ebuild 1782 SHA256 1ac935da2188aa1ed04e5db79d8637f519fdfa9d9a64dd8a978cbf31bb056486 SHA512 6d9f9839be66df0f343f4dd39c6f88524e8acc45c747ef0ce7507c24296d0550c8b1c13efa396a6a65f31033d62f064cbc0fc7c7b8b28b2eabe22387b611fa15 WHIRLPOOL b5967b8704e5ce04f41a03bb108ccaffa628f02add1b67803e8b0a531d7f345b9a0c458388da90262a53e76fd96dae7a82cab391fc5e6404c6b2ff7d43164f54
 EBUILD glib-2.30.3.ebuild 8947 SHA256 5adf86b28c2f555619519c2115c971bbc82547066334979c9dcc7acbf0bba05a SHA512 947fd2af003c94fd63aaa164e14fba68e7b00f22f8c4e8eca30a9e3d4158e342d6739b44c7ec5e64f4d1fc901b8ba45b8563e8b5d47771f43b7f932e6d382888 WHIRLPOOL fb97179c951d9c55fb2231e817ac74e0fa28d908b29b1df3d577bfcc2156436799e9dd0c10ff141a2022a7482a45d20c2d9e49844336d434277842d57313cd6d
-EBUILD glib-2.32.4-r1.ebuild 8290 SHA256 4733af9f38b81ae3ca91ca2653cabbd74bcf0713ae327a1e41235483355ff4b7 SHA512 0bf7f61868b2094105736af5d0c3daab3f9726cdda48e33483717b5214245296f4621794b129e2899f8ebb37d20b77e922a2b1caf61492a2c413cb1dbec34461 WHIRLPOOL 0e76ec8ff5f94ace6a8445e5d8fc7eb507c45241ae13f05f38914def1b34e6bf12fd59c613b3d0101a650e4d296ab7f95544008dd38f32394830f9ac1815b240
+EBUILD glib-2.32.4-r1.ebuild 8040 SHA256 da04fd049e1800bc588bb0f22380014ed536c36405e566f8e0b84b136c983d7c SHA512 cb434c848d5abdcc52b45408e06ccc0ffb24c0ec0eebdd882eb61bb346617c0e6d7d03e1e9c802b1209c17013b99586427728e4cd1b63f1b0ee780b11613e915 WHIRLPOOL 6aeff4d311e703deceb80c04a6cd58a6c4141f11ac751fe02d26166af9c591274eb3dd0cf13e0627050bd93151f3fa3f26548094e535ea935777d0f4ee4fee3c
 EBUILD glib-2.32.4.ebuild 8244 SHA256 7f2d6a5833c884d4f33612c080fe4f63119a5d64534657c024330eaa5323a930 SHA512 9e1fbebb6a7492a2f29d9dd508691f6623be383212efb182421110f5773e745f782d2d8294e39643877afeffe030e3adad34a3b5e22c1ba3a748ae02d22da3af WHIRLPOOL d8fa8381447abd89cc0acdb67931abdad9d2c1c193434a3191c2e32e6483bcf7e5b3588ab38793cc1d46233744b6753051f527efb8d74d50ac6fb5c376a18608
-EBUILD glib-2.34.0.ebuild 8263 SHA256 588edda667dbafb641d5293cfaaf0127ce337b0a05abda64615100f9f2a6221e SHA512 f8637abb0c8b9ee9333b51fad3736d6df5c963c598cbc59070f885ca4135626dcb6a3d1569e782929b744d2f16a6328c8b41cfe8d752ca888aee1b1cbefd5169 WHIRLPOOL 05bfec2b82b041caa304aad9e398bcd6470b0e34732114ac16abc0da1133fd5cabb02470ce9dd5901438464db296d54a5bfe3de34edcb1bebe94138beeb89a81
-MISC ChangeLog 74261 SHA256 b3fcc2f0668da02efe333466cd1f9baf9a898c885c074effaa80a4ff83b2c114 SHA512 6fe0fb1e6c9cf0c0e29d13e05d6c18d5d72b4b155fcc0c16855e2f36f0932a77fdb211fc88a272bd08ff86d7cdc2a633ef545e92814fbb82243970687ee8f227 WHIRLPOOL dc17994c2efab63c5020ce9a6af114d01b88debebf714879136b5a360e9eff46e4d581332edb25cd3251b77014776be31e9be80e32935a31b4e358ca8db4ff86
+EBUILD glib-2.34.0.ebuild 8182 SHA256 9f7653313dbed64a36f54396eff3991cb3443f83e7df304bcfd261b45ef038a5 SHA512 3d1e58863e8ad5cb201b12ba97c83b38519b2272045526580c167ca718140363e5031d05d912aaf86647bde780c42670633ff8fdbfff4efdb4a4c44f087ba84f WHIRLPOOL b30aeb5a12c7f94a4c38ed3ab055d6ab63a596149862338fe89ff2596b02598345df4ecbc870a345d6b9fc8a5a3a123e86a24c57a14abbf029a850a3d076d922
+MISC ChangeLog 74426 SHA256 ba5904a3288e6c10fecca622aa24be489007fd990843452d62efc8c04406cf6e SHA512 0f5ad86f30965980b1eafdcde51af7ee1a84ae709357bb35dfdc9e4d2ca26d8bcae1b9d36bd3a71b2403344281d38007381be2b0f4d707269734d54547bc0181 WHIRLPOOL 55b61891f4ab9efc415360fe7aff5fb214a95a4fd4c11d9e242dd6022f13f9b43e337406a7882edf7a865579630c1b18863f0d1f12ab4db889fc2160c6d25757
 MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBwn8MACgkQl5yvQNBFVTU3/QCcDXFB6kuQYjdEhPgnVmNdfIaX
-xEYAmwUuQEl3jsHxI+L3D54eE01uTjRf
-=cZ08
+iQEcBAEBCAAGBQJQdSMsAAoJEJ0WA1zPCt1h2XQH/iUJ6FMU57aA6w0r6pTJzreX
+cB6/USjEDkPgHpLBigcDYej0mN5Q4hdgSEg39XVzLPx8KwU0U0cXykdAON8Dz3or
+qwfnVW3qDsvG1WnMxSLQUipRqy8Qc7yyYqZul5MecwkyM7aSmJ0RZbWKsg1N6ggs
+GpQb0sw0sz7xYdlDgwcuzccao285KUcMi3sqfw3G/6cbbS/TFRZRF1ZoHXqWcb7l
+MLCpc3GN+q0NNPiLWitCsROGnkYEGx78grENHi3C09WL+2FwrkdbXK5GsCJ2FQfW
+qkfdUfPlaClqKK0SYhA5tO3YDYGf+IAaL4QQMMSdfkC64112KB3Ss0b1kLiTZLY=
+=1TT1
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.32.4-r1.ebuild b/dev-libs/glib/glib-2.32.4-r1.ebuild
index 5c6df978a5cc..83b8a27f3908 100644
--- a/dev-libs/glib/glib-2.32.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.32.4-r1.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/dev-libs/glib/glib-2.32.4-r1.ebuild,v 1.6 2012/10/06 21:17:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4-r1.ebuild,v 1.7 2012/10/10 07:26:34 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2+"
 SLOT="2"
-IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
+IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/libiconv
@@ -31,11 +31,6 @@ RDEPEND="virtual/libiconv
 DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.11
 	>=dev-util/gtk-doc-am-1.15
-	doc? (
-		>=dev-libs/libxslt-1.0
-		>=dev-util/gdbus-codegen-${PV}
-		>=dev-util/gtk-doc-1.15
-		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
 		sys-devel/gdb
@@ -69,8 +64,7 @@ src_prepare() {
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
-	# need to build tests if USE=doc for bug #387385
-	if ! use test && ! use doc; then
+	if ! use test; then
 		# don't waste time building tests
 		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
 	else
@@ -150,8 +144,6 @@ src_configure() {
 	# Always use internal libpcre, bug #254659
 	econf ${myconf} \
 		$(use_enable xattr) \
-		$(use_enable doc man) \
-		$(use_enable doc gtk-doc) \
 		$(use_enable fam) \
 		$(use_enable selinux) \
 		$(use_enable static-libs static) \
diff --git a/dev-libs/glib/glib-2.34.0.ebuild b/dev-libs/glib/glib-2.34.0.ebuild
index 66139fce6847..d7dca2cf41f0 100644
--- a/dev-libs/glib/glib-2.34.0.ebuild
+++ b/dev-libs/glib/glib-2.34.0.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/dev-libs/glib/glib-2.34.0.ebuild,v 1.2 2012/09/28 18:54:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.0.ebuild,v 1.3 2012/10/10 07:26:34 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2+"
 SLOT="2"
-IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
+IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/libiconv
@@ -32,9 +32,6 @@ DEPEND="${RDEPEND}
 	>=dev-libs/libxslt-1.0
 	>=sys-devel/gettext-0.11
 	>=dev-util/gtk-doc-am-1.15
-	doc? (
-		>=dev-util/gdbus-codegen-${PV}
-		>=dev-util/gtk-doc-1.15 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
 		sys-devel/gdb
@@ -143,7 +140,7 @@ src_configure() {
 	use debug && myconf="--enable-debug"
 
 	# need to build tests if USE=doc for bug #387385
-	if use doc || use test; then
+	if use test || [[ ${PV} = 9999 ]] && use doc; then
 		myconf="${myconf} --enable-modular-tests"
 	else
 		myconf="${myconf} --disable-modular-tests"
@@ -152,7 +149,6 @@ src_configure() {
 	# Always use internal libpcre, bug #254659
 	econf ${myconf} \
 		$(use_enable xattr) \
-		$(use_enable doc gtk-doc) \
 		$(use_enable fam) \
 		$(use_enable selinux) \
 		$(use_enable static-libs static) \