x11-misc/xneur: New Ebuild for bug 169494. Too many users want xneur but it still...

svn path=/sunrise/; revision=8185

diff --git a/x11-misc/xneur/ChangeLog b/x11-misc/xneur/ChangeLog
new file mode 100644 (file)
index 0000000..4edf4ea
--- /dev/null
+++ b/x11-misc/xneur/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for x11-misc/xneur
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  03 Apr 2009; Peter Volkov <pva@gentoo.org> +xneur-0.9.3.ebuild,
+  +files/xneur-0.9.3-CFLAGS.patch, +files/xneur-0.9.3-build-failure.patch,
+  +metadata.xml:
+  New Ebuild for bug 169494. Too many users want xneur but it still crashs and
+  has known limitations. In Sunrise everybody can easy get it and have a
+  chance to improve it.
+

diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest
new file mode 100644 (file)
index 0000000..40d7bc6
--- /dev/null
+++ b/x11-misc/xneur/Manifest
@@ -0,0 +1,6 @@
+AUX xneur-0.9.3-CFLAGS.patch 3872 RMD160 56dd77fdb82d9ab923aa532dbbcb4ab2bc97ddcc SHA1 c6e8e8bb443301893ff0dc51fb79d23940e3267d SHA256 91c7baba148950135ef047f27b8c2801a8af4022e9506543e1dd7e648fb4c164
+AUX xneur-0.9.3-build-failure.patch 1304 RMD160 c7d500b1872bd7731afe9ca7de6a9272665fbe4e SHA1 f6f600141d06873644d67cc950f3b62c7039d330 SHA256 e975cb829c002fb8973d3265fcf03efccb960ff850b7e53f9673fc92a857c8ab
+DIST xneur-0.9.3.tar.bz2 611562 RMD160 391da368f8634e205602d54d726b478c6f10efeb SHA1 4fde52f1edca076e58623be235e4a00f4baa74e0 SHA256 22608cce119fb9296fa7d8bf75e280240431e75036eeecc1a172c52555d7f292
+EBUILD xneur-0.9.3.ebuild 2531 RMD160 8f89b588d43a1e290c55b06a041cb0588ed57c9b SHA1 6400d0cb86686549931e823419c0a08074a20677 SHA256 b4847e643ce12b4a17e313124aa9c404e2a36839b01526e0bf9d6ffb77da968d
+MISC ChangeLog 450 RMD160 92341ed6f51d27df088d581d563dcb4f555c3597 SHA1 7d532bca83e40c73ab42490c279a381eefadbec2 SHA256 c7d6a30412e600353229b6c04f6b20438a1ebc09c8dbd62d5a393507cae49610
+MISC metadata.xml 279 RMD160 f03e1cd34a6e25d6662a6583f295080e9cae21e1 SHA1 1b3c6b021ae7dad444549a9bec3e0b73c64e3901 SHA256 f813e4b9164f8fc63957501780b2e77a54097384bc50a392d902b20a9e498e24

