Version bump by Corentin LABBE via email.

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

9 files changed, 29 insertions, 325 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 21f35815d42a..bc035aa68569 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-forensics/openscap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.22 2013/03/04 19:09:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.23 2013/06/18 10:38:18 xmw Exp $
+
+*openscap-0.9.8 (18 Jun 2013)
+
+  18 Jun 2013; Michael Weber <xmw@gentoo.org> +openscap-0.9.8.ebuild,
+  -files/openscap-0.7.1-sql-fix.patch, -files/openscap-0.9.3-policy.patch,
+  -files/test_probes_interface.patch, -files/test_probes_process.patch,
+  -openscap-0.9.1.ebuild, -openscap-0.9.3-r1.ebuild, -openscap-0.9.3.ebuild:
+  Version bump by Corentin LABBE via email.
 
 *openscap-0.9.4.1 (04 Mar 2013)
 
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index 386f8aa6dd9a..ad693fa2b5bf 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -1,35 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX openscap-0.7.1-sql-fix.patch 1122 SHA256 3918480e8c038490101336bbf46d0db91323d5284e168a4f1e270866c263e3a2 SHA512 e085bea2b703248e1863d90a23478f8349c23083ca09576781efd9818df505a979c20366f7f0f096b65c8794d1703e17c1b91e8d5675df8bf9a5db5105303392 WHIRLPOOL 7f2e6cd1e051f80cd5007853abed90d0078f429f704bdbfc54b5e9e067f385cf1a36d24f304fbcd2d31ebb9e517a78c48167e37ca8417f7003d442452d9b672c
-AUX openscap-0.9.3-policy.patch 800 SHA256 aae1bd28267aba2f44acb30e33460870b1d9d2749c3976bee23e0292777b3b09 SHA512 532978a5a168f122ad7a62d525b66de7e8805189c430728b929a9448fd9f68502cb4e9773bce1f0e3a395a20f794e77dbb198a96a70c59b3307f3d66605a885c WHIRLPOOL 4f5b4da69bbee73171662b31c8cbb9f12c206f82713f469a6226fa37d8dc66e9fdb556ef6a21f4c0833a8a16567983e15d47b097487e9c53e7a702a1c9df5faa
-AUX test_probes_interface.patch 387 SHA256 b09eb7d712e1aef4d1cd7de59962824b01572e8cca9c41db5f3df6fa11cc5c4c SHA512 dca99d4c421588686cf89aa2e3513b4266dad1660d9f61837f5e59bf57936a485275f5df58935b6de14c0c9fca125bb06071d994e5ddabb860809d1db634e5ea WHIRLPOOL f51f99fe4f631a311f0b2d8d613a9d2c442fe513bbea49f9f6047f167addbf8751de95788cd1011e94d8dbda688067f8ff21348b807ddc50dcd3e217e56cd279
-AUX test_probes_process.patch 496 SHA256 9c15c0f58e84928349b8a4f9cd14e9b702653d1ddd8f9d7b42e774feaeacf531 SHA512 7714969722355842ab24e4a7cdc92aeb60128f7e8c9ad173a8f8880001a0d0cbc3c6fc1ac254fb691ef0a62dfea27ef772ecefdbb9fe8fb887557e53992cf10c WHIRLPOOL 3ee11d5af84f4149266478effd6d7b4ac1ee0047dd1d5d9492a7e78e27e9cdf8cdb80e70837e6f08b80520ab818ee74a44c017bf9c8f42dbbf7689d68614b74f
-DIST openscap-0.9.1.tar.gz 10744598 SHA256 4601ffd6c1b5d0e9025e49db194f2e7f7d7fef1826981bb212ef543c28e94fe6 SHA512 0ead581b8801b3cd1a0af20d746a766d8c56f58013be49c390df152001bb721a81445d5e683fac50c19071340ab78ff068161bff7d76d67e15e62dfdc50d88aa WHIRLPOOL 966c6604591dfb3d10eaad793c2348b5a4ae0a813fdcdfdf8ebf22f9cb471181bfcd3e0455acda16fe6d358c704067e92584a054fe88b1a8fd2743614af8428a
-DIST openscap-0.9.3.tar.gz 11928497 SHA256 0aa482fa4a22493ec3d5987fd8c86d5124a94675f5cbdd6aac1cb86f14402acd SHA512 75f5d958d04c290a3a8458a4a21956da6f5d337c85ab6da1b246bb13cfbcf376e811f55f16b70c7a3d3c73ae27cb7ab01242bc472556218a116c562c162464fd WHIRLPOOL f46c317c95d5d33f995f4498707d315cf7f38f3be7960efcc9e460b94979290cb783907c6f8b26c436a6152b7d3ca58059b0e2e4382d2be75352dc17232665b2
 DIST openscap-0.9.4.1.tar.gz 12012752 SHA256 9f80ba69482eb9a5ec0f08491fde3d5963c84441576fa5ede4fcc707d6166059 SHA512 8a91e5249c52a7174e03faa8bf347b6e39cb7330ec9aec5c6413d22b654a964c2f6861bc781e1e358bd62eafbd56562bbe980b18bf472b9645003f17fdc39c99 WHIRLPOOL b4b6beae40d60e8852b9a68ab2421a837d3139c6ea598c7e5b6355690178f1f85d88bece9cfd81d2a09fe177361ddd529d83ba1aced67bc87ad4e19d08cbae98
