Version bump. Cannot enable docs due to valadoc.

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

3 files changed, 59 insertions, 41 deletions

diff --git a/app-accessibility/caribou/ChangeLog b/app-accessibility/caribou/ChangeLog
index 46b9c437c8c7..65e11146572a 100644
--- a/app-accessibility/caribou/ChangeLog
+++ b/app-accessibility/caribou/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2013/01/13 15:41:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/ChangeLog,v 1.19 2013/01/25 23:56:24 eva Exp $
+
+*caribou-0.4.7 (25 Jan 2013)
+
+  25 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> -caribou-0.4.5.ebuild,
+  +caribou-0.4.7.ebuild:
+  Version bump. Cannot enable docs due to valadoc.
 
 *caribou-0.4.6 (13 Jan 2013)
 
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 59dffd3c1ad7..4012b417dfa7 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST caribou-0.4.5.tar.xz 366576 SHA256 607b5169fe358b5555fd3a9d89008d03d8ce862b2e13ba55aa4deffdb02be02b SHA512 1de5646f1b255dbc54199fa319f62752f79b3b63e3540fa9880446ca2619c886fa7e28ebfcaa7ccc879d1d9b4f5865728b661ffb424f54e629bc66e538a0c8d7 WHIRLPOOL 0c10c765dcdc5c40e20d8acceb111a75722847eaf03b77d31801c00d7084f863c63aae75741e0154aa5f612bfdc17c08587e5bcbc6b16addcac42e4f67de55ac
 DIST caribou-0.4.6.tar.xz 380844 SHA256 449890d53401c15ae7118ebc8ca1eebb7f9a60ad717bca35f822d7f895142226 SHA512 43dcb270a6d05cead322a537ec98363199018e7ef8d5169c8f3c7d9ec1ce04737ec1634bf944756a9ed14fa843e0b0ab5fafa3bc93ad1f7501129be21b4dface WHIRLPOOL a43045d1618c82adab912e9eb1ba5f279ae5b2eb1e0964876f74238c60b314f212afaac478f9c5a119bc32ec7983be059df055755760589de46300c24ad790a3
-EBUILD caribou-0.4.5.ebuild 2143 SHA256 fc7224e7d9dc6af51fe4e34ca51b63c22a2f5050fab848f267fd22ab4e6da73c SHA512 dabbe0d82b8ca81db945c3f9e0f82c36697212b0f93096002e7f91838a7311614a6a888896deaac7096e8c822aae7c3bbabb3313e8b279be2c9729c6951f7e12 WHIRLPOOL 0c618816fd951da961b5274633fb5f1f11924db709e2bab83066dd8bccdf0a42c3550849a5e98cbe2c394b8a16e1cd3300af114f8c1fbf4b5688b255d4cdac65
+DIST caribou-0.4.7.tar.xz 384856 SHA256 580406d72536ff23ee61cab416113fbc068cdc1fcaaedf1a4621f1d9ef9cf2e9 SHA512 52153e3ba305060823a61b29f13751cbaf6b67225a00f39895cab9054c40fc64f8153f289b5d1b967354ec1f6676b2a989a8a0710f5a95d7a299588e73f25b60 WHIRLPOOL 233f5f630c05b8b2fe68105ddca72a269adb46a87cbdd29344f14c80be4185e8bb99660800815d6834765371d434adb391ddf95907250c59b6499069e98f4499
 EBUILD caribou-0.4.6.ebuild 2503 SHA256 6dabeda40cd1a4a18ef277075c937e9447f17a86b23511e7dec4d9a666c47140 SHA512 1d497735ba0d15e038d0b55e165c76615a86949a96e85e28acb3e2bfaf112b21ea4f065e274983ef7b6c5307b19ba83b1ef39b10490e4de1374364dde8585b2c WHIRLPOOL 45ebad4b0e3bed14b8b2ace29e5a88be44352c95039d4aeb758efe0f932f30bf98a10e9f68f42ab3c2c26b35a652d77ba6fc526f73dd4678ef472b514b1baf5a
