Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 82 insertions, 78 deletions

diff --git a/gnome-extra/gnome-tweak-tool/ChangeLog b/gnome-extra/gnome-tweak-tool/ChangeLog
index 279153a76d2b..3c14fcffb78f 100644
--- a/gnome-extra/gnome-tweak-tool/ChangeLog
+++ b/gnome-extra/gnome-tweak-tool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-tweak-tool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.8 2012/05/19 09:12:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/ChangeLog,v 1.9 2012/12/25 19:10:36 eva Exp $
+
+*gnome-tweak-tool-3.6.1-r1 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-tweak-tool-3.2.2-r2.ebuild, +gnome-tweak-tool-3.6.1-r1.ebuild:
+  Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass.
 
 *gnome-tweak-tool-3.4.0.1 (19 May 2012)
 
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r2.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r2.ebuild
deleted file mode 100644
index a737dcaf3ff2..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.2.2-r2.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="http://live.gnome.org/GnomeTweakTool"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=gnome-base/gsettings-desktop-schemas-3
-	>=dev-python/pygobject-2.90.0:3
-	gnome-base/gconf:2"
-# g-s-d, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gconf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	gnome-base/gnome-shell
-	>=gnome-base/nautilus-3
-	x11-wm/metacity"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF} --disable-schemas-compile"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch"
-
-	# Patch from upstream git master; user theme extension ID changed in 3.2.2
-	epatch "${FILESDIR}/${PN}-3.2.2-user-theme-ext-id.patch"
-
-	# From upstream git master; fix gnome-shell-3.2.1-r2 compat (bug #398385)
-	epatch "${FILESDIR}/${PN}-3.2.2-gnome-shell-3.2.1-r2.patch"
-
-	# From upstream git master; more useful error on missing schemas
-	epatch "${FILESDIR}/${PN}-3.2.2-missing-schemas-error.patch"
-
-	# disable pyc compiling
-	echo > py-compile
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${ED}"/usr/bin/gnome-tweak-tool
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize gtweak
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup gtweak
-}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..0dcf43e06034
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1-r1.ebuild,v 1.1 2012/12/25 19:10:36 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="Tool to customize GNOME 3 options"
+HOMEPAGE="http://live.gnome.org/GnomeTweakTool"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=gnome-base/gsettings-desktop-schemas-3.4
+	>=dev-python/pygobject-3.2.1:3[${PYTHON_USEDEP}]
+	gnome-base/gconf:2
+"
+# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gconf:2[introspection]
+	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
+	x11-libs/gtk+:3[introspection]
+
+	>=gnome-base/gnome-settings-daemon-3
+	gnome-base/gnome-shell
+	>=gnome-base/nautilus-3
+	x11-wm/metacity
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Add contents of Gentoo's cursor theme directory to cursor theme list
+	epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch"
+
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	install_python() {
+		gnome2_src_install
+		python_doscript gnome-tweak-tool || die
+	}
+	python_foreach_impl run_in_build_dir install_python
+}
+
+run_in_build_dir() {
+    pushd "${BUILD_DIR}" > /dev/null || die
+    "$@"
+    popd > /dev/null
+}
+