Move use_ functions out of global scope.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 33 insertions, 34 deletions

diff --git a/app-doc/xorg-docs/ChangeLog b/app-doc/xorg-docs/ChangeLog
index efc2b5a541af..792b2aa2bdf7 100644
--- a/app-doc/xorg-docs/ChangeLog
+++ b/app-doc/xorg-docs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/xorg-docs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/ChangeLog,v 1.50 2009/01/05 21:43:27 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/ChangeLog,v 1.51 2009/05/04 15:51:28 ssuominen Exp $
+
+  04 May 2009; Samuli Suominen <ssuominen@gentoo.org> xorg-docs-1.4.ebuild,
+  xorg-docs-1.4-r1.ebuild:
+  Move use_ functions out of global scope.
 
   05 Jan 2009; Javier Villavicencio <the_paya@gentoo.org>
   +files/1.4-rename-security.man.patch.bz2, xorg-docs-1.4-r1.ebuild:
diff --git a/app-doc/xorg-docs/Manifest b/app-doc/xorg-docs/Manifest
index 83469b397b61..0bf8174534f4 100644
--- a/app-doc/xorg-docs/Manifest
+++ b/app-doc/xorg-docs/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1-allow_manpages_only.patch 957 RMD160 57be7a6f8c6e2680d3beba76279501c88b12db40 SHA1 1ea1e9d0873d952f26ea96e799d524f22cb14ff3 SHA256 7f6f59c15acd9b6bdc17e208a2e2d936fb4b661bba55829f0978bb0a00299a2f
 AUX 1.4-rename-security.man.patch.bz2 8137 RMD160 c5070016711cc829f773a9ee401834f84e98c70c SHA1 c7227bf28798be1ea0bf4c01f74f433bfa2f2534 SHA256 f6149945ba8823dad87dd9912d9049866d3a9a4b489390867b06fbeac8c02117
 AUX 1.4-sgml-fixes.patch 15642 RMD160 5a512c5fa445430be35ec9d60abf1243e8b99e53 SHA1 eca4989b54bf9e68932f16e65b13de464a2cdf19 SHA256 35bd913579c841b62c013613bbfa3ee3e009799a9cded5d616641f00de15d8d4
 AUX 65533-URL-interpolation.patch 1740 RMD160 626126300824947d84d12840043ecef2c5d8b3e7 SHA1 37ec8e2d0f8714e6e147b7691965005afc4d33b9 SHA256 cb6bbd34609ffc906702737dd1720eb5a04cbce95f8a1b9a9de066dff63c3f47
 DIST xorg-docs-1.4.tar.bz2 8300321 RMD160 51cc8289e2e0ed5fca80bcbee91449e20da40849 SHA1 1c129bf9a2da57a308c7b57cb994c960ff15880a SHA256 fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925
