* [gentoo-commits] gentoo-x86 commit in app-admin/setools: setools-3.3.7-r6.ebuild ChangeLog
@ 2012-11-23 20:49 Sven Vermeulen (swift)
0 siblings, 0 replies; 2+ messages in thread
From: Sven Vermeulen (swift) @ 2012-11-23 20:49 UTC (permalink / raw
To: gentoo-commits
swift 12/11/23 20:49:43
Modified: ChangeLog
Added: setools-3.3.7-r6.ebuild
Log:
Fix bugs #436338 and #430262
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xCDBA2FDB)
Revision Changes Path
1.81 app-admin/setools/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?r1=1.80&r2=1.81
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog 18 Nov 2012 08:49:57 -0000 1.80
+++ ChangeLog 23 Nov 2012 20:49:43 -0000 1.81
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/setools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.80 2012/11/18 08:49:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.81 2012/11/23 20:49:43 swift Exp $
+
+*setools-3.3.7-r6 (23 Nov 2012)
+
+ 23 Nov 2012; Sven Vermeulen +setools-3.3.7-r6.ebuild:
+ Fix bugs #436338 and #430262
18 Nov 2012; <swift@gentoo.org> setools-3.3.7-r5.ebuild:
Adding epatch_user to simplify development and support user-provided patches
1.1 app-admin/setools/setools-3.3.7-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild?rev=1.1&content-type=text/plain
Index: setools-3.3.7-r6.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild,v 1.1 2012/11/23 20:49:43 swift Exp $
EAPI="2"
PYTHON_DEPEND="python? *"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython *-pypy-* 3.*"
inherit autotools java-pkg-opt-2 python eutils
DESCRIPTION="SELinux policy tools"
HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
http://dev.gentoo.org/~swift/patches/setools/${P}-01-fedora-patches.tar.gz
http://dev.gentoo.org/~swift/patches/setools/${P}-06-gentoo-patches.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X debug java python"
DEPEND=">=sys-libs/libsepol-2.1.4
sys-libs/libselinux
sys-devel/bison
sys-devel/flex
>=dev-db/sqlite-3.2:3
dev-libs/libxml2:2
virtual/pkgconfig
java? (
<dev-lang/swig-2.0
>=virtual/jdk-1.4
)
python? ( <dev-lang/swig-2.0 )
X? (
>=dev-lang/tk-8.4.9
>=gnome-base/libglade-2.0
>=x11-libs/gtk+-2.8:2
)"
RDEPEND=">=sys-libs/libsepol-2.1.4
sys-libs/libselinux
>=dev-db/sqlite-3.2:3
dev-libs/libxml2:2
java? ( >=virtual/jre-1.4 )
X? (
>=dev-lang/tk-8.4.9
>=dev-tcltk/bwidget-1.8
>=gnome-base/libglade-2.0
>=x11-libs/gtk+-2.8:2
)"
RESTRICT="test"
pkg_setup() {
if use java; then
java-pkg-opt-2_pkg_setup
fi
if use python; then
python_pkg_setup
PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
fi
}
src_prepare() {
EPATCH_MULTI_MSG="Applying various (Fedora-provided) setools fixes... " \
EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}" \
EPATCH_FORCE="yes" \
epatch
EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
EPATCH_FORCE="yes" \
epatch
# Disable broken check for SWIG version.
sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
# 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
local dir
for dir in ${PYTHON_DIRS}; do
# Python bindings are built/installed manually.
sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
# Make PYTHON_LDFLAGS replaceable during running `make`.
sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
done
# temporary work around bug #424581 until automake-1.12 is stable (then
# depend on it). Need to use MKDIR_P in the mean time for 1.12+.
has_version ">=sys-devel/automake-1.12.1" && { find . -name 'Makefile.*' -exec sed -i -e 's:mkdir_p:MKDIR_P:g' {} + || die; }
eautoreconf
# Disable byte-compilation of Python modules.
echo '#!/bin/sh' > py-compile
epatch_user
}
src_configure() {
econf \
--with-java-prefix=${JAVA_HOME} \
--disable-selinux-check \
--disable-bwidget-check \
$(use_enable python swig-python) \
$(use_enable java swig-java) \
$(use_enable X swig-tcl) \
$(use_enable X gui) \
$(use_enable debug)
# work around swig c99 issues. it does not require
# c99 anyway.
sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
}
src_compile() {
default
if use python; then
local dir
for dir in ${PYTHON_DIRS}; do
python_copy_sources ${dir}
building() {
emake \
SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
PYTHON_LDFLAGS="$(python_get_library -l)" \
pyexecdir="$(python_get_sitedir)" \
pythondir="$(python_get_sitedir)"
}
python_execute_function \
--action-message "Building of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version)" \
--failure-message "Building of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version) failed" \
-s --source-dir ${dir} \
building
done
fi
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
if use python; then
local dir
for dir in ${PYTHON_DIRS}; do
installation() {
emake \
DESTDIR="${D}" \
pyexecdir="$(python_get_sitedir)" \
pythondir="$(python_get_sitedir)" \
install
}
python_execute_function \
--action-message "Installation of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version)" \
--failure-message "Installation of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version) failed" \
-s --source-dir ${dir} \
installation
done
fi
}
pkg_postinst() {
if use python; then
python_mod_optimize setools
fi
}
pkg_postrm() {
if use python; then
python_mod_cleanup setools
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/setools: setools-3.3.7-r6.ebuild ChangeLog
@ 2012-12-30 15:23 Sven Vermeulen (swift)
0 siblings, 0 replies; 2+ messages in thread
From: Sven Vermeulen (swift) @ 2012-12-30 15:23 UTC (permalink / raw
To: gentoo-commits
swift 12/12/30 15:23:55
Modified: setools-3.3.7-r6.ebuild ChangeLog
Log:
Stabilize
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xCDBA2FDB)
Revision Changes Path
1.2 app-admin/setools/setools-3.3.7-r6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild?r1=1.1&r2=1.2
Index: setools-3.3.7-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setools-3.3.7-r6.ebuild 23 Nov 2012 20:49:43 -0000 1.1
+++ setools-3.3.7-r6.ebuild 30 Dec 2012 15:23:55 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild,v 1.1 2012/11/23 20:49:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.7-r6.ebuild,v 1.2 2012/12/30 15:23:55 swift Exp $
EAPI="2"
PYTHON_DEPEND="python? *"
@@ -17,7 +17,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X debug java python"
DEPEND=">=sys-libs/libsepol-2.1.4
1.82 app-admin/setools/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?r1=1.81&r2=1.82
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog 23 Nov 2012 20:49:43 -0000 1.81
+++ ChangeLog 30 Dec 2012 15:23:55 -0000 1.82
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/setools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.81 2012/11/23 20:49:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.82 2012/12/30 15:23:55 swift Exp $
+
+ 30 Dec 2012; Sven Vermeulen setools-3.3.7-r6.ebuild:
+ Stabilize
*setools-3.3.7-r6 (23 Nov 2012)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-30 15:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-23 20:49 [gentoo-commits] gentoo-x86 commit in app-admin/setools: setools-3.3.7-r6.ebuild ChangeLog Sven Vermeulen (swift)
-- strict thread matches above, loose matches on Subject: below --
2012-12-30 15:23 Sven Vermeulen (swift)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox