Make pkcs11 support optional. Drop older 3.0 ebuild that fails with that.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index e3a1a439e70f9fcb15cd18ff180215ea3226d5c1..674b237e32a127ad5fb05c387b302faa709fd0ce 100644 (file)
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.314 2011/09/21 06:37:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.315 2011/09/21 10:05:42 scarabeus Exp $
+
+  21 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -gnutls-3.0.2.ebuild,
+  gnutls-3.0.3.ebuild, metadata.xml:
+  Make pkcs11 support optional. Drop older 3.0 ebuild that fails with that.
 
 *gnutls-3.0.3 (21 Sep 2011)
 *gnutls-2.12.11 (21 Sep 2011)

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index bcd0f30e7225e94fd50d326238e00fdd955b5075..885bbfcd2f78b2b7b7f80c89ce0a41d54f9b28ba 100644 (file)
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,26 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b37047382 SHA1 4530657082a0e754356de89a5529d1ad7a18e777 SHA256 c086d5426ef04427038db6af1a4dc62ff32694e91e759ebf9bb3380243ebd9c9
 DIST gnutls-2.12.10.tar.bz2 7253056 RMD160 d1151b1c421cd2b66bd6363f26e0a135b6cff984 SHA1 52ed0bfa3dc7900f8da22f29eaace6ec34439223 SHA256 c21f2e6ba9c78bfe681cfe24f0e8c73e3244da305a57a3287c6c7173a6d9a304
 DIST gnutls-2.12.11.tar.bz2 7162654 RMD160 d8892c8ab44a69e45d43125fd653c25e62d1fb9d SHA1 30c8977c3f32b48e523e09cb8ce8952d80520a4f SHA256 00b58e1aafe99bbd0cb371e7f1df9cc58bf807301cf70a7eebedeee093991360
-DIST gnutls-3.0.2.tar.xz 4658808 RMD160 78aacf2c85259d3284a23ec685da31a491b7928c SHA1 f612b00626da68eea2d46a8a8f360a6cf67cc596 SHA256 315a33544d0d0e8b832e2494f15c04125629f72c1ada9af4c9de6c1bcf91c04b
 DIST gnutls-3.0.3.tar.xz 4281044 RMD160 455ad881e5abacb8a3b581534cbef24b256d1ff5 SHA1 0e6c325ae12cf1a4bd7d25125b8d58d51472fc14 SHA256 1c9f7e5e22b30cc7e558b00aa0a78388852b62b241c68c4f5dce1cb39ca6298b
 EBUILD gnutls-2.10.5.ebuild 2837 RMD160 08f973e7eab9f993a3be578f84455f623df06969 SHA1 00d1384fcb7b2f720a23decdb5c2563be3680da3 SHA256 62595d10eff18850b36d623cb66cbcdccc6d5e01ae71b5d06fd5898e165f139e
 EBUILD gnutls-2.12.10.ebuild 3149 RMD160 ac00128e761fc1d84e742c2b20e15f45c9ffc66c SHA1 3201bd3d7fd8e8087531d851c396ebb77d87ff1f SHA256 46cf777e7174bf01ecb7f4942ff379a2153f61241ba5c70010e8377089baa69c
 EBUILD gnutls-2.12.11.ebuild 3149 RMD160 ae31ae8775ac879131bb6cc03270fb167c61af5d SHA1 7cbe4941e08f188c9f0e02e320e82622d668aa63 SHA256 dc7592dd53e4a391c0cde2dc5034c661c969cafcda40e9eb8cbd27ee263ceddc
-EBUILD gnutls-3.0.2.ebuild 2718 RMD160 d4ce0fbf8594a9ae5520f0a4956df3377c232859 SHA1 27d4732c33589fe0abbc871839e99ed430d927cb SHA256 8763feba908922dffdfec07bfb39647a8282a74af064797f7dd6259d8a39f413
-EBUILD gnutls-3.0.3.ebuild 2718 RMD160 99f149c06e3cedd65a398cd7c2da5c569508c113 SHA1 ce5017864002ce9d461243db7061cfca061f3847 SHA256 e09ebbf2354b2daba9481b54cdaede0d3b240ea63187d3fe65bd9fbc9071d71c
-MISC ChangeLog 47089 RMD160 65ae24a9d96efde019d4aceba2ff5c44b1fac6c4 SHA1 c3aa2ea1a9dbbf7c0a6946b460409c47548ea85c SHA256 9398ea129cf56599eceba8190c789d704bb59bb3a5b30b08b24490bd3425a0b4
-MISC metadata.xml 253 RMD160 d29cff22b196e16cfd1725a25b1e9334167d38cf SHA1 2122cdcae7f58713b95483c3da76f35dd15e8aef SHA256 98ed95679982db831ecd5feaea09ada3657c97d63a97c41aa6c894487bca5a30
+EBUILD gnutls-3.0.3.ebuild 2768 RMD160 310a64ad55eecc2b8f3f7b7010f7d845343f8c9e SHA1 b7266a284b0f9cfd6e4fdc50e8d3d14f1a48bce1 SHA256 c2a7eba33a07f59ec11f54eb712c045c7e4823dc2434665729b2220e37c14793
+MISC ChangeLog 47280 RMD160 5c9bff981d6f646f2fc1865a6b7804ebc9df2c5e SHA1 f424e8091b44f0c0fd010000c61be5885df63625 SHA256 892a4ca68a2562164278322b9468d7d7a0a416f8a41dbc8126564802478cb8b1
+MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOeYYoAAoJEEqz6FtPBkyjwEgH/RWps0w3juX+e5aFqW57MvWA
-mLXvO3XGL0K90Z2f2oGZ6XEUEF6ynPakuRDfa/U3b37ievSuAehfxu7S6dWhl6nz
-BYAIEWuW7fWXjDfpYMY4sD8JtA92lNfnybFnB3riKjNrH/9kj5EfSiKLVgzHT4OD
-2gVsOBXu926UKdCV3Mv3996hWrVcMXUXbXwO6ZjkjrFdr6mAhNcvgowpIaNOPaMs
-bGWGK/RPKH0o5Nqr20M7RBJNb+KRinHxbZ57j3WXQJkROpuALD2YIVntd96bXHD2
-xz9e9UE+7Yh/JPt4j4jt0IQ1rWKo+fem3ufmCUHStJ1oOC9AlO4hKXX1uY3rSAQ=
-=/R50
+iQIcBAEBAgAGBQJOebbWAAoJEOSiRoyO7jvotZEQAINyp62eVWtu6PJbo9IetrNa
+OFHmPyjhpYL3iauFVtxqMNN/3oLrsyFmcjLjSnJkrj1zIm5QR4a5xC8i2mUnisL/
++oV2yi8uSlKwyvQTTjxZ5S6YXZLIUVkgixlYITDjZSDGclTj9QBtCZ7ygPoBLEc9
+Hx7Osa2oE5+RdsDn6ZbuRtXTjscFkAR6dwNEYJhKhnIIWIQkZvUomURMK0vgoE4y
+h9nyQZrxBcSY2GVriAhKJPWZJ9v7dMu6LwLN/DGfu3NfTkeBHrSB9qepn6YlIQO1
+al1WoFeLNrIL1ees0hjX05sk/fL2URMrOJ48uF4jb8xtoMjoiX8Gr83Sp0MbPMJr
+YPg6x8Ltj5sAkfZMwN535akeJmJQHMv9cKonhjQL8Ip+DO/91TlwtKg7oFt7nofJ
+smDh2fJ4q1aQ4jEx2MsMVdnIQMcYWl5egb9UQ6Isc86AnlxkpNNmdd6ho8X1BElX
+qwQwSGeQ8OKxPw9SUqlTNfNibntqI+BPpjLLEw2a46fxnatuTDzLYcab+4G6ApRE
+78DZr61iuyJbm6ozgr+ICk6c1l8V9BSPpWTUZAcPD+KOOogz7hs9HPKq+pe6Sb46
+fS6HTZrZOSbbTrUg00WGW4TDrlkMt3eOz3l/5VP+zpz16Vh5O5TniC+kFZalCHjA
+SU6iskCqBTulxE5zBXWI
+=SEAQ
 -----END PGP SIGNATURE-----

