x11-misc/xneur: Version bump; libpcre dependency is now obligatory; openmp patch...

svn path=/sunrise/; revision=11751

diff --git a/x11-misc/xneur/ChangeLog b/x11-misc/xneur/ChangeLog
index 401b1625de04954c44b29ad84952b7da0291afb4..614435a303b4f9d5fbdab9c645eeb523de9c3d9e 100644 (file)
--- a/x11-misc/xneur/ChangeLog
+++ b/x11-misc/xneur/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for x11-misc/xneur
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Feb 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -xneur-0.11.1.ebuild, -files/xneur-0.11.1-openmp.patch,
+  +xneur-0.12.0.ebuild:
+  Version bump; libpcre dependency is now obligatory; openmp patch is no
+  longer needed.
+
   06 Dec 2010; Peter Volkov <pva@gentoo.org> -xneur-0.10.0.ebuild,
   +xneur-0.11.1.ebuild, +files/xneur-0.11.1-openmp.patch:
   Version bump, thank nightwelf and Alex Rodionov for report/help.

diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest
index e51be852cd9313907eb0068e3c92fd55aee4fdcd..0c2726df5c3c6f3ee0d0fa3a01fe455d16780068 100644 (file)
--- a/x11-misc/xneur/Manifest
+++ b/x11-misc/xneur/Manifest
@@ -1,5 +1,4 @@
-AUX xneur-0.11.1-openmp.patch 416 RMD160 54a3c9cb7cbba2cdb68ceb475d0f9f6163a71ce8 SHA1 d9077a4737785b9fa04f47cc375c7309dd3d6cdf SHA256 d81341db50b90e804037aaf44f557d146bc842f7984a20472a62db349d9676a7
-DIST xneur-0.11.1.tar.bz2 1088553 RMD160 16ced6e9a3f2356d48c5367a9ffddbfa20a168c8 SHA1 0c306ad4bdb46b9c3b8e0cb98f2e9361d20bce2b SHA256 bdf7e5a8181fac50558573a8ea470df3f73a7272eefa3c318da35bfac2e6228b
-EBUILD xneur-0.11.1.ebuild 2542 RMD160 56063a64c3b70c238a9756c0164f2c541c81e703 SHA1 7491ee90d8fad5ec6519124165ba9a6cf5a38051 SHA256 6dd41fcb8328d765372e83a533b2f084e448a8ac291f2d2bc7883aba89b905ec
-MISC ChangeLog 1972 RMD160 bcd8536428671aed0500fa3e1407d6876b3e4a13 SHA1 64c77efd63ee28b0922980bb3a85b3a7fd9bb56a SHA256 ea9c08dd957f7e1035bac976d98c346fb559c22f72fa5f10120b61afa30f9009
+DIST xneur-0.12.0.tar.bz2 1088554 RMD160 0e5fa4012b69c4e82f7bcefe3e3c478f5500487a SHA1 aff607938f1cc1f7bd38b41b53ea8bf70a4db376 SHA256 962660306f138de44fbfcb458fffac59ce32000a49e2314e4f0460a98ac93327
+EBUILD xneur-0.12.0.ebuild 2466 RMD160 37750ba095ad31569af17da895cf482813bbf93a SHA1 1c90aba7bf1db75c99324fd1ff313e21530f6688 SHA256 a95ab84241b35a4dce7ffa08de093225b8b5e0e4ca9f3794374a88fd266840d8
+MISC ChangeLog 2215 RMD160 66c0c28320abd736956fce8d6c50e3ef591fe226 SHA1 23938f137606cfd0e72f5742173ee6e458611d24 SHA256 52470d01a7db70a2f43fe8410cdec0341557add692981df3333f366d2f60611e
 MISC metadata.xml 474 RMD160 4973d641049a2ff4fee27892be5fe67647bad186 SHA1 0208c219f21a0d4c7cd84ba5962e7f2901426f4a SHA256 dfe27aab6e4b47d75ab37a7d4e07f936e5e3577ce277dfd8c0eb0493b813d09e

diff --git a/x11-misc/xneur/files/xneur-0.11.1-openmp.patch b/x11-misc/xneur/files/xneur-0.11.1-openmp.patch
deleted file mode 100644 (file)
index d12cd1c..0000000
--- a/x11-misc/xneur/files/xneur-0.11.1-openmp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-=== modified file 'configure.in'
---- configure.in       2010-12-06 11:25:12 +0000
-+++ configure.in       2010-12-06 11:26:02 +0000
-@@ -205,7 +205,8 @@
-       AC_DEFINE(WITH_PLUGINS, 1, [Define if you want plugins support])
- fi
- 
--DEFAULT_CFLAGS="-Wall -Wextra -Werror -g0 -std=gnu99 -fPIC -fopenmp"
-+AC_OPENMP([C])
-+DEFAULT_CFLAGS="-Wall -Wextra -Werror -g0 -std=gnu99 -fPIC $OPENMP_CFLAGS"
- AC_SUBST(DEFAULT_CFLAGS)
- 
- AC_OUTPUT([
-

diff --git a/x11-misc/xneur/xneur-0.11.1.ebuild b/x11-misc/xneur/xneur-0.12.0.ebuild
similarity index 92%
rename from x11-misc/xneur/xneur-0.11.1.ebuild
rename to x11-misc/xneur/xneur-0.12.0.ebuild
index e34e5a7f2ee6199aa0b2bfea4abdc38be3586f1a..69235618b363c05ac74ba24e4562ba796f3bd30b 100644 (file)
--- a/x11-misc/xneur/xneur-0.11.1.ebuild
+++ b/x11-misc/xneur/xneur-0.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -13,9 +13,10 @@ SRC_URI="http://dists.xneur.ru/release-${PV}/tgz/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aplay debug gstreamer keylogger libnotify nls openal openmp xosd pcre +spell"
+IUSE="aplay debug gstreamer keylogger libnotify nls openal openmp xosd +spell"
 
-COMMON_DEPEND="sys-libs/zlib
+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 )
@@ -24,7 +25,6 @@ COMMON_DEPEND="sys-libs/zlib
                !openal? (
                        aplay? ( >=media-sound/alsa-utils-1.0.17 ) ) )
        libnotify? ( >=x11-libs/libnotify-0.4.0 )
-       pcre? ( >=dev-libs/libpcre-5.0 )
        spell? ( app-text/enchant )
        xosd? ( x11-libs/xosd )"
 RDEPEND="${COMMON_DEPEND}
@@ -42,7 +42,6 @@ src_prepare() {
        rm -f m4/{lt~obsolete,ltoptions,ltsugar,ltversion,libtool}.m4 \
                ltmain.sh aclocal.m4 || die
 
-       epatch "${FILESDIR}/${P}-openmp.patch"
        sed -i -e "s/-Werror -g0//" configure.in
        eautoreconf
 }
@@ -68,7 +67,6 @@ src_configure() {
                $(use_with debug) \
                $(use_enable openmp) \
                $(use_enable nls) \
-               $(use_with pcre) \
                $(use_with spell) \
                $(use_with xosd) \
                $(use_with libnotify) \