[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-tweak-tool/

[Gilles Dartiguelongue]

commit:     a5026f9a42ff4c4d0d46a50b9b9f6ef50773f676
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 19:11:01 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 19:11:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a5026f9a

gnome-extra/gnome-tweak-tool: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add metadata.xml.

---
 .../gnome-tweak-tool/gnome-tweak-tool-3.6.1.ebuild |   76 --------------------
 .../gnome-tweak-tool/gnome-tweak-tool-9999.ebuild  |   63 +++++++++-------
 gnome-extra/gnome-tweak-tool/metadata.xml          |    5 ++
 3 files changed, 40 insertions(+), 104 deletions(-)

diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1.ebuild
deleted file mode 100644
index 37972d1..0000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.6.1.ebuild
+++ /dev/null
@@ -1,76 +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.1 2012/01/10 17:38:32 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="http://live.gnome.org/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-COMMON_DEPEND="
-	>=gnome-base/gsettings-desktop-schemas-3.4
-	>=dev-python/pygobject-3.2.1:3
-	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"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF} --disable-schemas-compile"
-
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	epatch "${FILESDIR}/${PN}-3.0.4-gentoo-cursor-themes.patch"
-
-	python_clean_py-compile_files
-
-	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-9999.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-9999.ebuild
index 6dcc71e..5175986 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-9999.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-9999.ebuild
@@ -1,11 +1,11 @@
 # 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.1 2012/01/10 17:38:32 tetromino Exp $
+# $Header: $
 
-EAPI="4"
-GNOME2_LA_PUNT="yes"
+EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.6"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
@@ -26,50 +26,57 @@ fi
 
 COMMON_DEPEND="
 	>=gnome-base/gsettings-desktop-schemas-3.4
-	>=dev-python/pygobject-3.2.1:3
-	gnome-base/gconf:2"
-# g-s-d, gnome-shell etc. needed at runtime for the gsettings schemas
+	>=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]
+	>=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"
+	x11-wm/metacity
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF} --disable-schemas-compile"
-	python_set_active_version 2
-	python_pkg_setup
-}
+	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"
 
-	python_clean_py-compile_files
-
 	gnome2_src_prepare
+	python_copy_sources
 }
 
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${ED}"/usr/bin/gnome-tweak-tool
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
 }
 
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize gtweak
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
 }
 
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup gtweak
+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
+}
+

diff --git a/gnome-extra/gnome-tweak-tool/metadata.xml b/gnome-extra/gnome-tweak-tool/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>