Switch to python-r1, bug #458788. Do not install gtester-report man page with USE=-utils, bug #439344.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 34 insertions, 34 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 912fec6e581d..713d6f1cd5a5 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.554 2013/03/28 16:05:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.555 2013/04/07 17:33:00 eva Exp $
+
+  07 Apr 2013; Gilles Dartiguelongue <eva@gentoo.org> glib-2.36.0.ebuild:
+  Switch to python-r1, bug #458788. Do not install gtester-report man page with
+  USE=-utils, bug #439344.
 
 *glib-2.36.0 (28 Mar 2013)
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 0457e68ee914..f0e053da19dc 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -34,13 +34,13 @@ EBUILD glib-2.30.3.ebuild 8710 SHA256 054b34dc568b5a63abc412a574d7c0697a70aa8048
 EBUILD glib-2.32.4-r1.ebuild 8167 SHA256 441ad904bbc1c2c1f8b489b71340201e159ded985637782673b21d0f46ecdb08 SHA512 9abe19daf097d270aa39e05b73c095f3bf505c786e0a1c69924ebc69a583d5690f1d8292ba1aeb051c7a249d47372d33c0196ff8bf4b472eb15eb8231049d573 WHIRLPOOL 0fc1cb8c94f37c3165f2a5b0192d7aadcf2b000ae0a8e35734ea1dbf6077b5a6fc8a3b2477a2b16201ab1f182809d3b60aa16f7ef4dea23d37d4bad19243287e
 EBUILD glib-2.34.2.ebuild 8264 SHA256 6461d2cc4ac2c90d8ead212e919053fcc3d057f4daad1ff9149e569c09491a98 SHA512 16409c353ef4df6c79142f6f0b89932d36a1b76627709ec528660d47ab54c6f94db71b2fbd19eddabfabdef35394a6ab9b51aaf802a760e7aaac09ea79b5d26a WHIRLPOOL 7a4963ba6b44fb1e18f8437700a53b0d40436c93045192ee60b0b49ba7f1d04cd5ea484c8104598182382e48af2577cffd00e7908beb2ed3e1663e7bab14a7a9
 EBUILD glib-2.34.3.ebuild 8443 SHA256 d41140889ea89dfcd563ffa4a794cc140664ffcac27d2fc2f93d5af2371b0dc5 SHA512 3a6e2b6fc0d020b876ab30452d41444ab5adcfe14011dda2eaf91bef5da53026fb41633b637603ef0d3b52cb0324a7824b155aecd821f2c682a720a2e394260b WHIRLPOOL 199ebc15e676471aaaf193e9f6f8c7587e65961b67999bdf619007a1e72997100273c1381ef1f2a3030f5756017c1101712b62c13ab55ff0815270c6e771adb9
-EBUILD glib-2.36.0.ebuild 8456 SHA256 56ddb60cd5a5840997f17a77c3ea452d810e125854057c25b17d86eaf480a01d SHA512 c399861c21f0b10d77b55848541b0bc944a2fb8a492c33f5fdc351cce5c22de29b8bbe4da157dff9a1149d6b792eddd638fa0bc89b0a52e4c11793a9a343d6d1 WHIRLPOOL f871df096d40e6a8af1f9ff8ea3a3723b7427116a6dce97921a2368b87ac016f52b01a26be55a44e75653a8e4310f8a3ef9136abf64cf2db035aee89d08d1d40
-MISC ChangeLog 76034 SHA256 b6d02164b8ff57614cca64360124546017a3e1357281278c4ed869dca50577e2 SHA512 ece7cd5945eb2446039b0418fef97c039969023a5f368bd188f4e2eb704097e509c07718536b96ef7a14f81efcd74759f9b96c6f05301966aa1c6c39067b68ac WHIRLPOOL e4553ccf232a56d32bfceef68f166447d16620fbc4efc47b5ceb14112c230212ea0ff213bd5457c6f40c9c1e305c59aabfe7d6341bfc66999d9ce42be829d0e7
+EBUILD glib-2.36.0.ebuild 8360 SHA256 daabc480ec8f536efa265643b8c3340fa6ce12f30bd800c85d3abf094833d0ea SHA512 5da13a2005614b7ea73add590739cf7412ed04bbf1e077125f99a5c171e9250ee742eb2c75b2ea86c8b8a1e90448c99414a21fe2852887a282243f7b525e8923 WHIRLPOOL 35b4ca1789588ed6217e2a9a6284e8499da5a02e9e87673dc3e668e004b72fafb22a46a7a73f41d1de8ad02f3b6131b7a36783eed363318c6c29fc8e93d9a820
+MISC ChangeLog 76214 SHA256 7c24c5dac74dd1c58f9b31e0280c8f26f1e8bbb6ec3a284682b76a139a53c6ea SHA512 41c0bd109d25f1ecfb70b835746db7810b44f4a1d5cd4785250f075e6b894805a2894d299fc0e85fa32f656514c272513bce52ec2a7721cb67b401c15099c962 WHIRLPOOL 6971ab45a1be5a4e134074dbc2e956b91ff2948fc5c01108f993fe99227680ed6d3880961fd80964ecebe389d7fd1c0c3a36dbea74c62df0347264b5e9ac65eb
 MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUajQACgkQCaWpQKGI+9RJagCgiGRcLgNOmcCV+9TbjCjje9+N
