Use python-single-r1 like 2.99.1, and remove support for python3_3 (beaker doesn't support it yet)

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x560FDD64

3 files changed, 67 insertions, 79 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 7d061d192bed..63b096f5fde0 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.245 2013/09/13 20:42:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.246 2013/09/15 20:43:04 nirbheek Exp $
+
+  15 Sep 2013; Nirbheek Chauhan <nirbheek@gentoo.org> rhythmbox-3.0-r1.ebuild:
+  Use python-single-r1 like 2.99.1, and remove support for python3_3 (beaker
+  doesn't support it yet)
 
 *rhythmbox-3.0-r1 (13 Sep 2013)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index a805cf99fbfd..b372fdd7cdf3 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -11,23 +11,23 @@ DIST rhythmbox-2.99.1.tar.xz 6376048 SHA256 ed30bb534a789e2b50f953e33eee0bb09f38
 DIST rhythmbox-3.0.tar.xz 6383092 SHA256 bf6f35c1a46867d16e45969f97f01630d936bfa92baf940c442f3a19fb6820e4 SHA512 df52d3bf9810c023eabdab849a0aa5a2bbdf0573afbb4d3bdbd12148e165ad9f1db67435cc16ece7deb83ddb26d741f73fbfa2a3269f29643a54fb5aef8dd7ca WHIRLPOOL 9d066f3909b12a459bffb415bba29f8472385952a43ec5803c36d0df03025d34902947f2b5ed2df3911c7225dcf02d0d5bfb6c43d61aa4bb5fe9f1b5f63af73b
 EBUILD rhythmbox-0.12.8-r1.ebuild 5050 SHA256 a39127c2a15e508f38e2e1a4f3bb3a99817887b6b9df6dc9559f42def17c9232 SHA512 4ceab4e1c293f90e0d356bdf5b268a42ee996241d65149ec0b71ae363e5ffe4b0d7b3ae54c8ec6ebd85f8ad095b6d43d72d325279e3d845305a510fde2b0b5d5 WHIRLPOOL 69b7e8671ca2a7946126bcf880a495bb72120c6a124dff213be457850fdffe7e84d14ea69f10113eb1acd24e9b381ec87723a995587887cd43337d754ebc2c87
 EBUILD rhythmbox-2.99.1.ebuild 3755 SHA256 ba75cda7f5d0341415f1ad78523020dc22998c31f71c0b4d7b93b70e496e01c4 SHA512 de7dcb0905b9a55b4aaead305783d7cad1f0b74180eccbc47d565d194383d5d5958fc15fc4eabe1454bb7072886d521a4696f5c571faa14d52d9af02e27fa82e WHIRLPOOL 0aa3e5b48d2b8adb2869a9dd68d2ac37232591bcf3679553df8b76c7e9070602df93a254f5202ca6daa83ccd0d9b9e5b995e4c513d12ea8992a9c873e365211b
-EBUILD rhythmbox-3.0-r1.ebuild 4816 SHA256 e85daa5bc3f918231ec357e5919464a719f8c815b54f571dd3ca410edd2358f6 SHA512 e98832f447f0a093de741bb09b9acc5a0d10ce14c0b104ad47286d49fa8156117d72303abd7746bde1a24e2d65bb2a71c8f426ad1a3fcef42e966acb9425d0c8 WHIRLPOOL 6740e86d4ff636ad7061f3704c4e10954fdad213701497a709ccbb393d3065db2e35bc1e9c6755930b0c280807f894c0da378cd0b7576bde4fad7009b1dd0659
-MISC ChangeLog 39160 SHA256 d0e499b0d5a2a88556ba769607a1d79a2fdb9d2cff8a5e1820bd866d96795c9a SHA512 1c1b581bcc9180fbebb6806de6eb7d14289149932863c767a081418c99ccabeb623469037c211f58db341789840b8c8c9c93df960c401d9fc047b3b6d71bed13 WHIRLPOOL 8fd424ceb0571165a7791b3813ad8d101d7aac378317f08f2975dcc16a111a6a7b9cf2fd6a47b618ba4ba213b24de4e9fab9edb97682267c7bd4770e85cdc08b
+EBUILD rhythmbox-3.0-r1.ebuild 4548 SHA256 165074cfcc2fe2881c7049a3657faf8e00dea56319a4959114027bca53e2ebc7 SHA512 8c096ac95f6b14dbf083a14bff6371b43bde49786c0dc5c0f1da851bf4bfd02af859529d138246b8c2e7c7f91ef92afc746f65271c72717666c61620ab3dc65a WHIRLPOOL 07130598df9fc884875c91ca73639892adbb1d32642d6a33e4fb62c30595b0754cba94f8ec9f62f02d232fb24e1d606d7250cec449902591b322699655fbd21d
+MISC ChangeLog 39343 SHA256 51efd72767325d30f6b14c4c2ec653098a235ed07ee0def8c925460861779e29 SHA512 049ca8a9adacccdc6d55452384ddad90f37f85906c39c9942edc05bf15b9d28060b80a32eb99ab8ec97e3922f9aaaf5d426b66d8dc19049b2894bfd7aa1219e9 WHIRLPOOL f3b53729668196aca3da41ba0396f4636b5e99538f7a12c229996c9b6a177bc0d05204cb66b687885b60c4818d82e7732915836f7e022725eccfeef53a6958b3
 MISC metadata.xml 896 SHA256 f6abea71ad6bc892f9fe7ab8afa9feb92a8d88f2ff93fc97cd0230c29488a0d8 SHA512 e3274a126bdec105503b2dce88670da612be90d8534ab58e2b17861558ea682512b242960ee6b8fa59fa9529b86e9813f59ea2e038da0eabd889368346c1853f WHIRLPOOL 9ba056a5187562b731ebcfe97f9734c05e3ae487a069474c5b25a6d4e6b5e50803ae899c17a2be393241cfa87630610db86a3869adde98b57c10c4173f6fadd3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSM3jPAAoJEO/kOhxWD91k8ykP/ibzolQiqeFOKHmv0XSs35rj
-UguCLV6WGwDKRh+AMpNS3GFpEx09+Ny2Pa73hlgX7vI4d/1vICNFOjdsBtT07T/7
-ZD9SMWx+3U9B7f8DSFxPW4Gc6Dxv84cmwcaNgAmzz2XMLybNXmSo6T+P+cPksAKj
-xBG1lkGGnqImJqMKanC4WFkYglLv9r8T38/73MKC+ZCRfg51vcn/m1TIyn96SU3X
-zUG//O9vGNKpfzwuEX28L8Gl47gWR/tIBgJOY0B9VJ2soy+q2Pt5s3DE4eRNrzoU
-hPJ18pxxSwnDri8Tv5bomgDzRB/oYvlrV7BnHAYGNtEkzogKiLe0taNFeRcke9Rx
-knss8hUrwd8lKFG8BOs774RMtn3uSui12dFG/IaxlsCzG0J2LTl2a6BJzwv/iJBG
-zVGCmd8SCe6dnbXIEuiegwuXs2aDLp8p+N+qX6HC+hrV1lyoToESMAeCrVh4jV7g
-b7CiVaKgwMO9mg38BJN8dNg1xm9mhbP/KlqR5kCDYoJQWCbU7gzLJL3a2KSwDYYB
-Wsn/GzTh6fVgc1B8zb1Dz/VezvK3NT8rFO+Wv39oJbQoAqXfAzSuHB0Gze2ye4Pa
-/WD5nEBMk6siyIai7vgVu0yywPDmZc0xUEQWViz08WB7Mh+OhKZkw5wjKkzx1CVq
-Il4gKCTsoWSXsvdPMP9W
-=MiJs
+iQIcBAEBCAAGBQJSNhvhAAoJEO/kOhxWD91kuQIQAKJtubnRr6Ck3wOeHl8t8i08
+0cZOKm6r0egWaVSwG0QbtTYHZLjNx0ifGiLkOIeoenio68t9wFNgHXRQFEpN1FLE
+yNBrY2aMI4Yl1x7/hDx9yOw+NNw0qkigKIVeTWtHayN6xT98XvDJfsE9JywH1j5O
++QG4cAuXsKiJwFxCYy3D2IFXD/PLwXVPB9Y0wFC03CYoDevDdX4PoCN98N0lkyau
+Wj0P4mzd93YEF4K0oxS3CE+X7+8xaEjYqzIEPN7lWK5tqxNJ++NmL9yT9ZuHTpOn
+PuQf0lzDtK1EaK1Stb44LFCNv3sG+dd5OSFPJIU2cFMuebY1JZPE3qdO3rc/dR7L
+rmcpxFMdduB0q5MaWQ+6PXg68rY0wOhuWo5NLYK/00M2HZ6HM/51rWI0hrx3/Zmu
+mTLvu1/zPEZ9FW2pBrNjxNVtLJlOn5b8FAUHWEGszJ+IC0gHsxvvqcATs5tXioiz
+z6sOQ8MtUarnRvu00Cz4qqiHXi9xw0Op7ZXtwhZSyA/J254oguyN+AqNFT4olbc0
+ZfquwEXxDCFYKw6W+x01K2kA5o9Vu00HGsVgaJ1qyVHHfcuT7sF2qyIkT93XfEDk
+eqwLoXgs5jtUjj/Lfi62KqamkZwymcvx5+7xMAjOc1Tgug1URDyb/f1VmjCL9a5c
+lWioIXUTV1KJSBhVY8RG
+=dGaU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/rhythmbox-3.0-r1.ebuild b/media-sound/rhythmbox/rhythmbox-3.0-r1.ebuild
index 39e57d7517c1..f329a0ac4ccd 100644
--- a/media-sound/rhythmbox/rhythmbox-3.0-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.0-r1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.0-r1.ebuild,v 1.1 2013/09/13 20:42:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.0-r1.ebuild,v 1.2 2013/09/15 20:43:04 nirbheek Exp $
 
-EAPI="4"
+EAPI="5"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 3:3.2"
-PYTHON_USE_WITH="xml"
-PYTHON_USE_WITH_OPT="python"
+PYTHON_COMPAT=( python3_2 )
+PYTHON_REQ_USE="xml"
 
-inherit eutils gnome2 python multilib virtualx
+inherit eutils gnome2 python-single-r1 multilib virtualx
 
 DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
@@ -17,11 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="cdr daap dbus doc +libsecret html ipod libnotify lirc mtp nsplugin +python
 test +udev upnp-av visualizer webkit zeitgeist"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="
 	ipod? ( udev )
@@ -33,8 +28,8 @@ REQUIRED_USE="
 # webkit-gtk-1.10 is needed because it uses gstreamer-1.0
 #
 # To add support for libdmapsharing-2.9.19, use commit 	92d75eaa from git
-COMMON_DEPEND=">=dev-libs/glib-2.34.0:2
-	dev-libs/json-glib
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34.0:2
 	>=dev-libs/libxml2-2.7.8:2
 	>=x11-libs/gtk+-3.6:3[introspection]
 	>=x11-libs/gdk-pixbuf-2.18.0:2
@@ -43,9 +38,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.34.0:2
 	>=dev-libs/totem-pl-parser-3.2.0
 	>=net-libs/libsoup-2.26:2.4
 	>=net-libs/libsoup-gnome-2.26:2.4
-	>=media-libs/gst-plugins-base-0.11.92:1.0[introspection]
-	>=media-libs/gstreamer-1.0.0:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-libs/gstreamer:1.0[introspection]
 	>=sys-libs/tdb-1.2.6
+	dev-libs/json-glib
 
 	visualizer? (
 		>=media-libs/clutter-1.8:1.0
@@ -62,7 +58,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.34.0:2
 	html? ( >=net-libs/webkit-gtk-1.10:3 )
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 	lirc? ( app-misc/lirc )
-	python? ( >=dev-python/pygobject-3.0:3 )
+	python? ( >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] )
 	udev? (
 		virtual/udev[gudev]
 		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
@@ -89,7 +85,7 @@ RDEPEND="${COMMON_DEPEND}
 		dbus? ( sys-apps/dbus )
 		libsecret? ( >=app-crypt/libsecret-0.14[introspection] )
 		webkit? (
-			dev-python/mako
+			dev-python/mako[${PYTHON_USEDEP}]
 			>=net-libs/webkit-gtk-1.10:3[introspection] ) )
 "
 # gtk-doc-am needed for eautoreconf
@@ -101,45 +97,15 @@ DEPEND="${COMMON_DEPEND}
 	>=app-text/gnome-doc-utils-0.9.1
 	doc? ( >=dev-util/gtk-doc-1.4 )
 	test? ( dev-libs/check )"
-DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
 
 pkg_setup() {
-	if use python; then
-		python_set_active_version 3
-		python_pkg_setup
-		G2CONF="${G2CONF} PYTHON=$(PYTHON -3)"
-	fi
-
-	# --enable-vala just installs the sample vala plugin, and the configure
-	# checks are broken, so don't enable it
-	G2CONF="${G2CONF}
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		--enable-mmkeys
-		--disable-more-warnings
-		--disable-schemas-compile
-		--disable-static
-		--disable-vala
-		--without-hal
-		$(use_enable visualizer)
-		$(use_enable daap)
-		$(use_enable libnotify)
-		$(use_enable lirc)
-		$(use_enable nsplugin browser-plugin)
-		$(use_enable python)
-		$(use_enable upnp-av grilo)
-		$(use_with cdr brasero)
-		$(use_with daap)
-		$(use_with libsecret)
-		$(use_with html webkit)
-		$(use_with ipod)
-		$(use_with mtp)
-		$(use_with udev gudev)"
-
-	export GST_INSPECT=/bin/true
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
+	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
 	# https://bugzilla.gnome.org/show_bug.cgi?id=706470
 	# In git, remove for bump
 	epatch "${FILESDIR}/${P}-gdbus-return-value.patch"
@@ -147,8 +113,37 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=708044
 	epatch "${FILESDIR}/${P}-rbzeitgeist-python3.patch"
 
+	rm -v lib/rb-marshal.{c,h} || die
 	gnome2_src_prepare
-	echo > py-compile
+}
+
+src_configure() {
+	# FIXME: bug???
+	export GST_INSPECT=/bin/true
+
+	# --enable-vala just installs the sample vala plugin, and the configure
+	# checks are broken, so don't enable it
+	gnome2_src_configure \
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
+		VALAC=$(type -P valac-0.14) \
+		--enable-mmkeys \
+		--disable-more-warnings \
+		--disable-static \
+		--disable-vala \
+		--without-hal \
+		$(use_enable visualizer) \
+		$(use_enable daap) \
+		$(use_enable libnotify) \
+		$(use_enable lirc) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable python) \
+		$(use_enable upnp-av grilo) \
+		$(use_with cdr brasero) \
+		$(use_with html webkit) \
+		$(use_with ipod) \
+		$(use_with libsecret) \
+		$(use_with mtp) \
+		$(use_with udev gudev)
 }
 
 src_test() {
@@ -158,19 +153,8 @@ src_test() {
 }
 
 pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
-	fi
-
 	ewarn
 	ewarn "If ${PN} doesn't play some music format, please check your"
 	ewarn "USE flags on media-plugins/gst-plugins-meta:1.0"
 	ewarn
 }
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
-}