x11-misc/xneur: Version bump. Dropped subversion support code from ebuild (not used...

svn path=/sunrise/; revision=9121

diff --git a/x11-misc/xneur/ChangeLog b/x11-misc/xneur/ChangeLog
index a5a36e431b853bead2456edded4474db704ee1b5..faaeeafdc86d4727c9c564b7f7495282d8992d60 100644 (file)
--- a/x11-misc/xneur/ChangeLog
+++ b/x11-misc/xneur/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Aug 2009; Peter Volkov <pva@gentoo.org> -xneur-0.9.4.ebuild,
+  +xneur-0.9.5.ebuild, +files/xneur-0.9.5-gcc44.patch:
+  Version bump. Dropped subversion support code from ebuild (not used anyway).
+  New USE flag: libnotify.
+
   01 Jun 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,
   +xneur-0.9.4.ebuild:

diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest
index 4bc0ac52a490ba2982622819dc1c9332a129968c..2be1f3c4ed1cb7a13c178f2b2a4b32e0c09062ae 100644 (file)
--- a/x11-misc/xneur/Manifest
+++ b/x11-misc/xneur/Manifest
@@ -1,4 +1,5 @@
-DIST xneur-0.9.4.tar.bz2 1020509 RMD160 3a881da2932a1a7bc21ade4472e792402643061f SHA1 7d3ab24e1f44090099a77e65cf88dbc3fed5da13 SHA256 244548027da8f50a1d72e1de44be351364d1be18c7135941c212e77ced55aec5
-EBUILD xneur-0.9.4.ebuild 2603 RMD160 7918971cc455d2d42b5acddfca4d03353d91f6cc SHA1 caf3990c5968053069f402aac31d84deb3ebd386 SHA256 53564a79d0eb1eaeeddd8268cd51e8b1a4d9bcdbf79144d02498fde3d1de8954
-MISC ChangeLog 790 RMD160 73c6e51928934e3ed22705e81dafe2be77a2d1fd SHA1 d07a992e3d4f00961c08b94b800763219201775e SHA256 86dfb8c535bccd503d7171acb3c179e24754a32c0b3e030c8277fae68e3fe8aa
+AUX xneur-0.9.5-gcc44.patch 1841 RMD160 8bc5211d8cf351c232c7be27152436a413ab7f08 SHA1 bdfb9a2324e765870e703851bfa74bf76c3babb2 SHA256 7fff23da4ab72714722d62afa88f0577229f969a9ec0116a1a7c8f8f9de78ad7
+DIST xneur-0.9.5.tar.bz2 1041698 RMD160 83b0cbcc1c9b54780f716a65ea1d126b17854072 SHA1 daf21e3e9fb631504ef96f8757383ef2f1418678 SHA256 1c61881a447a316257258f40d412fa46e5f6d02fe5460fcb0da6427fe93a341b
+EBUILD xneur-0.9.5.ebuild 2448 RMD160 6ae22a13da977679f7b86b0a34ded8bb81a115ed SHA1 f6f6bb4c6332f4f2c5e271da89f3099704b6e7bb SHA256 3d31e7dae8275440b5e06547a27cb30e0ad27632abafe4f1f349292feeff6f83
+MISC ChangeLog 1018 RMD160 c01c2f00b1de735a996058633ae6ec73a7b62b99 SHA1 b9295315d7ae854f474b39651c254eb2deda51bd SHA256 ca20ec6374010b917c5b1446abb9f2672f4f28e3226de8d21240cc4db35ca829
 MISC metadata.xml 279 RMD160 f03e1cd34a6e25d6662a6583f295080e9cae21e1 SHA1 1b3c6b021ae7dad444549a9bec3e0b73c64e3901 SHA256 f813e4b9164f8fc63957501780b2e77a54097384bc50a392d902b20a9e498e24

diff --git a/x11-misc/xneur/files/xneur-0.9.5-gcc44.patch b/x11-misc/xneur/files/xneur-0.9.5-gcc44.patch
new file mode 100644 (file)
index 0000000..742a885
--- /dev/null
+++ b/x11-misc/xneur/files/xneur-0.9.5-gcc44.patch
@@ -0,0 +1,67 @@
+Fixes build issues with some versions of gcc (4.x I guess)
+http://xneur.ru/changeset?new=502%40%2F&old=501%40%2F
+
+Index: lib/main/plugin.c
+===================================================================
+--- lib/main/plugin.c  (revision 501)
++++ lib/main/plugin.c  (revision 502)
+@@ -193,4 +193,4 @@
+       p->uninit               = plugin_uninit;
+ 
+       return p;
+-}
+\ No newline at end of file
++}
+Index: lib/main/bind_table.c
+===================================================================
+--- lib/main/bind_table.c      (revision 501)
++++ lib/main/bind_table.c      (revision 502)
+@@ -194,4 +194,4 @@
+ void unbind_user_actions(void)
+ {
+       free(ubtable);
+-}
+\ No newline at end of file
++}
+Index: lib/main/selection.c
+===================================================================
+--- lib/main/selection.c       (revision 501)
++++ lib/main/selection.c       (revision 502)
+@@ -116,4 +116,3 @@
+       else if (status == BadWindow)
+               log_message(ERROR, _("Failed to convert selection with error BadWindow"));
+ }
+-
+Index: lib/notify/popup.h
+===================================================================
+--- lib/notify/popup.h (revision 501)
++++ lib/notify/popup.h (revision 502)
+@@ -22,4 +22,4 @@
+ 
+ void popup_show(char *popup_text);
+ 
+-#endif /* _POPUP_H_ */
+\ No newline at end of file
++#endif /* _POPUP_H_ */
+Index: lib/notify/notify.h
+===================================================================
+--- lib/notify/notify.h        (revision 501)
++++ lib/notify/notify.h        (revision 502)
+@@ -22,4 +22,4 @@
+ 
+ void show_notify(int notify, char *command);
+ 
+-#endif /* _NOTIFY_H_ */
+\ No newline at end of file
++#endif /* _NOTIFY_H_ */
+Index: lib/misc/text.c
+===================================================================
+--- lib/misc/text.c    (revision 501)
++++ lib/misc/text.c    (revision 502)
+@@ -152,4 +152,4 @@
+       }
+ 
+       return result_orig;
+-}
+\ No newline at end of file
++}

