From f2ce9a72c70d686688ee824e34d593e16a2d500f Mon Sep 17 00:00:00 2001
From: Sergey Popov <admin@pinkbyte.ru>
Date: Tue, 24 Jan 2012 18:11:11 +0400
Subject: [PATCH] bump new versions of xneur and gxneur

---
 x11-misc/gxneur/Manifest                     |   2 +
 x11-misc/gxneur/gxneur-0.15.0.ebuild         |  59 ++++++++++
 x11-misc/xneur/Manifest                      |   3 +
 x11-misc/xneur/files/0.15.0-select-gtk.patch |  48 ++++++++
 x11-misc/xneur/xneur-0.15.0.ebuild           | 115 +++++++++++++++++++
 5 files changed, 227 insertions(+)
 create mode 100644 x11-misc/gxneur/gxneur-0.15.0.ebuild
 create mode 100644 x11-misc/xneur/files/0.15.0-select-gtk.patch
 create mode 100644 x11-misc/xneur/xneur-0.15.0.ebuild

diff --git a/x11-misc/gxneur/Manifest b/x11-misc/gxneur/Manifest
index 2583831..b075802 100644
--- a/x11-misc/gxneur/Manifest
+++ b/x11-misc/gxneur/Manifest
@@ -1,4 +1,6 @@
 DIST gxneur-0.13.0.tar.bz2 669387 RMD160 246533c5ea77f350ee4e6bbbd09946e1f9182440 SHA1 07bed408fec59bbc803e20c13342750ad857db82 SHA256 f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f
 DIST gxneur-0.14.0.tar.bz2 705337 RMD160 0a6d84c271bd0df40748698cca159bad695f05b6 SHA1 287a92630f2ba1c16e573f1351128412094d5684 SHA256 b40c852eb97be19b9ef2f5d3aff8e8aa06876cd0817a060a46ed111bc7b03ed6
+DIST gxneur-0.15.0.tar.bz2 682903 RMD160 f6c07cf0ec5a499bd7dc2809f8b7ae95aadd3661 SHA1 013f7f0b35359e9da55132b7c588cfcead1f3316 SHA256 4fda25f0b3f90d6b76aa731bcc1768c606af1cbdba59e82400baa83d2ea9866d
 EBUILD gxneur-0.13.0.ebuild 1015 RMD160 ef1e9a6b5ca869978adab48ab250a96ff546626a SHA1 5b3197c0cf5b8b8d80238c6a8c779d53d3cdcfa4 SHA256 aa93b1fd8bb1b6c6c886b610fe3d7c2bb0a42805f3f37eab31a68d9196ae8fc4
 EBUILD gxneur-0.14.0.ebuild 1015 RMD160 ef1e9a6b5ca869978adab48ab250a96ff546626a SHA1 5b3197c0cf5b8b8d80238c6a8c779d53d3cdcfa4 SHA256 aa93b1fd8bb1b6c6c886b610fe3d7c2bb0a42805f3f37eab31a68d9196ae8fc4
+EBUILD gxneur-0.15.0.ebuild 1197 RMD160 fca2ad338aac6579587225607d97608fecfef76c SHA1 f8009383e6de86b440520602c1ee79f2b9d586c3 SHA256 d3643e80ffbf24bda28fb0899c01aaf670d34eb5e595404f52b778a1a1f80c81
diff --git a/x11-misc/gxneur/gxneur-0.15.0.ebuild b/x11-misc/gxneur/gxneur-0.15.0.ebuild
new file mode 100644
index 0000000..d290f01
--- /dev/null
+++ b/x11-misc/gxneur/gxneur-0.15.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit autotools eutils gnome2-utils versionator
+
+DESCRIPTION="GTK+ based GUI for xneur"
+HOMEPAGE="http://www.xneur.ru/"
+SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gconf nls"
+
+COMMON_DEPEND="gnome-base/libglade:2.0
+	>=sys-devel/gettext-0.16.1
+	>=x11-libs/gtk+-2.18:2
+	>=x11-misc/xneur-$(get_version_component_range 1-2)
+	gconf? ( gnome-base/gconf:2 )
+	!x11-misc/xneur[gtk3]"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	>=dev-util/pkgconfig-0.20"
+
+src_prepare() {
+	rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \
+		ltmain.sh aclocal.m4 || die
+	sed -i "s/-Werror -g0//" configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gconf)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS
+	doicon pixmaps/gxneur.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest
index 7fd456c..2e40fe6 100644
--- a/x11-misc/xneur/Manifest
+++ b/x11-misc/xneur/Manifest
@@ -1,4 +1,7 @@
+AUX 0.15.0-select-gtk.patch 1656 RMD160 2b9469eaa20c1c6bccc372d4ca2893b0825dc38d SHA1 9ea7718ae3fcf7173a6dd49d1f8f0f1d1ebefbbb SHA256 d674c760251f8cec10692ec2688bc364b69291e3ebcd69f8c63d499c4535129a
 DIST xneur-0.13.0.tar.bz2 1111525 RMD160 3674c653cbab7b40b7261440487aaf8106602d92 SHA1 5535fe0462391dc64e2d8e0d19a083532f7bed91 SHA256 ed4120f87ccd1e48a979b8fabe75403419189bf1385b30cf414edd249db5e8a7
 DIST xneur-0.14.0.tar.bz2 1144134 RMD160 2c962f734fc5e75a8ceb226778fe7c1268fdef5d SHA1 466ec2397ac3eb6520cee09120691465fb72e600 SHA256 5ea6c2fb5196dda1c91fc4943ebd5f1efe8ad4c9cc4866d83e62b72fd77d4a46
