Version bump, switch to EAPI=5 and python-r1. Drop old revisions.

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

6 files changed, 101 insertions, 322 deletions

diff --git a/app-accessibility/caribou/ChangeLog b/app-accessibility/caribou/ChangeLog
index 89ceb243ada8..46b9c437c8c7 100644
--- a/app-accessibility/caribou/ChangeLog
+++ b/app-accessibility/caribou/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/caribou
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/ChangeLog,v 1.17 2013/01/06 09:10:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/ChangeLog,v 1.18 2013/01/13 15:41:08 eva Exp $
+
+*caribou-0.4.6 (13 Jan 2013)
+
+  13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> -caribou-0.4.1.ebuild,
+  -caribou-0.4.1-r1.ebuild, -caribou-0.4.2.ebuild, -caribou-0.4.4.ebuild,
+  +caribou-0.4.6.ebuild:
+  Version bump, switch to EAPI=5 and python-r1. Drop old revisions.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> caribou-0.4.5.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/app-accessibility/caribou/caribou-0.4.1-r1.ebuild b/app-accessibility/caribou/caribou-0.4.1-r1.ebuild
deleted file mode 100644
index 68020f898182..000000000000
--- a/app-accessibility/caribou/caribou-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.1-r1.ebuild,v 1.4 2012/02/25 00:42:47 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-inherit gnome2 python
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://live.gnome.org/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-python/pygobject-2.90.3:3
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7
-	dev-libs/libgee:0
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python
-	>=dev-python/pyatspi-2.1.90
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	app-text/gnome-doc-utils"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-gtk3-module
-		--enable-gtk2-module
-		PYTHON=${EPREFIX}/usr/bin/python2
-		VALAC=$(type -P valac-0.14)" # harmless even if valac-0.14 not found
-	# PYTHON is substituted into several installed shell scripts
-	# vala is not needed for tarball builds, but configure checks for it...
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-i bin/{antler-keyboard,caribou,caribou-preferences}.in ||
-		die "sed failed"
-
-	python_clean_py-compile_files
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize caribou
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup caribou
-}
diff --git a/app-accessibility/caribou/caribou-0.4.1.ebuild b/app-accessibility/caribou/caribou-0.4.1.ebuild
deleted file mode 100644
index 8d75f85a0b8e..000000000000
--- a/app-accessibility/caribou/caribou-0.4.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.1.ebuild,v 1.4 2012/02/10 04:03:48 patrick Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-inherit gnome2 python
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://live.gnome.org/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-python/pygobject-2.90.3:3
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7
-	dev-libs/libgee:0
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python
-	>=dev-python/pyatspi-2.1.90
-	gnome-base/gconf[introspection]
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/librsvg:2
-	sys-apps/dbus"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	app-text/gnome-doc-utils"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-gtk3-module
-		--enable-gtk2-module
-		VALAC=$(type -P true)"
-	# vala is not needed for tarball builds, but configure checks for it...
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-i bin/{antler-keyboard,caribou,caribou-preferences}.in ||
-		die "sed failed"
-
-	# disable pyc compiling
-	echo '#!/bin/sh' > py-compile
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize caribou
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup caribou
-}
diff --git a/app-accessibility/caribou/caribou-0.4.2.ebuild b/app-accessibility/caribou/caribou-0.4.2.ebuild
deleted file mode 100644
index d434a36f5da6..000000000000
--- a/app-accessibility/caribou/caribou-0.4.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.2.ebuild,v 1.1 2012/05/14 00:53:54 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-inherit gnome2 python
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://live.gnome.org/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-python/pygobject-2.90.3:3
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7
-	dev-libs/libgee:0
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python
-	>=dev-python/pyatspi-2.1.90
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus"
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-gtk3-module
-		--enable-gtk2-module
-		PYTHON=${EPREFIX}/usr/bin/python2
-		VALAC=$(type -P valac-0.14)" # harmless even if valac-0.14 not found
-	# PYTHON is substituted into several installed shell scripts
-	# vala is not needed for tarball builds, but configure checks for it...
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-i bin/{antler-keyboard,caribou,caribou-preferences}.in ||
-		die "sed failed"
-
-	python_clean_py-compile_files
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize caribou
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup caribou
-}
diff --git a/app-accessibility/caribou/caribou-0.4.4.ebuild b/app-accessibility/caribou/caribou-0.4.4.ebuild
deleted file mode 100644
index c9a67f126508..000000000000
--- a/app-accessibility/caribou/caribou-0.4.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.4.ebuild,v 1.1 2012/09/08 22:23:30 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-inherit gnome2 python
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://live.gnome.org/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-python/pygobject-2.90.3:3
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7
-	dev-libs/libgee:0
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python
-	>=dev-python/pyatspi-2.1.90
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-gtk3-module
-		--enable-gtk2-module
-		PYTHON=${EPREFIX}/usr/bin/python2
-		VALAC=$(type -P valac-0.18)" # harmless even if valac-0.14 not found
-	# PYTHON is substituted into several installed shell scripts
-	# vala is not needed for tarball builds, but configure checks for it...
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-i bin/{antler-keyboard,caribou,caribou-preferences}.in ||
-		die "sed failed"
-
-	python_clean_py-compile_files
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize caribou
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup caribou
-}
diff --git a/app-accessibility/caribou/caribou-0.4.6.ebuild b/app-accessibility/caribou/caribou-0.4.6.ebuild
new file mode 100644
index 000000000000..c5210df27c02
--- /dev/null
+++ b/app-accessibility/caribou/caribou-0.4.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.6.ebuild,v 1.1 2013/01/13 15:41:08 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Input assistive technology intended for switch and pointer users"
+HOMEPAGE="https://live.gnome.org/Caribou"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3:3[introspection]
+	x11-libs/gtk+:2
+	>=dev-libs/gobject-introspection-0.10.7
+	dev-libs/libgee:0.8
+	dev-libs/libxml2
+	>=media-libs/clutter-1.5.11:1.0[introspection]
+	x11-libs/libX11
+	x11-libs/libxklavier
+	x11-libs/libXtst
+"
+# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
+# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
+# librsvg needed to load svg images in css styles
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
+	>=gnome-base/gsettings-desktop-schemas-3
+	gnome-base/librsvg:2
+	sys-apps/dbus
+	virtual/python-argparse[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig"
+
+src_prepare() {
+	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
+	# + caribou is python2 only so fix the shell scripts
+	sed -e '/export PYTHONPATH=.*python/ d' \
+		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
+		-i bin/{antler-keyboard,caribou,caribou-preferences}.in ||
+		die "sed failed"
+
+	gnome2_src_prepare
+
+	prepare_caribou() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_caribou
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			--disable-static \
+			--enable-gtk3-module \
+			--enable-gtk2-module \
+			VALAC=$(type -P true)
+		#	PYTHON=${EPREFIX}/usr/bin/python2
+	# PYTHON is substituted into several installed shell scripts
+	# vala is not needed for tarball builds, but configure checks for it...
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}