Add 1.0.1, drop 0.9.4.1, update 9999; proxy-committed for Corentin Labbe

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

5 files changed, 75 insertions, 34 deletions

diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog
index 848fa1709a55..8c0bd10b7a5e 100644
--- a/app-forensics/openscap/ChangeLog
+++ b/app-forensics/openscap/ChangeLog
@@ -1,6 +1,20 @@
 # 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.25 2013/09/26 08:19:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.26 2013/12/23 19:59:12 swift Exp $
+
+  23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -openscap-0.9.4.1.ebuild,
+  +openscap-1.0.1.ebuild, openscap-9999.ebuild, metadata.xml:
+  Add fixes of 1.0.1 in live ebuild
+
+  23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -openscap-0.9.4.1.ebuild,
+  +openscap-1.0.1.ebuild, metadata.xml:
+  Remove old ebuilds
+
+*openscap-1.0.1 (23 Dec 2013)
+
+  23 Dec 2013; Sven Vermeulen <swift@gentoo.org> +openscap-1.0.1.ebuild,
+  metadata.xml:
+  Bump openscap to 1.0.1
 
 *openscap-9999 (26 Sep 2013)
 
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index 61430704d66d..a6e0f0806803 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -2,28 +2,28 @@
 Hash: SHA256
 
 DIST openscap-0.9.12.tar.gz 12777461 SHA256 8af595087fcf8b6a5076e3755b7a838fcaca899b398537c44c0fe3ff20d90cc8 SHA512 e4a2944a5f4b7adb3df98cfa575f3befbf7418b8ba8e4648016b00026ea9a811cb189f50453f6ac99e3d5e0b5993598b019c33d1c363477a5b1d80349ddf6e7b WHIRLPOOL d86cc85d7b03f6ba1245015310fb6d2a4bc7abf14c7475e3dea1f07333b3c6e71654e89ac25ad80d205b70b8bb7034608e2ab2279ea020ee8dc4f94f897315d3
-DIST openscap-0.9.4.1.tar.gz 12012752 SHA256 9f80ba69482eb9a5ec0f08491fde3d5963c84441576fa5ede4fcc707d6166059 SHA512 8a91e5249c52a7174e03faa8bf347b6e39cb7330ec9aec5c6413d22b654a964c2f6861bc781e1e358bd62eafbd56562bbe980b18bf472b9645003f17fdc39c99 WHIRLPOOL b4b6beae40d60e8852b9a68ab2421a837d3139c6ea598c7e5b6355690178f1f85d88bece9cfd81d2a09fe177361ddd529d83ba1aced67bc87ad4e19d08cbae98
 DIST openscap-0.9.8.tar.gz 12688640 SHA256 977fd8a0196c3dce727b9b166777385565a7c5001ca4ef20bb024d12dcb53af2 SHA512 35a221cde33d3295a0dfb59422aa276a6d307621d45920fa70d6ad056ab84ad94953f060b22c6e0dc0738e2e0694ec66f514c36b8cb178ffd5ca3639ffd8ab94 WHIRLPOOL ec952d10dab5cada7f01cf82224be7858c730a66545c05ad7148c20e2e62f6ac8d5aaaeac67d67038df8a6ab3a0290e1e9c76ee53748e485de0bbd41b5c281fc
+DIST openscap-1.0.1.tar.gz 13166679 SHA256 17fe190e35c68aaaaf0890daaed07ab65521c6879217ae30cfc68a66b743f0bb SHA512 ac497e5bcf06ef570ee2b3e022310797a9ac16585115cd09bdf81777bad9ef09f4536970c1f00bc9b93c227ecd95403c81c06886adab0155aabac07a65e9c7ea WHIRLPOOL a9913141d9ae67173e5a992396cb029a69b67abfc3ea30adbefa89e67d97257c11d131333ad46449f1d95660e6c6d41224328239c15ccb47b76cac634ca10f8b
 EBUILD openscap-0.9.12.ebuild 4108 SHA256 02aab6d619a8190950b338d0f4e2ce53e3fe0580ebe43e0b1fc453da2a5863fc SHA512 91ab1d9332bf7214ffaaa2f02f3fb5731e4576ff37f52caa1fbf6224ab68bd26c9cc2319757d1a7c21c792da35e2bdf1aa00a50d5b37e4423d17fb11557a630b WHIRLPOOL 45f00812938fe636dc8dead415160197a8b99b2a41efc31e1eb9985070e28b9962b7b33f1e313d46d3edb87c24bc56d925ff2571355a9b78b4d26c9b9a930b06
