summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2011-01-20 15:20:20 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2011-01-20 15:20:20 +0000
commit976dcc63512d068b16d16d159ab80f3e2a5ae02e (patch)
tree3252f86a64347bcc634b94d8d2f787ff2cc9f2f3 /media-plugins/vdr-epgsearch
parent3.4.11.1 calls a2x now, so app-text/asciidoc dep needs to be unconditional. (diff)
downloadgentoo-2-976dcc63512d068b16d16d159ab80f3e2a5ae02e.tar.gz
gentoo-2-976dcc63512d068b16d16d159ab80f3e2a5ae02e.tar.bz2
gentoo-2-976dcc63512d068b16d16d159ab80f3e2a5ae02e.zip
fixed use-flag manipulation for Makefile
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-epgsearch')
-rw-r--r--media-plugins/vdr-epgsearch/ChangeLog9
-rw-r--r--media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild (renamed from media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20.ebuild)18
2 files changed, 22 insertions, 5 deletions
diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index 3ed8ee21af21..b8f9ac67723c 100644
--- a/media-plugins/vdr-epgsearch/ChangeLog
+++ b/media-plugins/vdr-epgsearch/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-plugins/vdr-epgsearch
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.48 2011/01/18 16:29:44 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.49 2011/01/20 15:20:20 hd_brummy Exp $
+
+*vdr-epgsearch-0.9.25_beta20-r1 (20 Jan 2011)
+
+ 20 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+ -vdr-epgsearch-0.9.25_beta20.ebuild,
+ +vdr-epgsearch-0.9.25_beta20-r1.ebuild:
+ fixed use-flag manipulation for Makefile
*vdr-epgsearch-0.9.25_beta20 (18 Jan 2011)
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild
index 1a90347a1674..26215ff26756 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20.ebuild,v 1.1 2011/01/18 16:29:44 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.25_beta20-r1.ebuild,v 1.1 2011/01/20 15:20:20 hd_brummy Exp $
EAPI="2"
@@ -30,10 +30,20 @@ DEPEND=">=media-video/vdr-1.3.45
tre? ( dev-libs/tre )"
RDEPEND="${DEPEND}"
+check_menu_flags() {
+ if use pcre && use tre; then
+ echo
+ eerror "Please use only one of this USE-Flags"
+ eerror "\tpcre tre"
+ die "multiple use-flag manipulation"
+ fi
+}
+
src_prepare() {
+ check_menu_flags
+
vdr-plugin_src_prepare
- cd "${S}"
fix_vdr_libsi_include conflictcheck.c
# disable automagic deps
@@ -41,12 +51,12 @@ src_prepare() {
if use pcre; then
einfo "Using pcre for regexp searches"
- sed -i Makefile -e 's/^#HAVE_PCREPOSIX/HAVE_PCREPOSIX/'
+ sed -i Makefile -e 's:^#REGEXLIB = pcre:REGEXLIB = pcre:'
fi
if use tre; then
einfo "Using tre for unlimited fuzzy searches"
- sed -i Makefile -e 's/^#HAVE_LIBTRE/HAVE_LIBTRE/'
+ sed -i Makefile -e 's:^#REGEXLIB = pcre:REGEXLIB = tre:'
fi
# install conf-file disabled