-EBUILD openscap-0.9.1.ebuild 3886 SHA256 f0a6f2de17ae3add56be14eb3c792f2f0458bf8317c8bdeb2e0447d2d03ee300 SHA512 3dada66de05006c1bd78ebffddc53727c4c5e15bdc1ad8a3d53c8b0142e7bdde23491e2a68d49485ad3d6e3ed2b02bc2010e72d41d93a7cdf681076c2e9969e4 WHIRLPOOL 429adb0d397f813f3779feba51b03f14f4e0490c23dcfac7e1ccb411bf8dabfa16d8bf856e9278f69a52f699101cfd0df194e69318fbc2ee482a03f75cea83f2
-EBUILD openscap-0.9.3-r1.ebuild 3698 SHA256 c02d8b38c648601fe39574f00712bc67d373d304624b426b5ae4654a216a0804 SHA512 96689d209ba03df492a2d04143973d54e27d8a15eb6ebdc5e31bfe6cfcba6191e291f56dcf803965642a4a813927ad0adc22a7293c4869b2627cd6783678a580 WHIRLPOOL 34b74b797f18edfb87452cb442c7c7d4752cf590f471f7b6c833397350d62e37c07406a478d33f3b44295dc2dbc0bedc740f164fd576f8e45c9b5d1ab31ef0be
-EBUILD openscap-0.9.3.ebuild 3646 SHA256 92fba4a8409ca2fa5e263ccd4d17577ce846c9016affe1f4193008937076f117 SHA512 a423ed34e88a2f32183693b8e74e9a8b673a3b8e9f984d58250dd63948eef165ea49cd4d4dee84cea3def37eb8f4e48f1d8416d3cf355b4966cade1e1767da46 WHIRLPOOL bd8413f3fb43b9f9672c3224c96bf678d9e8cbf0e8930f7eda10507fe98a6acb162914738e0e214c1de657ec9b13b0d6521aaf976aa832d2f1ab4415614b0b35
+DIST openscap-0.9.8.tar.gz 12688640 SHA256 977fd8a0196c3dce727b9b166777385565a7c5001ca4ef20bb024d12dcb53af2 SHA512 35a221cde33d3295a0dfb59422aa276a6d307621d45920fa70d6ad056ab84ad94953f060b22c6e0dc0738e2e0694ec66f514c36b8cb178ffd5ca3639ffd8ab94 WHIRLPOOL ec952d10dab5cada7f01cf82224be7858c730a66545c05ad7148c20e2e62f6ac8d5aaaeac67d67038df8a6ab3a0290e1e9c76ee53748e485de0bbd41b5c281fc
 EBUILD openscap-0.9.4.1.ebuild 3834 SHA256 441bdd72ee9a890566e86edc221fba732c7914b96c87841a508368bcfda717b1 SHA512 bf40561aa07ae2c437c3922fb2c823268c034d9b76f0429a041583d005ef669b58ac578fc90c9146419d8603e27681d28e1d5e57baef4dbe80d19ac1297438e6 WHIRLPOOL 1f37d539ce40469fa4c205ecc632014fa8df4ae41b967c32a255ed812ce1ed5ad6f8512da6230397b5b8fc2b7db50b4586eef00229dad13eb010461b20f150f5
-MISC ChangeLog 4044 SHA256 fd9324c8ddce9ca8b23b37d1b99824278817f8f140de6c70a8273057202344dc SHA512 46d592fd08f87587854f15f5b45eee24e303361f73470e1ecaff1f5b46e38a2b49f691399160c76e78727e1b0710a3d306b7874e3e3551e5496aa7e98560dfc9 WHIRLPOOL e02184a7b01be2f94a6b3344bfd125b0e62bc36630fc91aca59eee80face545fc75ec994e872ef6fb02343eeb8e3c2b86c492677a429b31d218885d64b1cae49
+EBUILD openscap-0.9.8.ebuild 3920 SHA256 7f4acec7bfd7c474d88b968101559bfcdd482a21dd53e2b51598eea095214081 SHA512 c86bf47e61efa822b7c411f0c6db6ddc6cbeef64dca1dd1bb6939f83da6a006689b6ff2dee1da95491da1bb3496c5a6dc573d1490aa9513afb93ebe907b6e1f7 WHIRLPOOL 8ddf3e5169c185753296a6f009bd56d99405326e07e6da6b3069bc3f657833b61c2567e7c28a4eeb1115b983d3c3eedc33228f7c06972781cf49e0e9e8bbacf4
+MISC ChangeLog 4409 SHA256 1864ecf8ebbe655247d16f9f017c4cdedb56f5aee2b785b3e9993363da1423f1 SHA512 168ddfabc82f204ca0ff27d7cfbd48c0f2d6d14c1d3b53288c91e552eb6546a2b5cabf1421c1e09775a3715c566bcaf8ecf963668f828af9a6f50d5eeb711115 WHIRLPOOL cdfee39f1d044a77fefa71c7e274dc3c243103e008fc9198b3140f7e1be9e598323d0a22eec8fb0f5ff6a967285ea83b5b952799469993fe429492ecfab44834
 MISC metadata.xml 552 SHA256 43527b7d217ec12cf41e0c349cf7d32def4c3c292ddc8f78f325a05ff352e36f SHA512 96e5b1568077071ba734d04bb42d9c68caea93f6defd100478f81c31b734b893a56d0bd5fe476926e06e22400192d9ab1001c64d517366f7810a30577ab11549 WHIRLPOOL 27a48b4227d8a07a9d120a1606237223574660315e8a33537fcb717d4f7744267611f519d83e49477eac946049e2a4a4da22d75fda7e7d9cb8140a9c0e68b5dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRNPF9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88GpAP/ih+dy0oQ6pmvXbEfAhnIeeL