-EBUILD openscap-0.9.4.1.ebuild 3834 SHA256 441bdd72ee9a890566e86edc221fba732c7914b96c87841a508368bcfda717b1 SHA512 bf40561aa07ae2c437c3922fb2c823268c034d9b76f0429a041583d005ef669b58ac578fc90c9146419d8603e27681d28e1d5e57baef4dbe80d19ac1297438e6 WHIRLPOOL 1f37d539ce40469fa4c205ecc632014fa8df4ae41b967c32a255ed812ce1ed5ad6f8512da6230397b5b8fc2b7db50b4586eef00229dad13eb010461b20f150f5
 EBUILD openscap-0.9.8.ebuild 3920 SHA256 7f4acec7bfd7c474d88b968101559bfcdd482a21dd53e2b51598eea095214081 SHA512 c86bf47e61efa822b7c411f0c6db6ddc6cbeef64dca1dd1bb6939f83da6a006689b6ff2dee1da95491da1bb3496c5a6dc573d1490aa9513afb93ebe907b6e1f7 WHIRLPOOL 8ddf3e5169c185753296a6f009bd56d99405326e07e6da6b3069bc3f657833b61c2567e7c28a4eeb1115b983d3c3eedc33228f7c06972781cf49e0e9e8bbacf4
-EBUILD openscap-9999.ebuild 4704 SHA256 46302192b377ed8a16aff15ec5426a1ac18cc0299d82ffe2c3e217afbe1d7b9e SHA512 b99f3724959d11780522d95f8741b7d1a775af0e376d7c2367def91ba0a6894cc673608ade9d0c90e68cbf3e2a896e2c086a77e691583e50809ea39c78747bcb WHIRLPOOL 4d6c80f0580ccc4983a08d4d054646438f5fab7fae953c74d93b41df2b5f54ac69108fbf98a231bb5fa3b29c9a4a39c5e2b32d61065adc23aad309ac4d056175
-MISC ChangeLog 4751 SHA256 c4a51ba6830761bcc1338d7434ff0188bf688a0f5b10d5fa9f5933311a0666cb SHA512 72333275017ef726b4e52535aee13d47881a2ffcdea93ea5d3a041a78a9731b8f6cc930d6a03873a0777fb067362f1d71cebb713cecf839fef153adca062fec8 WHIRLPOOL 704f9c0e646968f8a595694c78f6e15ba10722483567a4b418cb0ef8e77f371411f8f92533b39002a11bfdaba2878cb845cf7bf3ccbdbe125268f884632d4ad4
-MISC metadata.xml 618 SHA256 71ee7e7ff4c112a01d76fbdb0bff700309e039aeda9dfc270f73f09587a76f1e SHA512 9cfb7313c3d454df8d7b21c560f1d3e7095da540585ef5930ea5ab555a448156188bef081c4420ee4238683ee3f0f2054e6b39659af4f9af3a3548134940d7e1 WHIRLPOOL c0711f439a4fa09a42f4f8975b6225730a044e3e389d52dbc43101e3d8dbc8b53b84de41a4fdee0d0ee833b9c6dcd09e81def1cb777e290b64167713de851b08
+EBUILD openscap-1.0.1.ebuild 4434 SHA256 853689f02930b551b627d855c436bfd391c21e6cde4f50399992f22b13b17130 SHA512 adc0121706ee8ef04fc419ce5698a90814e76f526d48e75a48feaffe905537ce6c6cd36a4dc8bd129dd0796370bd8fb0f9c1748175036bcce8451226a66b29c0 WHIRLPOOL 158c6d7080dec171054f47dccc8fac6731c564320386db7661dc6f17606e22348cc89e3395ad9ec49de0bb059fec47c5d05a0b279f3a358a48525a4b7c4c32e6
+EBUILD openscap-9999.ebuild 4843 SHA256 986a7d8457ce88d6005ccb92ee224e610730d6bc06597966eb8ed0a365b1b3e9 SHA512 66c01145465ce5aaf5c45231e1cecc64e0bca8c579a2014021d73e57f02e64403c2834de07f7a1aa4d1860e6cf8ba7408b2e3d39b933b837a59e69b3b591ba53 WHIRLPOOL f12c51fe0d69c7a500aa6d5931d02f99cbfb2a8545494b81796ce74d7fd1f02d71910433b864efb8e0f4503fd343ebc1309676f0375841ed2b1fca0c57451236
+MISC ChangeLog 5208 SHA256 859ebe713f736d2e079e5dc5339b6be627aca4498fa65fc8107040923864620b SHA512 8c458aa23f66595981eaf8eae8262f1462d5b6b22bcabbad133ed9f67501014eb6df95b09c3fb484baa42aa14cf82dab97dcfde3b981caa2a3a2c50d5de44cfe WHIRLPOOL 9f1c46085a723eb025ad0378a85a81562a4097b07ff8b24cb2f285d102e6af55252b620f5015aa1b7226cd9fd969079006ea095eb96e5ff9942bd64cd12a292d
+MISC metadata.xml 679 SHA256 8db139f8e51200a7422a764af7fee8bf530d69262af1e0de9ed30512f9492cb7 SHA512 2c7c81d31042b64673a01dae7e4a24df139f3bc066ecb7af73b91a60d22f8d8ee9f448bf31ec9d1ac26a41bc66e467855a61fe56e35fe7c7e06bd89fbb83b971 WHIRLPOOL c8a2efbe37a7d02161f49b29dc3b4bc823887d31cffe0d54baeb5b10cdc882bb0b3a03d45d286ed8176e96d63cd8f1022671833bb6abbb55dccb9009098a9392
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSQ+3zAAoJEC7dUkA7aK9HT3UQAJ0bDgGanmxFp2tvdd7xV4W6
-0jO8wxOh3zSrkae1A5zL6YoOLWfQqVy/rfuioxcdDmYpwUD3OKUR4MbL2hbv/eYt
-+AQhql4WGgZ2HntmYDzgHIsxBp62yfqFppcPXr/vdaxX48v5vticYQUcEdpSZG8L
-8e+UgTG+mO0jy2kyPkcbGBVfgTJHqJheaKqPj8fIepA4cXRv+j4tJSY7RPtzzz0C
-mZuzmCJDdca0NSmPi83kjbFiySK6YYp7kO3iXwhxCG0pWZGzX/bNnh6c6/qyTYyI
-FUWggkbvRYj70nHWErfDvSrzDQV9qOIVGYlIPLYMd6hefC8k7CgCCHr343b+RLPt
-XDE6vcK/nyWN+BhLXIdpsH3oaxbLJ/pdZ+/EgYd9jnlm9OLwwBn8Eab7dR9mu/NR
-GOo1EJXN82Vwz+O6aF/39sEjMabc9qdLBppvdgEuPhHQN83SYrBIFPQcEIP0si5q
-n9Kh1BU95q7BA2XAmRoLJ2lyoYrFz8TUA1B7mBTpoKPu+HmIiAqkoFJWS8m1yHU/
-XRXv5FlZr5dPuOWMj3YVetj51VJh7y9Y//eh9oKkYtN6ZuLJIfgtcbhbCC3U8clE
-2K6rrSLUyOmK5xC8EnxGXzojnbew+WGasmsKsWyhtRdBNf/+z8A95iX0ffDPIxOy
-/rZYXuJgwHnjw04tUF4O
-=iFKk
+iQIcBAEBCAAGBQJSuJWsAAoJEC7dUkA7aK9HDSIP/3znzUUhBHlPRrvAXrE13lpd
+skZdVyY1OucHGTF5I/aCDtrv12BDNMb92rVr+ue//Zrqelr4WjHeLkJOffphXahI
+fVN7nergKvOfsMIpI5YMiOYh/CByegXmzhTa0gcHEXXoUz5aCb0utNG7gghU9iXT
+cuc9FyKcWCbJQHAIFXrx2m+dGxP+irY7qbY6PxmoEwn2Jj2YH1S2u5G2T3AyXzID
+IEw6l3xC7otfMOsAMw3rH2v1NJ8n3kseFM4sV8iEJMZt4gT3GvILhWem4ri4MwWe
+BhpczQZYs1dm1VwnjqetPpP/MJKUCR5nuy77oI8WRxI2UXJ7BiBDnj2DTSioiO4U
+U1cooAoeUKZC4J6g8/kSQv0w0qi7WTXCDStV6ObMcW6OkboCXGWvFzIEIsnpC4mQ
+V3sIcAf+jt7k5WcZZ1GNYyfvHaVkWv371kZckWAfSWiuBkjoaa083RtLa6daRDOE
+QVARQYxMnPr9cfDEd+usx9RkiGDZoz9VrvzD0acRqdTnvBg9fNRyWBLBNYYde4s8
+Rs6AaFRAzfPWbfZniRkfP+Io9ZuBLpgqK0SC/oeZzGx5fcfBoIjAQnAIovKynd9S
+8JSm/mrLlf4Lz8tdmdEeJ4JbP6gotrMPW9Db03mGRMePUvXPOUgl5CsVSF+Ms4SC
+dE/We0ezM2koP8Dqao6B
+=JyZP
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/openscap/metadata.xml b/app-forensics/openscap/metadata.xml
index fb7ee2d0a1aa..6537c58a4650 100644
--- a/app-forensics/openscap/metadata.xml
+++ b/app-forensics/openscap/metadata.xml
@@ -8,6 +8,7 @@
 <description>Maintainer</description>
 </maintainer>
 <use>
