Version bump.

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

3 files changed, 102 insertions, 5 deletions

diff --git a/app-accessibility/caribou/ChangeLog b/app-accessibility/caribou/ChangeLog
index fb1a8dd22b68..112fc8d004c9 100644
--- a/app-accessibility/caribou/ChangeLog
+++ b/app-accessibility/caribou/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/caribou
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/ChangeLog,v 1.40 2015/03/28 09:00:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/ChangeLog,v 1.41 2015/05/01 22:06:18 eva Exp $
+
+*caribou-0.4.18.1 (01 May 2015)
+
+  01 May 2015; Gilles Dartiguelongue <eva@gentoo.org> +caribou-0.4.18.1.ebuild:
+  Version bump.
 
 *caribou-0.4.18 (28 Mar 2015)
 
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index ef6875e2193c..72ccaf36ef05 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA256
 
 DIST caribou-0.4.17.tar.xz 421960 SHA256 31828886b812421dd7217a7aa29043945b8601f3a101507f7e3faa0dc157e516 SHA512 97e773fb44f6bcf827bd8c839cd0669e029ebb377e1c3c777f7acf1cbf262ee58af09ea3e941843bc9519eee3bb59f3c572c04ddea0fb888baac9129c74c8932 WHIRLPOOL b3dee923e7815788655279857c5f6b4a6eac9ad34cffffff0b95f05bcb36ea09882acea5b88e1043b2c806d7a78a52a86772affd2e052588eacec41e76fcbf6b
+DIST caribou-0.4.18.1.tar.xz 410548 SHA256 aefadf125a647fc68696f4134e99ee43dca121da5de8e1edf6eab5664a9f3150 SHA512 226ca64fafb4e7c5e38ba714059e9e6ef7bbfce04160b98884fb299dc465e4f7d278033477f2539ba64fe9c39c62448903a8273dee0315bff81dbbe107d665d5 WHIRLPOOL 1310f79944ee547535a04563dd7910dfff2db400faf6c28685deecc062432759a24f0587f875d88cc87ddcdcd4c249a83abde0222ffcab4a24afe91dc9a55cdb
 DIST caribou-0.4.18.tar.xz 422580 SHA256 8d94977f3364926600b5f711406e765a9a61aa444609f87a1d435b301e147226 SHA512 cb1dbfa33ef7898b98d05af8ec937f4ecd6ee17148d136186e6bd1e00da97c4146d04e283f9b72a2ac88e8379f8aa4051535a247bce91dd87f32558322fa3720 WHIRLPOOL 5e3dcfb5ccf74d33f698678092468b2236b7cb1e78ba53816221c1c159c1a657ad32f56f2f389075d1ab4fb363ddaf019f0f3d27164b061ae8e9bba47015a56c
 EBUILD caribou-0.4.17.ebuild 2393 SHA256 8df377e7b2a218fc53de47a475a4892215a055605b54683d2d3998179b0f647b SHA512 41e103d281da9e9eebb33c77a85a89f8000a2efec45fd0b087c81960043230feab5db52d96af3a26d9a498604023cc6f1f6e370cbbf8cc744fa565653980fc51 WHIRLPOOL 53c1ac32a9b139d4722996dbfdfda0ed1cf5f58c7b44332def933821e2dd5ff64d8f6dd52a798b3b72b99f105cf8ab1a507ad1509aa057ce5a9438d9d38cce7c
+EBUILD caribou-0.4.18.1.ebuild 2418 SHA256 b79ce7535a262d5df66c5c2298dd450027bbb42b52d6777e31840cdf2fb0ff31 SHA512 e16f8dd068b6446e485fe46abfae18bab51e89dac334297e441a3eb07df7d7100b86be4cc960687ca9f600f20442044b3dd4309090e024d01b46265925600a96 WHIRLPOOL 638fa424b90c6d3dfe2b75a99428c7dcad44a1d2c6b5889c4c72594efe058abd337730bd1ad91c22a16c4a263edc8f9297e57736f0a33978226b6cb6bfa01a96
 EBUILD caribou-0.4.18.ebuild 2418 SHA256 1e968e84fa7280c97b81bded78d35f7b3840f8952e3436a954713895bc4475c0 SHA512 e0d60ed782e1c5c8ecb7817976076471a8c72215c4171b64bbcef7e98d6b4b83029220564e13a3890e06bec9a05134e97070fe5adf563f09e61c206d14626b59 WHIRLPOOL bc9fd0ec366edbf23d24af98b0f89dfc41b31803ec461f207200b077fab88bc420eac3fd5a5da28e2a7a346f04670548844fe90c7a0ea290a9412f350d76f921
-MISC ChangeLog 5961 SHA256 a2b692b155cbfb0eb27638c1b4f0a589eda9ccb6987bfe3b85101f2b644f16c0 SHA512 5da8dd41266af3b69a44a7574e21d261b4088a3eff2eeeff2a7da43764b6b5d15365e1fdbe117e755886e67f5c1063ecb3518caa03e55084898b18e515395564 WHIRLPOOL def30bc81fc8a4b18f809935cc07b5eda28a88e4264c84f2381c01c072e95066c4b78cd8543b705b6ba78b03cf991227bd2f78a0fd5d5d0c19bc189fb13520ee
+MISC ChangeLog 6089 SHA256 d6fb14b79eb10abfaf0cfb1c523a60386844657074169d1ae894d92ddd2f3076 SHA512 2a67506ca1f960960bf0b0139058224b3b9f025cfcd7813d535f29b64c8cd303fb38008abe804a4ed6015f4c41e03d6ec3a3ced8e1e4a9ed84919d640e801820 WHIRLPOOL d2363f7a383fa7f9038da52103041dc7b2eae976c40679f6f087f511d1fd5b515ab67a09fa223eaeda686c5f33b42d2bb7e735310625e745e1757b6af1b9c7e1
 MISC metadata.xml 591 SHA256 8c557bc4420494a9164aba4827b2ae7ff5fa33c4fbbee31e586cc90a5887dcf8 SHA512 79d99b9578739bf6fb6f093e9a92af05c895f517c22d6160dc229281d52dfc670a8c43270dff4a1772ea98e70b247d553aa226fb07e8c0793949c088e0fc2413 WHIRLPOOL 4e7d730ed334f16b70dbe939bed42a548010abee47c9024133125e81f351e603389723fc385794451568dcc1366e7b0602c57fc79010786b7109993a1163491d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUWbasACgkQCaWpQKGI+9RTJgCfTnqAsOeQiiJMYZ+bLCnYoVj8
-IMUAni+l+v/PwyKhQcDs14zWSNHBINHE
-=tozk
+iEYEAREIAAYFAlVD+NsACgkQ1fmVwcYIWAa64ACgpJVaBIDgsWtF8evkLbgjCI8b
+NSAAoLpoLN7zgnr9O73HuJIehMrJY4c/
+=R6x5
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/caribou/caribou-0.4.18.1.ebuild b/app-accessibility/caribou/caribou-0.4.18.1.ebuild
new file mode 100644
index 000000000000..8ee8ea87703f
--- /dev/null
+++ b/app-accessibility/caribou/caribou-0.4.18.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/caribou/caribou-0.4.18.1.ebuild,v 1.1 2015/05/01 22:06:18 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Input assistive technology intended for switch and pointer users"
+HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
+
+LICENSE="LGPL-2.1"
+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
+	>=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-libs/glib[dbus]
+	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
+	>=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
+"
+
+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-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)
+	# 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 NEWS README # ChangeLog simply points to git log
+}