diff --git a/x11-misc/xneur/xneur-0.9.4.ebuild b/x11-misc/xneur/xneur-0.9.5.ebuild
similarity index 82%
rename from x11-misc/xneur/xneur-0.9.4.ebuild
rename to x11-misc/xneur/xneur-0.9.5.ebuild
index 9b7f58e43e24704819541997eadae521587d3530..0ecc390992e5aa4ca445f3ad008270989f014e20 100644 (file)
--- a/x11-misc/xneur/xneur-0.9.4.ebuild
+++ b/x11-misc/xneur/xneur-0.9.5.ebuild
@@ -8,19 +8,12 @@ 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
+SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aplay debug +gstreamer +imlib nls openal xosd +pcre spell xpm"
+IUSE="aplay debug +gstreamer +imlib libnotify 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
@@ -32,22 +25,16 @@ RDEPEND=">=x11-libs/libX11-1.1
                                  !openal? ( aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) )
        pcre? ( >=dev-libs/libpcre-5.0 )
        spell? ( app-text/aspell )
-       xosd? ( x11-libs/xosd )"
+       xosd? ( x11-libs/xosd )
+       libnotify? ( >=x11-libs/libnotify-0.4.0 )"
 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() {
+       epatch "${FILESDIR}/${P}-gcc44.patch"
        rm ltmain.sh aclocal.m4 m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4
        sed -i -e "s/-Werror -g0//" configure.in
        eautoreconf
@@ -82,7 +69,8 @@ src_configure() {
                $(use_enable nls) \
                $(use_with pcre) \
                $(use_with spell aspell) \
-               $(use_with xosd)
+               $(use_with xosd) \
+               $(use_with libnotify)
 }
 
 src_install() {