summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2015-03-03 19:57:39 +0000
committerSven Vermeulen <swift@gentoo.org>2015-03-03 19:57:39 +0000
commit2adb64f0c855c7186e9407281c75155bfa2691b2 (patch)
tree0cf1b3b00927bba967fd36192f9b1bfca52d2966 /app-admin/setools
parentbump of icinga2 and allowing monitoring-plugins to be used bug 541162 (diff)
downloadgentoo-2-2adb64f0c855c7186e9407281c75155bfa2691b2.tar.gz
gentoo-2-2adb64f0c855c7186e9407281c75155bfa2691b2.tar.bz2
gentoo-2-2adb64f0c855c7186e9407281c75155bfa2691b2.zip
Fix bug #542032 - SWIG version check does not work
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Diffstat (limited to 'app-admin/setools')
-rw-r--r--app-admin/setools/ChangeLog5
-rw-r--r--app-admin/setools/setools-3.3.8-r7.ebuild4
2 files changed, 7 insertions, 2 deletions
diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 823b919d77af..5b942e059faa 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/setools
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.97 2015/03/02 14:07:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.98 2015/03/03 19:57:39 swift Exp $
+
+ 03 Mar 2015; Sven Vermeulen <swift@gentoo.org> setools-3.3.8-r7.ebuild:
+ Fix bug #542032 - SWIG version check does not work
02 Mar 2015; Sven Vermeulen <swift@gentoo.org> -setools-3.3.8-r6.ebuild:
Drop r6 (build failure with swig, fixed in r7)
diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
index 133cf8eb5a85..930855176164 100644
--- a/app-admin/setools/setools-3.3.8-r7.ebuild
+++ b/app-admin/setools/setools-3.3.8-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.2 2015/02/18 03:35:21 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.3 2015/03/03 19:57:39 swift Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 python3_4 )
@@ -75,6 +75,8 @@ src_prepare() {
# Fix build failure due to double __init__.py installation
sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
+ # Disable broken check for SWIG version. Bug #542032
+ sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
local dir
for dir in ${PYTHON_DIRS}; do