Version bump (seems to fix bug #356041), use apache-mirror, added USE-flag to use...

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

diff --git a/dev-libs/xml-security-c/ChangeLog b/dev-libs/xml-security-c/ChangeLog
index 133ba6c1f59593e77c74def981bfb074fdc5a79b..f1ab444485845eaa5bedb32c1ef08640cd67308b 100644 (file)
--- 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/Manifest b/dev-libs/xml-security-c/Manifest
index 7f5c2acc8fac352fbf62cfd6b7eddb4feabacf72..d31af618fc709d1e2c14a72be65b6f6533828d79 100644 (file)
--- a/dev-libs/xml-security-c/Manifest
+++ b/dev-libs/xml-security-c/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.5.1-parallel_build.patch 631 RMD160 e42186615618834a43674e71abb309d46a5ad0e7 SHA1 7d49e2b1725c0ed44e2f61743af1ee720c4ce4c2 SHA256 5985d4b938482cc6ae77c7bc172629c8db19d52af3891fae3db57d3668aba8e7
 AUX 1.5.1-xalan-c-1.11-compat.patch 4253 RMD160 7de24ada79101939d358d61a2678cfd4acb25b83 SHA1 891f87019832759168fb34231b4045f03b410ae3 SHA256 0d831873096732a83ad0f6d8adcce2f14e9d08c3a89c9932680f4aa5066f2853
+AUX 1.6.1-nss-compilation-fix.patch 498 RMD160 10706821ae4ba01b954b33b7babc772e7a033b6d SHA1 de576accf51ba4b13b5852b8db3a3d976eb90085 SHA256 5873240498e46d2372737829321b7b1b4615abbceeb756264ac9e63c2a556563
 DIST xml-security-c-1.5.1.tar.gz 957928 RMD160 eadeb25398d6a0fa6cd22d531470bc1dea1632d3 SHA1 e51d3dca7f32cfcc2090d4d20cf8a1d032d95d79 SHA256 f31d7efbc1a2d708e82fb7237dca29e4e5552d8a4ca510cfe94c9998055b801f
+DIST xml-security-c-1.6.1.tar.gz 864366 RMD160 02c2e21a8ed2b3eab56b2b0635bc6513116c32b2 SHA1 239304659752eb214f3516b6c457c99f0e6467c7 SHA256 73931a55d6925a82416ea48f8d6f1b8ed591368e1dfc30574fe43904b7c62fcd
 EBUILD xml-security-c-1.5.1.ebuild 1105 RMD160 88f18c56c6bbc2a0e998915ba757474913b1636d SHA1 04c20f8a18b0eaebaa6c43ea06ae072e23e5dff7 SHA256 07baa59909cdc2f2ca899ed0be0d5a45927bd97b9318c00d4d25885afa457ed4
-MISC ChangeLog 1591 RMD160 556aa106ba86e2fdaa5c328a7b3e2fc46283ba56 SHA1 e66b91a5dd03991714deb8a320c2af407d40859a SHA256 239c2e055a4daea47c91d9ada30cf60726ec435b7c4496e5998d63cc4d706962
-MISC metadata.xml 276 RMD160 4b34094c4f5f930768d5f21f2206192c7a22a216 SHA1 ab4ba1fa7738db06567d9730e386967586a17793 SHA256 dcf353b030366f8e1ce5b6a0daefcdd5286b7a1d44920a8fd1f0cfa2b0222d56
+EBUILD xml-security-c-1.6.1.ebuild 1030 RMD160 663cf7c98f9df29a14625af7fb5201cd64dae5ee SHA1 8e9cd2dc65d80a7edabf24dc7b05b4028396b27e SHA256 f3edaf8b991180d3fd07973f3c742adf668df8b4b492e927ed3ffca3c0e14239
+MISC ChangeLog 1882 RMD160 91fa2346f13beaa673f9a3bcedd0d2fdf595e6f1 SHA1 03fe02186bec4a078dbf6ee994a65dcfb4952a4c SHA256 290ca95978d5622e60fd75ab5c69e413fe808cc3f90aa2ceb1eaf1a97cbe90ef
+MISC metadata.xml 391 RMD160 5aea4681b8f8421c3b99d28ec41b57f54d01f5aa SHA1 169e0e387fdb510de866177c13f75b821829b596 SHA256 a77b6a698fa553427ead9110d5c332264873c202ab92b6e9e25ea5288c312b4a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk46o+UACgkQGwVqY66cHjDcoACghC/H8vHFv4OR3xYss0+bz6om
+NNEAmQHkNdIvxdyIMydLgffym35CF68I
+=ZWwc
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..1635d6b
--- /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 3d90e5495daf0001d04edabf5186069b3b1b68b1..adf837241a71f51a47b043ad2cdad6df119dc8c6 100644 (file)
--- 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 (file)
index 0000000..82a1b0e
--- /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
+}