-EBUILD xorg-docs-1.4-r1.ebuild 1098 RMD160 a566ac6c5011adddb329e1aa4d974a177843c448 SHA1 3f3ef4ca1676c126f9ff5501a90a77a3bfe8d89f SHA256 1c0812a2c2e7fe942469cbcb8e53fb1efa09e4f769649af3b02ea4ae299f82d9
-EBUILD xorg-docs-1.4.ebuild 822 RMD160 8126e3389a33a3c663413c14681d7ac8bfcf9d30 SHA1 dfdccb6204ac49a2175e3266f16d88654d3b755b SHA256 b9b9c9318e4b83c433123922244e30927375fdf62210da51ce25439b9e9ec1db
-MISC ChangeLog 6540 RMD160 149cf732b3589b11390979d0b261b4b510240891 SHA1 b36c4a5c20a8c0a2799a622d76cc77324701d4a5 SHA256 add0487daf36969c2cbcd99907375f45d758af46e5e881c392d1741ccd2fc6b2
+EBUILD xorg-docs-1.4-r1.ebuild 1123 RMD160 3e755230c6cb664d7ad4afec050091ab528db214 SHA1 7f554dfc0e1887dd020b51b2901ee38f7b66b4fd SHA256 0c610f41bfb377756c093a063226833044608a7680bb0cc1b48e284f19480750
+EBUILD xorg-docs-1.4.ebuild 852 RMD160 546c56e6157d37328ddd29d9433de6494a2806a9 SHA1 42a0c3ee1bac733727aad81e3813467115f346e1 SHA256 c14802b032225d1abdb3066cbeff1caa0bc61af9052282258bbccda6d5ae5d50
+MISC ChangeLog 6688 RMD160 f030d9e419ccd97e229222b1ce76932b252ab7af SHA1 da80d6328d664a84aabeeaee7e48b6461d402c8a SHA256 fd6a80c798cbfa1152a5a3203245e902785c7b0bdd6d23095a4e44ace28e92e0
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (FreeBSD)
-
-iEYEARECAAYFAklifwkACgkQoAP6MIsfg8LiOACcCg5BNvW1NkwItCV9AVqIX9wR
-VXQAnRoEno7idPdLPsrrHzxd3Vh7N4Yz
-=Rb71
------END PGP SIGNATURE-----
diff --git a/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild b/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild
index 8a1a9bfca736..d0f0015da721 100644
--- a/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild
+++ b/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild,v 1.12 2009/01/05 21:43:27 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/xorg-docs-1.4-r1.ebuild,v 1.13 2009/05/04 15:51:28 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -28,12 +28,15 @@ PATCHES="${FILESDIR}/1.1-allow_manpages_only.patch
 	${FILESDIR}/1.4-sgml-fixes.patch
 	${FILESDIR}/1.4-rename-security.man.patch.bz2"
 
-CONFIGURE_OPTIONS="--with-x11docdir=/usr/share/doc/${PF}
-	$(use_enable doc non-man-docs)
-	$(use_enable doc txt)
-	$(use_enable doc pdf)
-	$(use_enable doc html)
-	$(use_enable doc ps)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="--with-x11docdir=/usr/share/doc/${PF}
+		$(use_enable doc non-man-docs)
+		$(use_enable doc txt)
+		$(use_enable doc pdf)
+		$(use_enable doc html)
+		$(use_enable doc ps)"
+
+	# parallel build broken -- https://bugs.gentoo.org/show_bug.cgi?id=170798
+}
 
-# parallel build broken -- https://bugs.gentoo.org/show_bug.cgi?id=170798
 MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/app-doc/xorg-docs/xorg-docs-1.4.ebuild b/app-doc/xorg-docs/xorg-docs-1.4.ebuild
index e539fbeee665..0dec675823ca 100644
--- a/app-doc/xorg-docs/xorg-docs-1.4.ebuild
+++ b/app-doc/xorg-docs/xorg-docs-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/xorg-docs-1.4.ebuild,v 1.14 2008/04/25 20:29:20 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/xorg-docs/xorg-docs-1.4.ebuild,v 1.15 2009/05/04 15:51:28 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -20,13 +20,15 @@ IUSE="doc"
 
 PATCHES="${FILESDIR}/1.1-allow_manpages_only.patch"
 
-CONFIGURE_OPTIONS="--with-x11docdir=/usr/share/doc/${PF}
-	$(use_enable doc non-man-docs)
-	--disable-txt
-	--disable-pdf
-	--disable-html
-	--disable-ps"
-#	$(use_enable doc txt)"
-#	$(use_enable doc pdf)
-#	$(use_enable doc html)
-#	$(use_enable doc ps)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="--with-x11docdir=/usr/share/doc/${PF}
+		$(use_enable doc non-man-docs)
+		--disable-txt
+		--disable-pdf
+		--disable-html
+		--disable-ps"
+	#	$(use_enable doc txt)"
+	#	$(use_enable doc pdf)
+	#	$(use_enable doc html)
+	#	$(use_enable doc ps)"
+}