Version bump (seems to fix bug #356041), use apache-mirror, added USE-flag to use dev-libs/nss, use EAPI-4.

(Portage version: 2.1.10.6/cvs/Linux x86_64)

4 files changed, 70 insertions, 3 deletions

diff --git a/dev-libs/xml-security-c/ChangeLog b/dev-libs/xml-security-c/ChangeLog
index 133ba6c1f595..f1ab44448584 100644
--- a/dev-libs/xml-security-c/ChangeLog
+++ b/dev-libs/xml-security-c/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/xml-security-c
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/ChangeLog,v 1.2 2009/07/27 09:54:18 dev-zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/ChangeLog,v 1.3 2011/08/04 13:53:11 dev-zero Exp $
+
+*xml-security-c-1.6.1 (04 Aug 2011)
+
+  04 Aug 2011; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.6.1-nss-compilation-fix.patch, +xml-security-c-1.6.1.ebuild,
+  metadata.xml:
+  Version bump (seems to fix bug #356041), use apache-mirror, added USE-flag to
+  use dev-libs/nss, use EAPI-4.
 
   27 Jul 2009; Tiziano Müller <dev-zero@gentoo.org>
   xml-security-c-1.5.1.ebuild, +files/1.5.1-xalan-c-1.11-compat.patch:
diff --git a/dev-libs/xml-security-c/files/1.6.1-nss-compilation-fix.patch b/dev-libs/xml-security-c/files/1.6.1-nss-compilation-fix.patch
new file mode 100644
index 000000000000..1635d6b80339
--- /dev/null
+++ b/dev-libs/xml-security-c/files/1.6.1-nss-compilation-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/xsec/tools/xtest/xtest.cpp b/xsec/tools/xtest/xtest.cpp
+index ec40cb2..9cd389e 100644
+--- a/xsec/tools/xtest/xtest.cpp
++++ b/xsec/tools/xtest/xtest.cpp
+@@ -2566,7 +2566,7 @@ int main(int argc, char **argv) {
+ 		}
+ #endif
+ #if defined(XSEC_HAVE_NSS)
+-		else if (stricmp(argv[paramCount], "--nss") == 0 || stricmp(argv[paramCount], "-n") == 0) {
++		else if (_stricmp(argv[paramCount], "--nss") == 0 || _stricmp(argv[paramCount], "-n") == 0) {
+ 			g_useNSS = true;
+ 			paramCount++;
+ 		}
diff --git a/dev-libs/xml-security-c/metadata.xml b/dev-libs/xml-security-c/metadata.xml
index 3d90e5495daf..adf837241a71 100644
--- a/dev-libs/xml-security-c/metadata.xml
+++ b/dev-libs/xml-security-c/metadata.xml
@@ -4,6 +4,8 @@
 	<herd>cpp</herd>
 	<use>
 		<flag name='xalan'>Enable support for XSLT and XPath parsing 
-		by <pkg>dev-libs/xalan-c</pkg></flag>
+			by <pkg>dev-libs/xalan-c</pkg></flag>
+		<flag name='nss'>Use <pkg>dev-libs/nss</pkg> for certain crypto
+			operations (configureable at runtime)</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/xml-security-c/xml-security-c-1.6.1.ebuild b/dev-libs/xml-security-c/xml-security-c-1.6.1.ebuild
new file mode 100644
index 000000000000..82a1b0e135f2
--- /dev/null
+++ b/dev-libs/xml-security-c/xml-security-c-1.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/xml-security-c-1.6.1.ebuild,v 1.1 2011/08/04 13:53:11 dev-zero Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Apache C++ XML security libraries."
+HOMEPAGE="http://santuario.apache.org/"
+SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples nss static-libs xalan"
+
+RDEPEND=">=dev-libs/xerces-c-3.1
+	dev-libs/openssl
+	nss? ( dev-libs/nss )
+	xalan? ( dev-libs/xalan-c )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-nss-compilation-fix.patch"
+}
+
+src_configure() {
+	econf \
+		--with-openssl \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_with xalan) \
+		$(use_with nss)
+}
+
+src_install() {
+	DOCS="CHANGELOG.txt NOTICE.txt"
+	default
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins xsec/samples/*.cpp
+	fi
+}