diff --git a/net-libs/gnutls/gnutls-3.0.2.ebuild b/net-libs/gnutls/gnutls-3.0.2.ebuild
deleted file mode 100644 (file)
index 5d644c3..0000000
--- a/net-libs/gnutls/gnutls-3.0.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.2.ebuild,v 1.1 2011/09/18 07:50:20 scarabeus Exp $
-
-EAPI=4
-
-inherit autotools libtool
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-
-if [[ "${PV}" == *pre* ]]; then
-       SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz"
-else
-       MINOR_VERSION="${PV#*.}"
-       MINOR_VERSION="${MINOR_VERSION%%.*}"
-       if [[ $((MINOR_VERSION % 2)) == 0 ]]; then
-               #SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-               SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-       fi
-       unset MINOR_VERSION
-fi
-
-# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="+cxx doc examples guile +nettle nls static-libs test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND="
-       app-crypt/p11-kit
-       >=dev-libs/libtasn1-0.3.4
-       >=dev-libs/nettle-2.1[gmp]
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nls? ( virtual/libintl )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-src_prepare() {
-       local dir
-
-       # tests/suite directory is not distributed.
-       sed -i \
-               -e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
-               configure.ac || die
-
-       sed -i \
-               -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-               doc/Makefile.am || die
-
-       for dir in m4 gl/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       eautoreconf
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       [[ ${VALGRIND_TESTS} != 1 ]] && myconf+=" --disable-valgrind-tests"
-
-       econf \
-               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-               $(use_enable static-libs static) \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable doc gtk-doc-pdf) \
-               $(use_enable guile) \
-               $(use_enable nls) \
-               $(use_with zlib) \
-               ${myconf}
-}
-
-src_test() {
-       if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then
-               elog
-               elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
-               elog
-       fi
-
-       default
-}
-
-src_install() {
-       default
-
-       find "${ED}" -name '*.la' -exec rm -f {} +
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps}
-               dohtml doc/gnutls.html
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c
-       fi
-}

diff --git a/net-libs/gnutls/gnutls-3.0.3.ebuild b/net-libs/gnutls/gnutls-3.0.3.ebuild
index 28187d811143a3e297103e1bfedb8f6b716c6bec..90219c40102b1998fa1d3541d38f393b546f37bc 100644 (file)
--- a/net-libs/gnutls/gnutls-3.0.3.ebuild
+++ b/net-libs/gnutls/gnutls-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.3.ebuild,v 1.1 2011/09/21 06:37:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.3.ebuild,v 1.2 2011/09/21 10:05:42 scarabeus Exp $
 
 EAPI=4
 
@@ -27,15 +27,15 @@ fi
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="+cxx doc examples guile +nettle nls static-libs test zlib"
+IUSE="+cxx doc examples guile +nettle nls pkcs11 static-libs test zlib"
 
 # lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
 RDEPEND="
-       app-crypt/p11-kit
        >=dev-libs/libtasn1-0.3.4
        >=dev-libs/nettle-2.2[gmp]
        guile? ( >=dev-scheme/guile-1.8[networking] )
        nls? ( virtual/libintl )
+       pkcs11? ( app-crypt/p11-kit )
        zlib? ( >=sys-libs/zlib-1.2.3.1 )"
 DEPEND="${RDEPEND}
        sys-devel/libtool
@@ -81,6 +81,7 @@ src_configure() {
                $(use_enable doc gtk-doc-pdf) \
                $(use_enable guile) \
                $(use_enable nls) \
+               $(use_with pkcs11 p11-kit) \
                $(use_with zlib) \
                ${myconf}
 }

diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 6f279968eaa1e0b1979f7d1cd050e4df2e0c62b1..20bcca9dddd7897fae7e9f7c191fd0ec8f41e9b2 100644 (file)
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -4,5 +4,6 @@
        <herd>crypto</herd>
        <use>
                <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> as crypto backend</flag>
+               <flag name="pkcs11">Add support for PKCS#11 over <pkg>app-crypt/p11-kit</pkg></flag>
        </use>
 </pkgmetadata>