Version bump, drop old

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 21 insertions, 115 deletions

diff --git a/app-accessibility/caribou/ChangeLog b/app-accessibility/caribou/ChangeLog
index 7413c6ded5bf..c52be4757d83 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.23 2013/03/30 21:47:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/ChangeLog,v 1.24 2013/06/04 15:08:21 pacho Exp $
+
+*caribou-0.4.11 (04 Jun 2013)
+
+  04 Jun 2013; Pacho Ramos <pacho@gentoo.org> +caribou-0.4.11.ebuild,
+  -caribou-0.4.7.ebuild, -caribou-0.4.8.ebuild:
+  Version bump, drop old
 
 *caribou-0.4.10 (30 Mar 2013)
 
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index a9d845876648..9e6d0c450987 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST caribou-0.4.10.tar.xz 395384 SHA256 6480ce3a87cf4f01dd1fb52edbb31a2aa9f5573a0860b67115c86bbcd7b17865 SHA512 49c6965d001a055ccaec0438740da94a04cab1e4da358206d72628addc6f3139f0db6b483f832bc3f7e19f39efa6b5ae767cc9323b42e29aa099847f58b43fe7 WHIRLPOOL da680914be218d2292b8b5f437ea19f35d00a2196d9f2bde8707c200f7a5b12e38f036b4488351bb17406b2394d4be5b8430af7d2457053731e31b7e94133aef
-DIST caribou-0.4.7.tar.xz 384856 SHA256 580406d72536ff23ee61cab416113fbc068cdc1fcaaedf1a4621f1d9ef9cf2e9 SHA512 52153e3ba305060823a61b29f13751cbaf6b67225a00f39895cab9054c40fc64f8153f289b5d1b967354ec1f6676b2a989a8a0710f5a95d7a299588e73f25b60 WHIRLPOOL 233f5f630c05b8b2fe68105ddca72a269adb46a87cbdd29344f14c80be4185e8bb99660800815d6834765371d434adb391ddf95907250c59b6499069e98f4499
-DIST caribou-0.4.8.tar.xz 394744 SHA256 e897ac4226b2134b0a2b47527ec31baf8f61eec3b42bb599533fd9308d5b9f8b SHA512 75a5b808122916c5eb6d3f8b9dbc5c5b702a496c9a775f4f119adfe1972f0f8e5355f84572f5ce6092b5e65e3137c820e4f76d03333335514e8d91ba7ab56062 WHIRLPOOL cff8a69c5be0b764d5c68c7cd952122d367a61024d4943c97c8bd5a5a53382131a7dd34d3e56f4eb644d1580c3cec8be74e7b48afadaef34734d01a8076b430c
+DIST caribou-0.4.11.tar.xz 395924 SHA256 e4e81387a1a6875652b8ec9dede8573844fac274c8de9ad0416cf586a318f4f9 SHA512 a756a0e63c78cf11d1c54d81f5f2f8b7d33eb203421b169bd797804b88c7b818ae11ab85c04e8da528b84f5b6d9620ba5677ab6d9ea2fc3a6077d5f305e2b4fb WHIRLPOOL 8a6cc595af713a6898489e63ba3f1bf811cac9cdf57f7a031f7f7e28d82c1703c0fe6236e496afa48c7605e97acf8dfbdf824dc38890c74473ba8899a88632b8
 EBUILD caribou-0.4.10.ebuild 2364 SHA256 4736f93d4e6faadd8aa2cafe24e66fed85fd48b5ae2de36056892491533d1e28 SHA512 1c81cff3cf910e65444b32d4c51a1ba3588ff579e730c59f7a0308dab112a8aeaa0f5e91d83f07c82ff9beef8b58cfe21bbb79b94c26475e37501bcff72b371b WHIRLPOOL 71743f94e13f42d8459c7ffe62c065fe6910fb592b7499f7733c062d96629a4f876265d078435befb8bae091f9ecdaaec5accb68c431d3828a8d0169406435ea