-MISC ChangeLog 3082 SHA256 a5737834f2c8ca873decee09e5a1b7b94ab031655bbd4b33ec7eb93af0231fd6 SHA512 522f2341479cd9b3ac0cbd223d3b7c30d05629c593ab1b460d8a6841d7ef8d50681335f3eba2791e1fd26ef6f49361b5d06407b98f839e52d82337f624283e94 WHIRLPOOL 37b15fe2652d7c104dacd95610d3d8c9db4a56b816c0f9e0f25ec93ef5f7f80c1b882900b8810cc1b8cd6b5d0015d603111b68c53031e83f75d1a7806b9fb6b2
+EBUILD caribou-0.4.7.ebuild 2523 SHA256 aeceddf949f8b61f6a25d6c6c9b030ae511e60c649b8a5b84746cd9130bd75a3 SHA512 9a173120d5f873ad57f4f9e0c0640bb2eb6f9b786389820a939bbc0e96104784a5309879b0b430e95a0693fb8526086cae5eb8ca5f2e255b0ba36923a9905367 WHIRLPOOL 8630d72c6498b6c888a5ba94df556c089c63d89293ed6d1bcffe57edf9444d38a5c9f2640dc727eb5d97735424c2acc4d9d55e376b21c34cfaf9fe1584a3a0fc
+MISC ChangeLog 3266 SHA256 be22c404a76cafcd810e130d7278e879a6c2585b339fd229e52e63dbb50463fe SHA512 c62ef70a72422c2879875804efdafc33be0c4b991af51d53fe0d73740a02e5cf2d6c418b65d1845f3810eaed2a580878815fdcd482c0eb8bcabdd939135538a8 WHIRLPOOL 6b77720bcf6101742513c8735e41d9f519b86921ceca75f1ce005f34094485ec753dd26e14b52b16c6457c4d2b6838f85371fa7ff62c46527f2f0cf75b07a897
 MISC metadata.xml 591 SHA256 8c557bc4420494a9164aba4827b2ae7ff5fa33c4fbbee31e586cc90a5887dcf8 SHA512 79d99b9578739bf6fb6f093e9a92af05c895f517c22d6160dc229281d52dfc670a8c43270dff4a1772ea98e70b247d553aa226fb07e8c0793949c088e0fc2413 WHIRLPOOL 4e7d730ed334f16b70dbe939bed42a548010abee47c9024133125e81f351e603389723fc385794451568dcc1366e7b0602c57fc79010786b7109993a1163491d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDy1ZUACgkQ1fmVwcYIWAY7uwCfSrYG+gSinsa3sEcN7eQXOzkD
-UcYAn2P5+G8x0tNQVobBCNapE4S/mMCa
-=1Vgo
+iEYEAREIAAYFAlEDG6kACgkQ1fmVwcYIWAZDVQCdEy02AZat9nDSXwbT+4MTA2F9
+MU8An05KKcETOP0bZYV06sWvoJjmsc6Y
+=MQN6
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/caribou/caribou-0.4.5.ebuild b/app-accessibility/caribou/caribou-0.4.7.ebuild
index 8f302f501d36..d0a434156db0 100644
--- a/app-accessibility/caribou/caribou-0.4.5.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.7.ebuild
@@ -1,14 +1,14 @@
 # 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.5.ebuild,v 1.6 2013/01/06 09:10:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.7.ebuild,v 1.1 2013/01/25 23:56:24 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
 
-inherit gnome2 python
+inherit gnome2 python-r1
 
 DESCRIPTION="Input assistive technology intended for switch and pointer users"
 HOMEPAGE="https://live.gnome.org/Caribou"
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-COMMON_DEPEND=">=dev-python/pygobject-2.90.3:3
+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
@@ -27,56 +28,67 @@ COMMON_DEPEND=">=dev-python/pygobject-2.90.3:3
 	>=media-libs/clutter-1.5.11:1.0[introspection]
 	x11-libs/libX11
 	x11-libs/libxklavier
-	x11-libs/libXtst"
+	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
+	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
 	>=gnome-base/gsettings-desktop-schemas-3
 	gnome-base/librsvg:2
 	sys-apps/dbus
-	virtual/python-argparse
+	virtual/python-argparse[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35.5
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
-	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...
-
 	# 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"
 
-	python_clean_py-compile_files
-
 	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-docs \
+			--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
 }
 
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize caribou
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	dodoc AUTHORS ChangeLog NEWS README
 }
 
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup caribou
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
 }