Version bump thanks to corentin.labbe <corentin.labbe@geomatys.fr>

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)

2 files changed, 35 insertions, 20 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 2d104161ae0f..2a3037a55fdf 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-forensics/openscap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.19 2012/10/25 17:16:04 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.20 2013/01/04 22:48:07 hwoarang Exp $
+
+*openscap-0.9.3 (04 Jan 2013)
+
+  04 Jan 2013; Markos Chandras <hwoarang@gentoo.org> +openscap-0.9.3.ebuild,
+  +openscap-0.9.3.patch, -openscap-0.8.3.ebuild:
+  Version bump thanks to corentin.labbe <corentin.labbe@geomatys.fr>
 
 *openscap-0.9.1 (25 Oct 2012)
 
diff --git a/app-forensics/openscap/openscap-0.8.3.ebuild b/app-forensics/openscap/openscap-0.9.3.ebuild
index 20b159e50cc8..dbc31a4929bf 100644
--- a/app-forensics/openscap/openscap-0.8.3.ebuild
+++ b/app-forensics/openscap/openscap-0.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.8.3.ebuild,v 1.1 2012/08/01 13:34:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.3.ebuild,v 1.1 2013/01/04 22:48:07 hwoarang Exp $
 
 EAPI=3
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	test? (
 		app-arch/unzip
+		dev-perl/XML-XPath
 		net-misc/ipcalc
 		sys-apps/grep )"
 
@@ -41,14 +42,25 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-	sed -i 's,/etc/rc.d/init.d,/etc/init.d,' src/OVAL/probes/unix/runlevel.c || die
-	# runlevel isnt supported on gentoo
+
+	#probe runlevel for non-centos/redhat/fedora is not implemented
+	sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
 	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
+
 	#According to comment of theses tests, we must modify it. For the moment disable it
 	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
 	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
-	#This test fail when testing process with [] in names https://fedorahosted.org/openscap/ticket/47
-	epatch ${FILESDIR}/test_probes_process.patch || die
+
+	# theses tests are hardcoded for checking hald process...,
+	# but no good solution for the moment, disabling them with a fake echo
+	# because encased in a if then
+#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
+#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
+	sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
+	sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
+
+	#This test fail
+	sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh ||	die
 
 	if ! use rpm ; then
 		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
@@ -59,16 +71,21 @@ src_prepare() {
 		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
 	fi
 	if ! use selinux ; then
-		sed -i 's,.*selinux.*,#&,' tests/mitre/test_mitre.sh || die
+		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
+		#process58 need selinux
+		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
 	fi
 }
 
 src_configure() {
 	local myconf
-	if use python || use perl ; then
-		myconf+=" --enable-bindings"
+	if use python ; then
+		myconf+=" --enable-python"
 	else
-		myconf+=" --disable-bindings"
+		myconf+=" --enable-python=no"
+	fi
+	if use perl ; then
+		myconf+=" --enable-perl"
 	fi
 	if use nss ; then
 		myconf+=" --with-crypto=nss3"
@@ -81,14 +98,6 @@ src_configure() {
 src_install() {
 	emake install DESTDIR="${D}" || die
 	find "${D}" -name '*.la' -delete || die
-	sed -i 's/^Description/&:/' "${D}"/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
-	#--enable-bindings enable all bindings, clean unwanted bindings
-	if use python && ! use perl ; then
-		rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
-	fi
-	if ! use python && use perl ; then
-		rm -rf "${D}"/$(python_get_sitedir) || die
-	fi
 	if use doc ; then
 		dohtml -r docs/html/* || die
 		dodoc docs/examples/* || die