-EBUILD caribou-0.4.7.ebuild 2528 SHA256 b243f0ab0373fc94c445bc986b5d4a9de9c4d3cfaecd5cf5cda7716a286aedab SHA512 af678baf1e8b3d2e85fa4ef1912a74dcf898dc7f21fbbebabf4afae850e7b4d397552c91dd5f419fb0c9ffaa053eb8c720bd0e69f82bcc8acf9a06a7ead934e7 WHIRLPOOL 26dbd3ef26000a978508258b09db4d8326a9f1afac4fc3984964123287baa61cad6a5dab62d69f7b3cec44b9a77be6b37f4a689d2999c06e9b870a188b3fc789
-EBUILD caribou-0.4.8.ebuild 2522 SHA256 4c200761403717e67d721c4eb02b7710a7f1db944d2ef066886fece454181487 SHA512 ad0487ba93f13a7cd64de3a77df11cd00b2564d95f74f96fd990d9cc5e37f788c5c625df98784c8cb4ab0b63ed9c8a62593db02b7ef8b6abb8e158a79b6b5ab6 WHIRLPOOL 81925c4146c55661046be1b98f4f2cfa57fdc59a29b0de401f57d6af344e81d15b1715cbfc60cc0d541d7a28eb3aa7c820660076c99eb34f71ec318740753773
-MISC ChangeLog 3725 SHA256 6a4a265e0e5910dcdec1ed57ff0926154f73b75c0959d2d4a9b2099fdf080196 SHA512 a89d1ec2980707adb77acfe1810676a141913d29f1b18be38d7abf398f1e11081f225fd7a4b597b630bc7aac6da64328899b2c1be0d67c7dc4cf06e42f20c770 WHIRLPOOL a599db2283d516becd08e7bd7da713d8ec63637502c478a18c435ff31337186f3d92ece55f5bb79d72e04a5425598f42758e8325f52907a6e4d032a83eba8e39
+EBUILD caribou-0.4.11.ebuild 2432 SHA256 22eba9040c339266fe6b667f2c2229210f85d3cd326d2bc74d2de3491d7a50f8 SHA512 61f097414d4218c99a877706a7339950c94e2d52acac32cae39b7d00a54dc94a7f95e433aece1da5810daabb682acfb23de209a63cf8ef62cb0a67a7aca32e8c WHIRLPOOL 5d3e93541a8d356a9e7d04807d104b29bf2a978f0eb42033f14f5c8d1f9f6cc3284c740a69bc0ad868afa3d5f4a771aab148a9dce18c248e1673d36e5e775f6f
+MISC ChangeLog 3902 SHA256 ee1d6edf6c8603360295f85739c804a273d502da3927b5dd325e56dca6b28187 SHA512 7852eb468a659d43ee07c62824dab6793ce395f0d421d385cdbccfc79840acb5ba72948c2d182c8b50665a2a759c877f1c62da4acfae719553035a68d295d7fc WHIRLPOOL 5f9f3fb810726501d447db4170cd7ed37e7ae0927ef00291548f6f147ea6aa08e7bfd6beac65fa82318b4f7f31c22cce592d7a7e2e799168c721f40e7f27e8dc
 MISC metadata.xml 591 SHA256 8c557bc4420494a9164aba4827b2ae7ff5fa33c4fbbee31e586cc90a5887dcf8 SHA512 79d99b9578739bf6fb6f093e9a92af05c895f517c22d6160dc229281d52dfc670a8c43270dff4a1772ea98e70b247d553aa226fb07e8c0793949c088e0fc2413 WHIRLPOOL 4e7d730ed334f16b70dbe939bed42a548010abee47c9024133125e81f351e603389723fc385794451568dcc1366e7b0602c57fc79010786b7109993a1163491d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFXXWAACgkQ1fmVwcYIWAYILwCgmotaf4qfnzE1umGke4uZ5PEZ
-0a8AnR9kMr+ozrRp0yyXoqGvQ5gHBnNb
-=pq43
+iEYEAREIAAYFAlGuAuYACgkQCaWpQKGI+9QXfQCfa4C8kbPOg8wsfxaK79fWnz7y
+NtcAnRPvT0JF2rZRygDHbWBGs1jrazTb
+=aPvC
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/caribou/caribou-0.4.8.ebuild b/app-accessibility/caribou/caribou-0.4.11.ebuild
index 4f5a9d172dee..53ca4a74852c 100644
--- a/app-accessibility/caribou/caribou-0.4.8.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.11.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.1 2013/03/28 16:21:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.11.ebuild,v 1.1 2013/06/04 15:08:21 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,7 +18,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 COMMON_DEPEND="
+	app-accessibility/at-spi2-core
 	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
 	>=x11-libs/gtk+-3:3[introspection]
 	x11-libs/gtk+:2
@@ -43,7 +46,8 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
@@ -69,8 +73,6 @@ src_configure() {
 			--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...
 }
 
@@ -84,11 +86,5 @@ src_test() {
 
 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
-}
+	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
+}
\ No newline at end of file
diff --git a/app-accessibility/caribou/caribou-0.4.7.ebuild b/app-accessibility/caribou/caribou-0.4.7.ebuild
deleted file mode 100644
index 6648fd00f03d..000000000000
--- a/app-accessibility/caribou/caribou-0.4.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.7.ebuild,v 1.2 2013/02/02 22:17:23 ago 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 ~arm ~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-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
-}
-
-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
-}