Set PYTHON_REQUIRED_USE (#519082 by Paweł Stankowski), drop old.

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

4 files changed, 14 insertions, 101 deletions

diff --git a/app-text/gnome-doc-utils/ChangeLog b/app-text/gnome-doc-utils/ChangeLog
index 375920e92c61..116cfe8663b1 100644
--- a/app-text/gnome-doc-utils/ChangeLog
+++ b/app-text/gnome-doc-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/gnome-doc-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.225 2014/06/20 14:44:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/ChangeLog,v 1.226 2014/09/07 13:36:14 pacho Exp $
+
+  07 Sep 2014; Pacho Ramos <pacho@gentoo.org> -gnome-doc-utils-0.20.10.ebuild,
+  gnome-doc-utils-0.20.10-r1.ebuild:
+  Set PYTHON_REQUIRED_USE (#519082 by Paweł Stankowski), drop old.
 
   20 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
   gnome-doc-utils-0.20.10-r1.ebuild:
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 7ec3def8b938..b4a5f38575ec 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -3,24 +3,13 @@ Hash: SHA256
 
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 SHA256 bd9b785064554ab872175154a7e9fdd74f5566b66b057fef93cea6bfc323c958 SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c WHIRLPOOL eafde10cb49f211ffe315efbf58b1015136729be74b3617ba612a0091bf27e7b6a2f33881f5bd5667d38a4d8e19d706762b70a09e765bd4be79a38ad5e8215f1
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 SHA256 cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6 SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151 WHIRLPOOL b840fd722ba7994aa587a85159cb1873c710bf5074ce7c1c6c0cfb601847b5ae3aea1584f43daa4cbcbb4d486c0b6609115191c5eacf4c23f99d42a696791011
-EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1880 SHA256 192553da52d0c8d05d3b7579fbb564fe7bd11235b62a4cf6485ddb148d62b8c9 SHA512 9150160a9a5c639a70db5929ba06ffe49e17ad430fbff513ca6b7c5f2b75a3c2c99264dc385ca0a2dc16fb0cfeab3fd6900cf36e5f110d5a2f3f4a6b728e30eb WHIRLPOOL 5a7a7a5bfa89cbc3b21ea4931e1f8a48559febd861b0b12f86eb0cd5d5fbc591b0495ce82ed69857a7cb0a5e3b40fba0dded1629aafd47b6d70898e2719bea3e
-EBUILD gnome-doc-utils-0.20.10.ebuild 2005 SHA256 3e3d8614d70d10ade9c6c488850f1ab2b6787999fced4d0e33391b7c3d5f0d0d SHA512 fb9ba5cc838a736db9d5d628a5ea5de4a5ebc1a5bddf1d61756e6812d183007d7aa4d273df15b0b2d4ffec7ee265c79239c44f5255b0d6211d68ba79b3e41fac WHIRLPOOL 4e9badaf413e1379a643e92afafbc2f2d7ddded945843c69bb84384e2952d8dd7e1e3ef6c4509ab9056e76b1ff0d80148b5f386017f55d573ea8c4e37793aa7d
-MISC ChangeLog 30165 SHA256 e4269ebc6589801c07634cb514c7d26deb4a0ad34b2d3751738b194e5c3df88b SHA512 dad0f0466d22f68b455c6a827f2d91da2c0a6149ac29dcbabdace51a447c36d69962987696087f20beda6e5cffaccf8eaf6aa640d7f598f8295685daf425e4f2 WHIRLPOOL 86dc8af71eeb14cb7710fd114d8e180fa2f1c97ec622a5e5598a65974d810b3066ef71589abcf91e6b575d936666b59501cca187753face0d26bd2f0007552c4
+EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1921 SHA256 d807abea065206d6d9e73b6879c605260c60527b985013622d21153aed3cc3f9 SHA512 4d35c4d8ac4ad62359f7682d0755cafa3fad716bb5c284aed6a906da88619d57ca29f96bfb1f9b001455bfce829358d84657d8aecabf3b3fde21169266a79d3a WHIRLPOOL 52aa0e18cab221d644e66a942d2c47b89c0200215e61246ccd09bbb7bd3307470ca5dd55ca3358918484cbca745abb90e62094ebee367baa91ba804dd5ce1117
+MISC ChangeLog 30352 SHA256 fbfe898a1face9136c7fb1a2c6d845b77309c4197c47b6b8d48201550eca8250 SHA512 a4bb16c14c22e1995ff0bb676ea1220052c244251d794035048220b3706f788b7fb540fe37da69c0bc16a35a7dedfbdf9f90ed50020db5294a7395b28dc7380a WHIRLPOOL 7a35951eb2147a26d3d40511a0c8fa9865b0f945c008953c3e16beb86ed461e47c1684f060e47a8a001e3c0bc64033c9731cefbf29497f005b3f17604d58593a
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTpEjfAAoJELp701BxlEWfLTYP/1F8nMVM9mVnRMBnYTBCLLwG
-Q3sacIDfNt/ssa62G7q7P880vkTqUcNP9rKrCvsXZdb32X9iET/lCEvMywsnGr7E
-Mj5TcP1cDYS6/MJvdjv/UHPvsp369AzLbs07duIncF5wOWVZCJwhakUWfGaY+CGM
-qldOuAddx9LlVeZmGVef7DJypwXSyKbg2+LPYCXroJrtPWBt4v/9vI4pZHIYnERh
-+ueWtxVTgw1xfrnmholbsEBcACsAyG0pF3h8ooFJBYKaxlR+TTnN9HEcLlJMwIEa
-LMdCxlH7jIFWBTqHBC/Yd+lVno8IrJfThtYrKJ70R6HCiWmR3WTjEugJyvBgWqVa
-YYSVcH8pw0VJ9vIyYOJT2iuXY46Ak7RxgoUZuj223E3ecQd+m9Fl5NfEmU5yTIR+
-IucahFiH2nGATvOJCikfKf71Ck5wHgN7NikVcIkpDS33NW20IIqEUhnWfmRZKYg4
-PTFpFPQwSM0Zj2OuU5OMCKO6rqB948T5cpp3T51wlNU0GxXKUrCIDaYfs/bq6gqT
-H1zY5WVJaKoJJEAoNOqd6ThNrrnqTD8/dBCFuiwySWvKW53ureAL4jZqTpxkiRUn
-7hEALINK23T7olvPjHS89CejBt/PWzcNf2CGwUinDz+3OBgTFR1KusybCXv/VPWs
-b4SuthGZvTJdbglqXjuc
-=IhLm
+iEYEAREIAAYFAlQMX08ACgkQCaWpQKGI+9SxzwCfRhzQqI19PEWzmAjOhZghNp4I
+pVYAnRYy339ssrZ9BYxWcUtVqjmsUPhX
+=IVfR
 -----END PGP SIGNATURE-----
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
index 3f96456b99be..e09876b6a02f 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild,v 1.14 2014/06/20 14:44:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild,v 1.15 2014/09/07 13:36:14 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,9 @@ HOMEPAGE="http://live.gnome.org/GnomeDocUtils"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild
deleted file mode 100644
index b8909aec14d2..000000000000
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild,v 1.13 2014/04/24 01:23:57 leio Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-
-inherit gnome2 python
-
-DESCRIPTION="A collection of documentation utilities for the Gnome project"
-HOMEPAGE="http://live.gnome.org/GnomeDocUtils"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.12[python]
-	 >=dev-libs/libxslt-1.1.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	app-text/docbook-xml-dtd:4.4
-	app-text/scrollkeeper-dtd
-	sys-devel/gettext
-	virtual/awk
-	virtual/pkgconfig"
-# dev-libs/glib needed for eautofoo, bug #255114.
-
-# If there is a need to reintroduce eautomake or eautoreconf, make sure
-# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-src_test() {
-	python_execute_function -d -s
-}
-
-src_install() {
-	installation() {
-		gnome2_src_install
-		python_convert_shebangs $(python_get_version) "${ED}"usr/bin/xml2po
-		mv "${ED}"usr/bin/xml2po "${ED}"usr/bin/xml2po-$(python_get_version)
-	}
-	python_execute_function -s installation
-	python_clean_installation_image
-
-	python_generate_wrapper_scripts -E -f "${ED}"usr/bin/xml2po
-}
-
-pkg_postinst() {
-	python_mod_optimize xml2po
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup xml2po
-	gnome2_pkg_postrm
-}