-HdQAn2AbamLx7BVnTdsnzck7lin3zvrd
-=OyB+
+iEYEAREIAAYFAlFhrc0ACgkQ1fmVwcYIWAanZQCgrrdRukkDH92B3DqXghT9DVnd
+wF4An15j7N0+RYl9tDKnr/1XtNa2600U
+=45rW
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.36.0.ebuild b/dev-libs/glib/glib-2.36.0.ebuild
index eba105060858..744199a4d8cd 100644
--- a/dev-libs/glib/glib-2.36.0.ebuild
+++ b/dev-libs/glib/glib-2.36.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.0.ebuild,v 1.1 2013/03/28 16:05:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.0.ebuild,v 1.2 2013/04/07 17:33:00 eva Exp $
 
 EAPI="5"
-PYTHON_DEPEND="utils? 2"
+PYTHON_COMPAT=( python2_{5,6,7} )
 # Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs virtualx linux-info
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -18,7 +18,8 @@ SLOT="2"
 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 ~arm-linux ~x86-linux"
 
-RDEPEND="virtual/libiconv
+RDEPEND="
+	virtual/libiconv
 	virtual/libffi
 	sys-libs/zlib
 	|| (
@@ -26,7 +27,10 @@ RDEPEND="virtual/libiconv
 		>=dev-libs/libelf-0.8.12 )
 	xattr? ( sys-apps/attr )
 	fam? ( virtual/fam )
-	utils? ( >=dev-util/gdbus-codegen-${PV} )"
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-libs/libxslt-1.0
@@ -35,22 +39,17 @@ DEPEND="${RDEPEND}
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
 		sys-devel/gdb
-		=dev-lang/python-2*
-		>=dev-util/gdbus-codegen-${PV}
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
 		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
+	!<dev-util/gtk-doc-1.15-r2
+"
 PDEPEND="x11-misc/shared-mime-info
 	!<gnome-base/gvfs-1.6.4-r990"
 # shared-mime-info needed for gio/xdgmime, bug #409481
 # Earlier versions of gvfs do not work with glib
 
 pkg_setup() {
-	# Needed for gio/tests/gdbus-testserver.py
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"
 		linux-info_pkg_setup
@@ -109,10 +108,11 @@ src_prepare() {
 	# bashcomp goes in /usr/share/bash-completion
 	epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
 
-	epatch_user
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
 
-	# disable pyc compiling
-	use test && python_clean_py-compile_files
+	epatch_user
 
 	# Needed for the punt-python-check patch, disabling timeout test
 	# Also needed to prevent croscompile failures, see bug #267603
@@ -145,12 +145,6 @@ src_configure() {
 	# -- compnerd (3/27/06)
 	use debug && myconf="--enable-debug"
 
-	if use test; then
-		myconf="${myconf} --enable-modular-tests"
-	else
-		myconf="${myconf} --disable-modular-tests"
-	fi
-
 	# Always use internal libpcre, bug #254659
 	econf ${myconf} \
 		$(use_enable xattr) \
@@ -159,6 +153,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
+		$(use_enable test modular-tests) \
 		--enable-man \
 		--with-pcre=internal \
 		--with-threads=posix \
@@ -166,13 +161,13 @@ src_configure() {
 }
 
 src_install() {
-	local f
+	emake install DESTDIR="${D}"
 
-	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
-	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
-
-	if ! use utils; then
+	if use utils ; then
+		python_replicate_script "${ED}"/usr/bin/gtester-report
+	else
 		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
 	fi
 
 	# Do not install charset.alias even if generated, leave it to libiconv
@@ -197,6 +192,7 @@ src_test() {
 	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
 	unset GSETTINGS_BACKEND # bug 352451
 	export LC_TIME=C # bug #411967
+	python_export_best
 
 	# Related test is a bit nitpicking
 	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"