+<flag name="gconf">Build the gconf independant probes</flag>
 <flag name="nss">Prefer NSS over libgcrypt as the crypto engine</flag>
 <flag name="rpm">Compiles the RPM probes</flag>
 <flag name="sce">Enables Script Check Engine (SCE) support</flag>
diff --git a/app-forensics/openscap/openscap-0.9.4.1.ebuild b/app-forensics/openscap/openscap-1.0.1.ebuild
index 3c9b82eefaba..7d5ef44c1a38 100644
--- a/app-forensics/openscap/openscap-0.9.4.1.ebuild
+++ b/app-forensics/openscap/openscap-1.0.1.ebuild
@@ -1,12 +1,13 @@
 # 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.4.1.ebuild,v 1.1 2013/03/04 19:09:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-1.0.1.ebuild,v 1.1 2013/12/23 19:59:12 swift Exp $
 
-EAPI=3
+EAPI=5
 
 PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit eutils multilib python bash-completion-r1
+inherit bash-completion-r1 eutils multilib python-r1
 
 DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
 HOMEPAGE="http://www.open-scap.org/"
@@ -15,19 +16,25 @@ 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 ldap nss perl python rpm selinux sql test"
+IUSE="acl bash-completion caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr"
 #RESTRICT="test"
 
 RDEPEND="!nss? ( dev-libs/libgcrypt )
 	nss? ( dev-libs/nss )
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	gconf? ( gnome-base/gconf )
 	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
 	rpm? ( >=app-arch/rpm-4.9 )
 	sql? ( dev-db/opendbx )