diff --git a/x11-misc/xneur/files/xneur-0.9.3-CFLAGS.patch b/x11-misc/xneur/files/xneur-0.9.3-CFLAGS.patch
new file mode 100644 (file)
index 0000000..4711bba
--- /dev/null
+++ b/x11-misc/xneur/files/xneur-0.9.3-CFLAGS.patch
@@ -0,0 +1,87 @@
+=== modified file 'configure.in'
+--- configure.in       2009-03-15 09:13:28 +0000
++++ configure.in       2009-03-15 09:13:53 +0000
+@@ -198,8 +198,8 @@
+       AC_SUBST(XOSD_LIBS)
+ fi
+ 
+-CFLAGS="-Wall -Wextra -Werror -g0 -fPIC -std=gnu99"
+-AC_SUBST(CFLAGS)
++DEFAULT_CFLAGS="-Wall -Wextra -Werror -g0 -fPIC -std=gnu99"
++AC_SUBST(DEFAULT_CFLAGS)
+ 
+ AC_OUTPUT([share/Makefile share/sounds/Makefile share/pixmaps/Makefile share/en/Makefile share/ru/Makefile share/uk/Makefile share/be/Makefile share/fr/Makefile share/ro/Makefile share/kz/Makefile share/de/Makefile  etc/Makefile lib/Makefile lib/ai/Makefile lib/config/Makefile lib/misc/Makefile lib/sound/Makefile lib/x/Makefile src/Makefile po/Makefile.in Makefile xnconfig.pc])
+ 
+
+=== modified file 'lib/ai/Makefile.am'
+--- lib/ai/Makefile.am 2009-03-15 09:13:28 +0000
++++ lib/ai/Makefile.am 2009-03-15 09:14:07 +0000
+@@ -6,6 +6,6 @@
+       detection.c             \
+       detection.h
+ 
+-libxnai_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/x @X11_CFLAGS@ @ASPELL_CFLAGS@
++libxnai_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/x @X11_CFLAGS@ @ASPELL_CFLAGS@ @DEFAULT_CFLAGS@
+ libxnai_la_LDFLAGS = -static @X11_LIBS@ @ASPELL_LIBS@
+ libxnai_la_LIBADD = ../misc/libxnmisc.la
+
+=== modified file 'lib/config/Makefile.am'
+--- lib/config/Makefile.am     2009-03-15 09:13:28 +0000
++++ lib/config/Makefile.am     2009-03-15 09:14:28 +0000
+@@ -14,7 +14,7 @@
+       xnconfig.c              \
+       xnconfig_memory.c
+ 
+-libxnconfig_la_CFLAGS = -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/x
++libxnconfig_la_CFLAGS = -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/x @DEFAULT_CFLAGS@
+ libxnconfig_la_LDFLAGS = -version-info 9:3:0
+ libxnconfig_la_LIBADD = ../misc/libxnmisc.la
+ 
+
+=== modified file 'lib/misc/Makefile.am'
+--- lib/misc/Makefile.am       2009-03-15 09:13:28 +0000
++++ lib/misc/Makefile.am       2009-03-15 09:15:07 +0000
+@@ -20,5 +20,5 @@
+       utils.c                 \
+       regexp.c
+ 
+-libxnmisc_la_CFLAGS = @PCRE_CFLAGS@
++libxnmisc_la_CFLAGS = @PCRE_CFLAGS@ @DEFAULT_CFLAGS@
+ libxnmisc_la_LDFLAGS = -static @PCRE_LIBS@
+
+=== modified file 'lib/sound/Makefile.am'
+--- lib/sound/Makefile.am      2009-03-15 09:13:28 +0000
++++ lib/sound/Makefile.am      2009-03-15 09:15:23 +0000
+@@ -4,6 +4,6 @@
+       sound.c                 \
+       sound.h
+ 
+-libxnsound_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc @X11_CFLAGS@ @FREEALUT_CFLAGS@ @GSTREAMER_CFLAGS@ 
++libxnsound_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc @X11_CFLAGS@ @FREEALUT_CFLAGS@ @GSTREAMER_CFLAGS@ @DEFAULT_CFLAGS@
+ libxnsound_la_LDFLAGS = -static @X11_LIBS@ @FREEALUT_LIBS@ @GSTREAMER_LIBS@  @APLAY_LIBS@
+ 
+
+=== modified file 'lib/x/Makefile.am'
+--- lib/x/Makefile.am  2009-03-15 09:13:28 +0000
++++ lib/x/Makefile.am  2009-03-15 09:15:43 +0000
+@@ -27,5 +27,5 @@
+       xOSD.c                  \
+       xOSD.h
+ 
+-libxnx_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc  -I@top_srcdir@/lib/sound -I@top_srcdir@/lib/ai @X11_CFLAGS@ @XPM_CFLAGS@ @IMLIB2_CFLAGS@
++libxnx_la_CFLAGS = -I@top_srcdir@/lib/config -I@top_srcdir@/lib/misc  -I@top_srcdir@/lib/sound -I@top_srcdir@/lib/ai @X11_CFLAGS@ @XPM_CFLAGS@ @IMLIB2_CFLAGS@ @DEFAULT_CFLAGS@
+ libxnx_la_LDFLAGS = -static @X11_LIBS@ @XPM_LIBS@ @IMLIB2_LIBS@ @XOSD_LIBS@
+
+=== modified file 'src/Makefile.am'
+--- src/Makefile.am    2009-03-15 09:13:28 +0000
++++ src/Makefile.am    2009-03-15 09:15:58 +0000
+@@ -7,7 +7,7 @@
+       newlang_creation.c      \
+       newlang_creation.h
+ 
+-xneur_CFLAGS = -I@top_srcdir@/lib/ai -I@top_srcdir@/lib/config -I@top_srcdir@/lib/x -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/sound  @X11_CFLAGS@ @XPM_CFLAGS@
++xneur_CFLAGS = -I@top_srcdir@/lib/ai -I@top_srcdir@/lib/config -I@top_srcdir@/lib/x -I@top_srcdir@/lib/misc -I@top_srcdir@/lib/sound  @X11_CFLAGS@ @XPM_CFLAGS@ @DEFAULT_CFLAGS@
+ 
+ xneur_LDFLAGS = -L$(top_srcdir)/lib/ai -L$(top_srcdir)/lib/config -L$(top_srcdir)/lib/misc -L$(top_srcdir)/lib/x -L$(top_srcdir)/lib/sound  @X11_LIBS@ @XPM_LIBS@
+ 
+