+DIST xneur-0.15.0.tar.bz2 1136568 RMD160 4e112bc286a5be4afe1bd32b63989a7ccf23bd26 SHA1 46795bebb7787d9f6fa092005ffefce423bc7c3c SHA256 ebedf81ac2c8510d60e235ca66c7ed73c306b22b5b3164981a628950b5cb3e70
 EBUILD xneur-0.13.0.ebuild 2521 RMD160 39126a45c1761ea33b9c87e80d32cef9f962c565 SHA1 3561855fa992a0216746e4fdc907551a32730bec SHA256 15dc0693a29f80cb2e4056c589740fa06db2606ca6812d72e36ed28a4a7ac8e0
 EBUILD xneur-0.14.0.ebuild 2473 RMD160 4291c7059a27aca5ac360acf0e91a9cca54c1bb3 SHA1 717ee71d3bd783c11830051f56576841475cbc16 SHA256 9230656e6c9de901ac357ac45680497718576313733e0cfd47119be9c49251b3
+EBUILD xneur-0.15.0.ebuild 3042 RMD160 0bb716f1585a23d95fa188fcfba12dfe718cbdad SHA1 f0dd6826fd17d9a43a839131bf8926f9b3170bbb SHA256 a27b97ea419f816d520a641895c66a07abf0ef9e9076452a94f7a8d96f18536f
diff --git a/x11-misc/xneur/files/0.15.0-select-gtk.patch b/x11-misc/xneur/files/0.15.0-select-gtk.patch
new file mode 100644
index 0000000..0beed7d
--- /dev/null
+++ b/x11-misc/xneur/files/0.15.0-select-gtk.patch
@@ -0,0 +1,48 @@
+--- configure.in.orig	2011-12-06 19:43:49.934493120 +0100
++++ configure.in	2011-12-06 19:43:57.365437555 +0100
+@@ -192,16 +192,28 @@
+ AC_ARG_WITH(libnotify, [  --without-libnotify	  Compile without libnotify message support])
+ if test "x$with_libnotify" != "xno"; then
+ 
+-	AC_ARG_WITH(gtk, [  --with-gtk		  Compile with additional GTK support])
+-	if test "x$with_gtk" == "xyes"; then
+-		PKG_CHECK_MODULES(GTK, [gtk+-3.0], found_gtk="yes", found_gtk="no")
+-		if test "x$found_gtk" = "xno"; then
+-			PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+-		fi 
++	AC_ARG_WITH(gtk, [  --with-gtk[[=ARG]]	  Compile with additional GTK support ARG=[[yes|no|gtk2|gtk3]] [[default=no]]])
++	if test "x$with_gtk" != "xno"; then
++		if test "x$with_gtk" = "x"; then
++			with_gtk="gtk3"
++		fi
++	
++		case $with_gtk in
++			gtk2)
++				PKG_CHECK_MODULES(GTK, [gtk+-2.0], found_gtk="yes", found_gtk="no")
++				;;
++			gtk3|yes)
++				PKG_CHECK_MODULES(GTK, [gtk+-3.0], found_gtk="yes", found_gtk="no")
++				;;
++			*)
++				AC_MSG_ERROR([Unsupported Gtk+ selected, --with-gtk=[[yes|no|gtk2|gtk3]]])
++				;;
++		esac
++	
++		PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.4.0])
++		AC_DEFINE(WITH_LIBNOTIFY, 1, [Define if you want libnotify message support])
+ 	fi
+ 
+-	PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.4.0])
+-	AC_DEFINE(WITH_LIBNOTIFY, 1, [Define if you want libnotify message support])
+ fi
+ 
+ AC_ARG_WITH(plugins, [  --without-plugins	  Compile without plugins support])
+@@ -331,7 +343,7 @@
+ fi
+ 
+ if test "x$with_popup" != "xno"; then
+-	if test "x$with_gtk" == "xyes"; then
++	if test "x$found_gtk" == "xyes"; then
+ cat <<EOF
+ 	GTK compiler flags:		$GTK_CFLAGS
+ 	GTK linker flags:		$GTK_LIBS
diff --git a/x11-misc/xneur/xneur-0.15.0.ebuild b/x11-misc/xneur/xneur-0.15.0.ebuild
new file mode 100644
index 0000000..f82dc49
--- /dev/null
+++ b/x11-misc/xneur/xneur-0.15.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="In-place conversion of text typed in with a wrong keyboard layout (Punto Switcher replacement)"
+HOMEPAGE="http://www.xneur.ru/"
+SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aplay debug gstreamer gtk gtk3 keylogger libnotify nls openal xosd +spell"
+
+COMMON_DEPEND=">=dev-libs/libpcre-5.0
+	sys-libs/zlib
+	>=x11-libs/libX11-1.1
+	x11-libs/libXtst
+	gstreamer? ( >=media-libs/gstreamer-0.10.6 )
+	!gstreamer? (
+		openal? ( >=media-libs/freealut-1.0.1 )
+		!openal? (
+			aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) )
+	libnotify? (
+		gtk? (
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 ) )
+		>=x11-libs/libnotify-0.4.0 )
+	spell? ( app-text/enchant )
+	xosd? ( x11-libs/xosd )"
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? ( media-libs/gst-plugins-good
+		media-plugins/gst-plugins-alsa )
+	nls? ( virtual/libintl )
+	gtk3? ( !x11-misc/gxneur )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.20
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# Fixes error/warning: no newline at end of file
+	find -name '*.c' -exec sed -i -e '${/[^ ]/s:$:\n:}' {} + || die
+	rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \
+		ltmain.sh aclocal.m4 || die
+
+	sed -i -e "s/-Werror -g0//" configure.in || die
+	# allows to select between gtk2 or gtk3, or none
+	epatch "${FILESDIR}/${PV}-select-gtk.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use gtk && ! use libnotify; then
+		einfo "libnotify is not in USE - gtk USE flag will have no effect"
+	fi
+
+	if use gstreamer; then
+		elog "Using gstreamer for sound output."
+		myconf="--with-sound=gstreamer"
+	elif use openal; then
+		elog "Using openal for sound output."
+		myconf="--with-sound=openal"
+	elif use aplay; then
+		elog "Using aplay for sound output."
+		myconf="--with-sound=aplay"
+	else
+		elog "Sound support disabled."
+		myconf="--with-sound=no"
+	fi
+
+	if use gtk; then
+		if use gtk3; then
+			myconf="${myconf} --with-gtk=gtk3"
+		else
+			myconf="${myconf} --with-gtk=gtk2"
+		fi
+	else
+		myconf="${myconf} --without-gtk"
+	fi
+
+	econf ${myconf} \
+		$(use_with debug) \
+		$(use_enable nls) \
+		$(use_with spell) \
+		$(use_with xosd) \
+		$(use_with libnotify) \
+		$(use_with keylogger)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README NEWS TODO || die
+}
+
+pkg_postinst() {
+	elog "This is command line tool. If you are looking for GUI frontend just"
+	elog "emerge gxneur, which uses xneur transparently as backend."
+
+	elog
+	elog "It is recommended to install dictionary for your language"
+	elog "(myspell or aspell), for example app-dicts/aspell-ru."
+
+	ewarn
+	ewarn "If you upgraded from <=xneur-0.9.3, you need to remove"
+	ewarn "dictionary files in the home directory:"
+	ewarn " $ rm ~/.xneur/{ru,en,be,etc.}/dict"
+
+	ewarn
+	ewarn "Note: if xneur became slow, try to comment out AddBind options in config file."
+}