+	xattr? ( sys-apps/attr )
 	dev-libs/libpcre
 	dev-libs/libxml2
 	dev-libs/libxslt
 	net-misc/curl"
 DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
 	perl? ( dev-lang/swig )
 	python? ( dev-lang/swig )
 	test? (
@@ -36,12 +43,11 @@ DEPEND="${RDEPEND}
 		net-misc/ipcalc
 		sys-apps/grep )"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
+#	uncoment for debugging test
+#	sed -i 's,set -e,&;set -x,'	tests/API/XCCDF/unittests/test_remediate_simple.sh || die
+	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
@@ -87,6 +93,9 @@ src_prepare() {
 
 src_configure() {
 	local myconf
+	if use debug ; then
+		myconf+=" --enable-debug"
+	fi
 	if use python ; then
 		myconf+=" --enable-python"
 	else
@@ -100,9 +109,21 @@ src_configure() {
 	else
 		myconf+=" --with-crypto=gcrypt"
 	fi
+	if use sce ; then
+		myconf+=" --enable-sce"
+	else
+		myconf+=" --enable-sce=no"
+	fi
 	econf ${myconf}
 }
 
+src_compile() {
+	emake
+	if use doc ; then
+		cd docs && doxygen Doxyfile || die
+	fi
+}
+
 src_install() {
 	emake install DESTDIR="${D}" || die
 	find "${D}" -name '*.la' -delete || die
diff --git a/app-forensics/openscap/openscap-9999.ebuild b/app-forensics/openscap/openscap-9999.ebuild
index 0926190e719f..72c3b1cd7f3f 100644
--- a/app-forensics/openscap/openscap-9999.ebuild
+++ b/app-forensics/openscap/openscap-9999.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-9999.ebuild,v 1.1 2013/09/26 08:19:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild,v 1.2 2013/12/23 19:59:12 swift Exp $
 
 EAPI=5
 
@@ -25,14 +25,19 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="bash-completion debug doc ldap nss perl python rpm selinux sce sql test"
-RESTRICT="test"
+IUSE="acl bash-completion caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr"
+#RESTRICT="test"
 
 RDEPEND="!nss? ( dev-libs/libgcrypt )
 	nss? ( dev-libs/nss )
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	gconf? ( gnome-base/gconf )
 	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
 	rpm? ( >=app-arch/rpm-4.9 )
 	sql? ( dev-db/opendbx )
+	xattr? ( sys-apps/attr )
 	dev-libs/libpcre
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -135,9 +140,9 @@ src_configure() {
 
 src_compile() {
 	emake
-	if [[ "${PV}" == "9999" ]] && use doc ; then
+	if use doc ; then
 		einfo "Building HTML documentation using Doxygen (which will take a while)"
-		cd docs && doxygen Doxyfile
+		cd docs && doxygen Doxyfile || die
 	fi
 }