-cAqIBUsaRVGZyBQB/GxI7a52lw+2XVU9JUYdat0vOsUvPaiVuB1bQYhcILnywkjj
-6h3YsqPh8+M3WMPH9LscEcPgJF6+0G+s74XleNIDWeFn14NQwpQPzjkuV3FgIdrU
-BdQbdL33np12p8EfYHt5DFh1hjUhQTjIVqJIixNFOjdOKmEwdGbaEWHrMSFNDsG9
-+egWHUjf2OR2f5Co+IwHugdF1ypGCR+mym7m2YS9uL7stSIsGff0VM6E9jTk37i/
-yvDRuRHMbBI2rTK4Sy6kry2IEx1MsXMgMcu0fSBQgebmnOp5k6db7qXNiB/kaR9M
-0Dw1xsaADNOSPMajFG6a4pyS2TdZO8zvNuxh7W7VoLtfeeRJOptZ4LGjwTZf5cyE
-Ki+Uyv8I8M3Kuz079ISEBv5Vo66MDVL9mOnW3YMeIREk7Q8y+QTyNFwt+iiKXJWl
-6taHnkC5JoISpAApBePEkBsP8Q/lVyWybW0bjzj/xrt4BJ+Ikz5v4XV4BGMH33LB
-3lMRxA4J9frYzsHYcjX21izv9d71pppXZ+SEKuGNrutkorgFlBIYk/lTH+faMkbH
-VcSHwLKXYBEUznCnIQTyjwyaeeKlkMjhmBuUXDcOUE/Zzg/EikabLCaSP/fMq4TZ
-vfpD5RwHG6ojf7u0pfTq
-=GcUE
+iF4EAREIAAYFAlHAOPcACgkQknrdDGLu8JBLmAD+IMGlOSx4iirv2/3bfunJypPe
+2clZ7THVRIDVVf/HLK8A+wWTjra9epVV9797ElAYsiaDXRhtsiN/RmIwvQLTRvBK
+=NTax
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch b/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch
deleted file mode 100644
index abd247035b0c..000000000000
--- a/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-X-Git-Url: http://git.fedorahosted.org/git/?p=openscap.git;a=blobdiff_plain;f=src%2FOVAL%2Fprobes%2Findependent%2Fsql.c;h=ad7988c60ec344fa721e28b8aca59b9690cabbac;hp=0eb18a9a7cd0c03d3923c2b724eea23791e4ff25;hb=9eeceaecde0718cf28ffc8a672923f4f16b63c6a;hpb=dfad8e4db009182a3a2c3c2ba79563feefb09ada
-
-diff --git a/src/OVAL/probes/independent/sql.c b/src/OVAL/probes/independent/sql.c
-index 0eb18a9..ad7988c 100644
---- a/src/OVAL/probes/independent/sql.c
-+++ b/src/OVAL/probes/independent/sql.c
-@@ -242,8 +242,8 @@ __fail:
- 	return (-1);
- }
- 
--static SEXP_t *dbSQL_eval(const char *engine, const char *version,
--			  const char *conn, const char *sql, SEXP_t *probe_out)
-+static int dbSQL_eval(const char *engine, const char *version,
-+                      const char *conn, const char *sql, SEXP_t *probe_out)
- {
- 	int err = -1;
- 	dbURIInfo_t uriInfo = { .host = NULL,
-@@ -350,7 +350,7 @@ __exit:
- 	return (err);
- }
- 
--int probe_main(SEXP_t *probe_in, SEXP_t *probe_out, void *arg)
-+int probe_main(SEXP_t *probe_in, SEXP_t *probe_out, void *arg, SEXP_t *filters)
- {
- 	char       *engine, *version, *conn, *sqlexp;
- 	int err;
diff --git a/app-forensics/openscap/files/openscap-0.9.3-policy.patch b/app-forensics/openscap/files/openscap-0.9.3-policy.patch
deleted file mode 100644
index e1b01271e111..000000000000
--- a/app-forensics/openscap/files/openscap-0.9.3-policy.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=450328
---- src/XCCDF_POLICY/xccdf_policy.c.orig	2012-12-14 18:13:18.000000000 +0800
-+++ src/XCCDF_POLICY/xccdf_policy.c	2013-01-07 22:31:10.417704932 +0800
-@@ -389,8 +389,8 @@
-         __attribute__nonnull__(policy);
-         __attribute__nonnull__(item);
- 
--	static bool TRUE = true;
--	static bool FALSE = false;
-+	static bool TRUE2 = true;
-+	static bool FALSE2 = false;
- 	bool result;
- 
- 	oscap_htable_detach(policy->selected_final, xccdf_item_get_id(item));
-@@ -408,7 +408,7 @@
- 		xccdf_item_iterator_free(child_it);
- 	}
- 
--	assume_ex(oscap_htable_add(policy->selected_final, xccdf_item_get_id(item), result ? &TRUE : &FALSE), NULL);
-+	assume_ex(oscap_htable_add(policy->selected_final, xccdf_item_get_id(item), result ? &TRUE2 : &FALSE2), NULL);
- }
- 
- /**
diff --git a/app-forensics/openscap/files/test_probes_interface.patch b/app-forensics/openscap/files/test_probes_interface.patch
deleted file mode 100644
index 672426d7ca76..000000000000
--- a/app-forensics/openscap/files/test_probes_interface.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/probes/interface/test_probes_interface.sh.orig	2012-04-05 14:41:53.846540789 +0200
-+++ tests/probes/interface/test_probes_interface.sh	2012-04-05 14:42:41.141285232 +0200
-@@ -22,6 +22,8 @@
-     local DF="test_probes_interface.xml"
-     local RF="results.xml"
- 
-+    require "ipcalc" || return 255
-+
-     [ -f $RF ] && rm -f $RF
- 
-     if [ ! -x test_probes_interface ]; then		
diff --git a/app-forensics/openscap/files/test_probes_process.patch b/app-forensics/openscap/files/test_probes_process.patch
deleted file mode 100644
index b9c1c3a64b45..000000000000
--- a/app-forensics/openscap/files/test_probes_process.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tests/probes/process/test_probes_process.xml.sh.orig	2012-04-05 15:49:38.746901398 +0200
-+++ tests/probes/process/test_probes_process.xml.sh	2012-04-05 15:50:02.330775903 +0200
-@@ -1,6 +1,6 @@
- #!/usr/bin/env bash
- 
--TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | awk '$1 != 2 && $2 != 2 {print $3}' | \
-+TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | grep -iE '^[a-z0-9A-Z \-]*$' |grep -vE 'cron|grep' | awk '$1 != 2 && $2 != 2 {print $3}' | \
-         sed -n '2,30p'`)
- 
- COUNTER=1
diff --git a/app-forensics/openscap/openscap-0.9.1.ebuild b/app-forensics/openscap/openscap-0.9.1.ebuild
deleted file mode 100644
index 600b216c48c4..000000000000
--- a/app-forensics/openscap/openscap-0.9.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.1.ebuild,v 1.1 2012/10/25 17:16:04 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion-r1
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
-#RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
-	nss? ( dev-libs/nss )
-	rpm? ( >=app-arch/rpm-4.9 )
-	sql? ( dev-db/opendbx )
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	test? (
-		app-arch/unzip
-		dev-perl/XML-XPath
-		net-misc/ipcalc
-		sys-apps/grep )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-
-	#probe runlevel for non-centos/redhat/fedora is not implemted
-	sed -i 's,.*runlevel_test,#&,' 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 "",' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*process58_test.*,echo "",' tests/mitre/test_mitre.sh || die
-
-	if ! use rpm ; then
-		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
-		sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
-		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
-		#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"
-	else
-		myconf+=" --disable-bindings"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	econf ${myconf}
-}
-
-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
-	fi
-	if use bash-completion ; then
-		dobashcomp "${D}"/etc/bash_completion.d/oscap
-	fi
-	rm -rf "${D}"/etc/bash_completion.d || die
-}
diff --git a/app-forensics/openscap/openscap-0.9.3.ebuild b/app-forensics/openscap/openscap-0.9.3.ebuild
deleted file mode 100644
index dbc31a4929bf..000000000000
--- a/app-forensics/openscap/openscap-0.9.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.9.3.ebuild,v 1.1 2013/01/04 22:48:07 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion-r1
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
-#RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
-	nss? ( dev-libs/nss )
-	rpm? ( >=app-arch/rpm-4.9 )
-	sql? ( dev-db/opendbx )
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	test? (
-		app-arch/unzip
-		dev-perl/XML-XPath
-		net-misc/ipcalc
-		sys-apps/grep )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-
-	#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
-
-	# 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
-		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
-		sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
-		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use selinux ; then
-		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 ; then
-		myconf+=" --enable-python"
-	else
-		myconf+=" --enable-python=no"
-	fi
-	if use perl ; then
-		myconf+=" --enable-perl"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}" -name '*.la' -delete || die
-	if use doc ; then
-		dohtml -r docs/html/* || die
-		dodoc docs/examples/* || die
-	fi
-	if use bash-completion ; then
-		dobashcomp "${D}"/etc/bash_completion.d/oscap
-	fi
-	rm -rf "${D}"/etc/bash_completion.d || die
-}
diff --git a/app-forensics/openscap/openscap-0.9.3-r1.ebuild b/app-forensics/openscap/openscap-0.9.8.ebuild
index a6f62ef70cff..b8737e8e3e47 100644
--- a/app-forensics/openscap/openscap-0.9.3-r1.ebuild
+++ b/app-forensics/openscap/openscap-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # 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.9.3-r1.ebuild,v 1.1 2013/01/30 18:43:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.8.ebuild,v 1.1 2013/06/18 10:38:18 xmw Exp $
 
 EAPI=3
 
@@ -15,11 +15,12 @@ SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
+IUSE="bash-completion doc ldap nss perl python rpm selinux sql test"
 #RESTRICT="test"
 
 RDEPEND="!nss? ( dev-libs/libgcrypt )
 	nss? ( dev-libs/nss )
+	ldap? ( net-nds/openldap )
 	rpm? ( >=app-arch/rpm-4.9 )
 	sql? ( dev-db/opendbx )
 	dev-libs/libpcre
@@ -41,6 +42,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	sed -i 's,^    bash,    LC_ALL=C bash,' tests/probes/process/test_probes_process.sh || die
+
 	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
 
 	#probe runlevel for non-centos/redhat/fedora is not implemented
@@ -67,16 +70,21 @@ src_prepare() {
 		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
 		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
 		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
-		sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
+		sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
 		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
 	fi
 	if ! use selinux ; then
+		einfo "Disabling SELinux probes"
 		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
-	#450328
-	epatch "${FILESDIR}"/${P}-policy.patch
+	if ! use ldap; then
+		einfo "Disabling LDAP probes"
+		sed -i 's,ldap.h,ldapp.h,g' configure || die
+	fi
+
+	epatch_user
 }
 
 src_configure() {