diff --git a/x11-misc/xneur/files/xneur-0.9.3-build-failure.patch b/x11-misc/xneur/files/xneur-0.9.3-build-failure.patch
new file mode 100644 (file)
index 0000000..417843a
--- /dev/null
+++ b/x11-misc/xneur/files/xneur-0.9.3-build-failure.patch
@@ -0,0 +1,23 @@
+libtool: compile:  i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -DPACKAGE_SYSCONFDIR_DIR=\"/etc/xneur\" -DPACKAGE_SHAREDIR_DIR=\"/usr/share/xneur\" -I../../lib/misc -I../../lib/x -Wall -Wextra -fPIC -std=gnu99 -O2 -march=i686 -pipe -mtune=i686 -march=pentium-m -ggdb -U_FORTIFY_SOURCE -MT libxnconfig_la-xnconfig.lo -MD -MP -MF .deps/libxnconfig_la-xnconfig.Tpo -c xnconfig.c  -fPIC -DPIC -o .libs/libxnconfig_la-xnconfig.o
+xnconfig.c:75: error: expected identifier or '(' before '__extension__'
+xnconfig.c:75: error: expected identifier or '(' before ')' token
+make[3]: *** [libxnconfig_la-xnconfig.lo] Error 1
+make[3]: Leaving directory `/var/tmp/portage/x11-apps/xneur-0.9.3/work/xneur-0.9.3/lib/config'
+make[2]: *** [all-recursive] Error 1
+make[2]: Leaving directory `/var/tmp/portage/x11-apps/xneur-0.9.3/work/xneur-0.9.3/lib'
+make[1]: *** [all-recursive] Error 1
+make[1]: Leaving directory `/var/tmp/portage/x11-apps/xneur-0.9.3/work/xneur-0.9.3'
+make: *** [all] Error 2
+
+=== modified file 'lib/config/xnconfig.c'
+--- lib/config/xnconfig.c      2009-03-15 09:13:28 +0000
++++ lib/config/xnconfig.c      2009-03-15 10:11:41 +0000
+@@ -72,7 +72,6 @@
+ static int load_lang = -1;\r
+ \r
+ pid_t getsid(pid_t pid);\r
+-char* strsep(char **stringp, const char *delim);\r
+ \r
+ static char* get_word(char **string)\r
+ {\r
+

diff --git a/x11-misc/xneur/metadata.xml b/x11-misc/xneur/metadata.xml
new file mode 100644 (file)
index 0000000..6acf9bb
--- /dev/null
+++ b/x11-misc/xneur/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+<use>
+       <flag name='aplay'>Use aplay from <pkg>media-sound/alsa-utils</pkg> for
+       playing sounds</flag>
+</use>
+</pkgmetadata>

diff --git a/x11-misc/xneur/xneur-0.9.3.ebuild b/x11-misc/xneur/xneur-0.9.3.ebuild
new file mode 100644 (file)
index 0000000..b6ecc89
--- /dev/null
+++ b/x11-misc/xneur/xneur-0.9.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils autotools
+
+DESCRIPTION="In-place conversion of text typed in with a wrong keyboard layout (Punto Switcher replacement)"
+HOMEPAGE="http://www.xneur.ru/"
+if [[ "${PV}" =~ (_p)([0-9]+) ]] ; then
+       inherit subversion
+       SRC_URI=""
+       MTSLPT_REV=${BASH_REMATCH[2]}
+       ESVN_REPO_URI="svn://xneur.ru:3690/xneur/${PN}/@${MTSLPT_REV}"
+else
+       SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aplay debug +gstreamer +imlib nls openal xosd +pcre spell xpm"
+
+# Sound does not works here with media-sound/alsa-utils-1.0.16
+RDEPEND=">=x11-libs/libX11-1.1
+       x11-libs/libXtst
+       imlib? ( media-libs/imlib2 )
+       !imlib? ( xpm? ( x11-libs/libXpm ) )
+       gstreamer? ( >=media-libs/gstreamer-0.10.6 )
+       !gstreamer? ( openal? ( >=media-libs/freealut-1.0.1 )
+                                 !openal? ( aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) )
+       pcre? ( >=dev-libs/libpcre-5.0 )
+       spell? ( app-text/aspell )
+       xosd? ( x11-libs/xosd )"
+DEPEND="${RDEPEND}
+       gstreamer? ( media-libs/gst-plugins-good
+                       media-plugins/gst-plugins-alsa )
+       nls? ( sys-devel/gettext )
+       >=dev-util/pkgconfig-0.20"
+
+src_unpack() {
+       if [[ ${SRC_URI} == "" ]]; then
+               subversion_src_unpack
+       else
+               unpack ${A}
+       fi
+}
+
+src_prepare() {
+       rm ltmain.sh aclocal.m4 m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4
+       epatch "${FILESDIR}/${P}-CFLAGS.patch"
+       epatch "${FILESDIR}/${P}-build-failure.patch"
+       sed -i -e "s/-Werror -g0//" configure.in
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       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
+               myconf="--with-sound=no"
+       fi
+
+       if use imlib2; then
+               myconf="${myconf} --with-image=imlib2"
+       elif use xpm; then
+               myconf="${myconf} --with-image=xpm"
+       else
+               myconf="${myconf} --with-image=no"
+       fi
+
+       econf ${myconf} \
+               $(use_with debug) \
+               $(use_enable nls) \
+               $(use_with pcre) \
+               $(use_with spell aspell) \
+               $(use_with xosd)
+}
+
+src_install() {
+       emake install DESTDIR="${D}" || die "emake install failed"
+       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."
+}