Version bump to latest 2.12 release and to 3.0.2. Drop older overshadowed versions...
authorTomas Chvatal <scarabeus@gentoo.org>
Sun, 18 Sep 2011 07:50:20 +0000 (07:50 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Sun, 18 Sep 2011 07:50:20 +0000 (07:50 +0000)
Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64
RepoMan-Options: --force

15 files changed:
net-libs/gnutls/ChangeLog
net-libs/gnutls/Manifest
net-libs/gnutls/files/gnutls-2.12.0-C++.patch [deleted file]
net-libs/gnutls/gnutls-2.10.4.ebuild [deleted file]
net-libs/gnutls/gnutls-2.11.6.ebuild [deleted file]
net-libs/gnutls/gnutls-2.11.7.ebuild [deleted file]
net-libs/gnutls/gnutls-2.12.0-r1.ebuild [deleted file]
net-libs/gnutls/gnutls-2.12.0.ebuild [deleted file]
net-libs/gnutls/gnutls-2.12.1.ebuild [deleted file]
net-libs/gnutls/gnutls-2.12.10.ebuild [moved from net-libs/gnutls/gnutls-2.12.6.1.ebuild with 94% similarity]
net-libs/gnutls/gnutls-2.12.2.ebuild [deleted file]
net-libs/gnutls/gnutls-2.12.3.ebuild [deleted file]
net-libs/gnutls/gnutls-2.12.4.ebuild [deleted file]
net-libs/gnutls/gnutls-2.12.5.ebuild [deleted file]
net-libs/gnutls/gnutls-3.0.2.ebuild [moved from net-libs/gnutls/gnutls-2.12.7.ebuild with 52% similarity]

index 500f2011b381b472993d12f5a08568aa5c139c02..2c2d0e3edf2df9b9f18ee5b7403106f9f343c17e 100644 (file)
@@ -1,6 +1,18 @@
 # 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.312 2011/07/11 00:09:02 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.313 2011/09/18 07:50:20 scarabeus Exp $
+
+*gnutls-3.0.2 (18 Sep 2011)
+*gnutls-2.12.10 (18 Sep 2011)
+
+  18 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -gnutls-2.10.4.ebuild,
+  -gnutls-2.11.6.ebuild, -gnutls-2.11.7.ebuild, -gnutls-2.12.0.ebuild,
+  -gnutls-2.12.0-r1.ebuild, -files/gnutls-2.12.0-C++.patch,
+  -gnutls-2.12.1.ebuild, -gnutls-2.12.2.ebuild, -gnutls-2.12.3.ebuild,
+  -gnutls-2.12.4.ebuild, -gnutls-2.12.5.ebuild, -gnutls-2.12.6.1.ebuild,
+  -gnutls-2.12.7.ebuild, +gnutls-2.12.10.ebuild, +gnutls-3.0.2.ebuild:
+  Version bump to latest 2.12 release and to 3.0.2. Drop older overshadowed
+  versions.
 
   10 Jul 2011; Mark Loeser <halcy0n@gentoo.org> gnutls-2.10.5.ebuild:
   Stable for ppc64; bug #361525
index 023fc60c7bb8471daa2278cfadc3a293da0f75a7..17610d8a5e82ed0f10cadc5e86c46f84c611eeb0 100644 (file)
@@ -1,38 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gnutls-2.12.0-C++.patch 579 RMD160 75ea095e943b1073c0cccdbe8518c7aa41bb98c1 SHA1 803a45a75cd26b85e4f21e3959033c96dc9b10be SHA256 93bd7a7e81292de8b5efc0178b836ff1e19d4747ace9ed55f6d0f188b465aad2
-DIST gnutls-2.10.4.tar.bz2 7288167 RMD160 82c3722082a35292d99ccc8cb12023244506c9cf SHA1 f0dcd7b68748b48d7b945c52b6a9e64d643e4b58 SHA256 b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8
 DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b37047382 SHA1 4530657082a0e754356de89a5529d1ad7a18e777 SHA256 c086d5426ef04427038db6af1a4dc62ff32694e91e759ebf9bb3380243ebd9c9
-DIST gnutls-2.11.6.tar.bz2 7743287 RMD160 c3d7456cce6fcb77b0182d13a7127c90113deb9e SHA1 6abc6aa5636a2aa87071bbdeb29ab385ccf60a58 SHA256 4ea79c7a8c215f281994f81f9b8fc80787ac83f8b1c5ff2d89fc5eedd9502c3e
-DIST gnutls-2.11.7.tar.bz2 7034000 RMD160 f0eacfa7de13ae4768853684b2d3ea16de625565 SHA1 fb7b3a3c9add9c5b40b13ed8ff8e123a7f1a7403 SHA256 1df3e0225b0e79f954dd3b2a29ca0afbd38f61e53c65f57fd8bbbbdca1c04db7
-DIST gnutls-2.12.0.tar.bz2 7142406 RMD160 c8ed7bcdb5b0db665c70f53e4f349d5e71d70460 SHA1 48f27df66c7a721c5ce2b690ab936a3c9162c40a SHA256 67fe6449e1f65cd2d8eae85f8ec3280902c1a2079a245691ed252d4117033629
-DIST gnutls-2.12.1.tar.bz2 7142761 RMD160 4fac899c69b7cd4c45c19053d120db51d6295182 SHA1 f3105e39268cb2fbb1d9480ce4bc9b6236ebac26 SHA256 f4f7552cb153c359bf54bbf7f42f64e8ee9330cd69a9d3e4f004d906879e3dd2
-DIST gnutls-2.12.2.tar.bz2 7135433 RMD160 5a44fa0bc5d19f5d5844a0b3b8378ff71bf2c3a8 SHA1 210130d50a13510987a72d7023407e324379567d SHA256 cc964ee51350449142221e7efef2d5ea60459539484538e282c3b48183ab7e43
-DIST gnutls-2.12.3.tar.bz2 7021290 RMD160 f405a971df1e3773f26b854028b11727b28162b6 SHA1 1799bdea6b373e312b055fa7caf06effecb9c033 SHA256 9fb3dba10d3fa6c2817cd47260b4c39026c69128fb39fc5026f179b3672539d3
-DIST gnutls-2.12.4.tar.bz2 7147039 RMD160 773ec1fb10b8fa302834453281e5980c7d0f9bc9 SHA1 4bf25442eab5b30e4a3eb8fa2ba6945660763869 SHA256 b234cccc9924210d7f36d2f3bea31823343273adbb76cb6a4112b48a2cf264da
-DIST gnutls-2.12.5.tar.bz2 7150708 RMD160 d2aa838380dee22d72dfe16ae9b0b2e6c60e0862 SHA1 dd45d4fb7c365d18803b9eafef838b310c899d67 SHA256 bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60
-DIST gnutls-2.12.6.1.tar.bz2 7151787 RMD160 a001b5bbbe2df1bec376af5b8023121d6f463d8e SHA1 c7cf31eac9c74ca2889775c7465b50346294736a SHA256 b3c04c527076863957403246119741c3fce5ed12bf6cffcc4ab882792383499a
-DIST gnutls-2.12.7.tar.bz2 7153031 RMD160 dd1043938087add3ce5e48e6253b5c5cc8140468 SHA1 41943d8f8648072a8e6a40cb213c91acf0451937 SHA256 77d84fe63a249dcdace421fb9e162cfde9a3f2c7be29007799fcfa2856a87527
-EBUILD gnutls-2.10.4.ebuild 2832 RMD160 441eca1d49ebb0ad5bdf970339ea11cad19d9b43 SHA1 036884641cb87a705bec76f3bbc3e74de675da77 SHA256 0a4c4c7945000ea662f4f950c2c3b54afaecf879ea16be2c6a623d92de97971a
+DIST gnutls-2.12.10.tar.bz2 7253056 RMD160 d1151b1c421cd2b66bd6363f26e0a135b6cff984 SHA1 52ed0bfa3dc7900f8da22f29eaace6ec34439223 SHA256 c21f2e6ba9c78bfe681cfe24f0e8c73e3244da305a57a3287c6c7173a6d9a304
+DIST gnutls-3.0.2.tar.xz 4658808 RMD160 78aacf2c85259d3284a23ec685da31a491b7928c SHA1 f612b00626da68eea2d46a8a8f360a6cf67cc596 SHA256 315a33544d0d0e8b832e2494f15c04125629f72c1ada9af4c9de6c1bcf91c04b
 EBUILD gnutls-2.10.5.ebuild 2837 RMD160 08f973e7eab9f993a3be578f84455f623df06969 SHA1 00d1384fcb7b2f720a23decdb5c2563be3680da3 SHA256 62595d10eff18850b36d623cb66cbcdccc6d5e01ae71b5d06fd5898e165f139e
-EBUILD gnutls-2.11.6.ebuild 3120 RMD160 4ac2752ad998c57634acd16fe95f5aa445ad82b0 SHA1 18890e66365aad1f972cb79066bea0d520e127f0 SHA256 2bccd8c39c84cc90d7d4058e843c9ea00d739d25a568c8f69347280c824c7740
-EBUILD gnutls-2.11.7.ebuild 3124 RMD160 dc8547e492d628de4afefae1be6f7b56914df54d SHA1 44f6c9587fd38b34632fb195ad3626e0577ff793 SHA256 43c3b3c64e21bdaee50597d8972be08d391a371af4929a965c40b8408cd557db
-EBUILD gnutls-2.12.0-r1.ebuild 3172 RMD160 36851ea98f86bb065c7c49c3479fb847292688c7 SHA1 60b527cf1b298c6d99094ea632523d46d0df42e2 SHA256 38bcbc18834befad8a54c1dc71eb3468c1119dde088564d52fa2a234b7ba70cd
-EBUILD gnutls-2.12.0.ebuild 3124 RMD160 5bdf263d3f0ebb7723db71e5ae5e287988f1466f SHA1 80c47717fc4c0d01fc45b02a4c994d749c34f69e SHA256 2c6f097663ffb611e1e2e86bf6542b59e03d377112ad53e8f0b944cecd91bdca
-EBUILD gnutls-2.12.1.ebuild 3124 RMD160 c052bb86875b95d8abe4bf511ece52cbd495f0e8 SHA1 d686b8c76c17257ccdfe4d46f9d39c6a4a3d2de8 SHA256 92e7d9093139fd2bcf1e23996139f36251c02afa8674fea01c492d99221456f5
-EBUILD gnutls-2.12.2.ebuild 3124 RMD160 5c0d6c0e796cdb6ed5bd492f439b2374f11bfc26 SHA1 f58f11b228ac5cf0f5998e5ddf3ef96174a131dc SHA256 47cd3e5ccad56f1ad541566c38745b8f254b6de58d240e7d41e55da5b1978cc8
-EBUILD gnutls-2.12.3.ebuild 3124 RMD160 67c5df56e99e1740d5bba5224e97e53b635875e8 SHA1 05d643430f79e636340c8a72a9756977904c1c46 SHA256 6cdf5585d85359b6776e698d35441130c44d650401539ca0a5b910542b2c28d7
-EBUILD gnutls-2.12.4.ebuild 3124 RMD160 73c078d5681ad0098b017fe015f3e77a3b70c7b8 SHA1 273ab0dcf322e30bc15484e5e199675771f05162 SHA256 1e8b94b2ec23294a9e0602db58800e9caeebbe9fdb421e9faf30d40ca4a8c69d
-EBUILD gnutls-2.12.5.ebuild 3124 RMD160 d65162938c7975f758a600287c7c5005fa1156f6 SHA1 7f48620bac7327efacdb17542703cd431f47cd9b SHA256 ea39110137f2ddc94c7d4054d161fa825eef77379a498855aaa8e7247da367f1
-EBUILD gnutls-2.12.6.1.ebuild 3128 RMD160 1c6e31cb5752415efe2504b09c2f0848535d0624 SHA1 dc685f3f62c1c444080648bb872e514d41d5e667 SHA256 3f1c9658f0bfe9a2f03f4d43f285864ed3ca547984931bfa340e4555e93f67ff
-EBUILD gnutls-2.12.7.ebuild 3126 RMD160 983daa27c9a6f282f469b6f41f59e8ef906dd49e SHA1 9ad5369281e93ccc18f92ae96d38aed4b4a1584f SHA256 20dca9213364f8cbcbadf586a8147542389841a0bdebcd8d01dba26ae48f49e6
-MISC ChangeLog 46323 RMD160 b05d3e8ee6e0dfeecc4c8d4ef191b41a3905b1dc SHA1 ad2d1f09610ac01f10a0dbe8690f128a450fd954 SHA256 24c04305591383eff6d95c10b8d607c9bd6ede1b56dd32dcc16ac35765f1cfe4
+EBUILD gnutls-2.12.10.ebuild 3149 RMD160 ac00128e761fc1d84e742c2b20e15f45c9ffc66c SHA1 3201bd3d7fd8e8087531d851c396ebb77d87ff1f SHA256 46cf777e7174bf01ecb7f4942ff379a2153f61241ba5c70010e8377089baa69c
+EBUILD gnutls-3.0.2.ebuild 2718 RMD160 d4ce0fbf8594a9ae5520f0a4956df3377c232859 SHA1 27d4732c33589fe0abbc871839e99ed430d927cb SHA256 8763feba908922dffdfec07bfb39647a8282a74af064797f7dd6259d8a39f413
+MISC ChangeLog 46897 RMD160 bd9208adf224b8eb0748969c63914d6c10b02c86 SHA1 270775d5e0623af128aa5d5a1816cb35bd943c4e SHA256 f31a3adb05491e4da69f36babffcdfdaed065c49c70c9ba6d87f33671d41132e
 MISC metadata.xml 253 RMD160 d29cff22b196e16cfd1725a25b1e9334167d38cf SHA1 2122cdcae7f58713b95483c3da76f35dd15e8aef SHA256 98ed95679982db831ecd5feaea09ada3657c97d63a97c41aa6c894487bca5a30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4aPygACgkQCRZPokWLroT1AgCbBKyC+o80DMRAyjqfhBeWLPP8
-NwIAoMis821pOpQblueTnGxPhqjYv6Gk
-=WePe
+iQIcBAEBAgAGBQJOdaKhAAoJEOSiRoyO7jvo+C4P/2v1L6Z9uZDgowba6jsSOf9W
+LSQ2q2+D+jzeO4kBhcVGSGXTdBXHATKk4kILvm/SjEp+BgV7G74mfaY3hSFNPgi1
+QY+Gyir1+N+1wFw9n92USPEJG9M6nfBDwVPX/jpcKxOrk/lttOhIg5Ch6OIsP1HH
+g+rfOIuhJoSRcmB8Ino4s7LPF0mRGMfGEoj040yardj6YK4JcmiciThzaVRj1GQY
+HTq9V+6FI/hoVJx/Tey6DLrAMOxYxipaqiXt5ZYTWX7RNjVwYUTTx/yBz4FUsIcV
+UbKC736HllkAFBFEt1+C6lYASe3HTsDaURDAY4rVikNJ2w4s7GqdU5z/+2Ea0Kev
+Udpf6D5A2f7wfVRED51ypF4UJdgopoDQn93XxNN7ikypm2Y7OJJm04CHOqWtghwK
+qVqpqcPPQBb5MT2x1gn7bHSA6So7FYB53jbvXjUzMCs4gYDQCK0DTjhxi/Jz/fZ8
+F+zV213P8YxWvf22xUQPa2G0rBB9l1/KOEBffIDqQT33/cG/xAn5zdGE+bGvK3sX
+7eaGTCcKuoh4smYsP+OWU5NtZBsxYGw1wQM79MbFegTAh0oDejbHasVFWOMMkXzE
+FCJPLLBOkrDz4ndmy7zJfB77KgzhKFh+00GiBdy26eE2Kz/pyH7zYO3TurlHOF5n
+MR2TcGSqklODE0vGC7Ks
+=JMo9
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-2.12.0-C++.patch b/net-libs/gnutls/files/gnutls-2.12.0-C++.patch
deleted file mode 100644 (file)
index eec5254..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=66ebfc0120a47c350c4485e195f72ff851296e30
-
---- lib/includes/gnutls/compat.h
-+++ lib/includes/gnutls/compat.h
-@@ -3,6 +3,11 @@
- #ifndef _GNUTLS_COMPAT_H
- #define _GNUTLS_COMPAT_H
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+
- #ifdef __GNUC__
- #define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-@@ -345,4 +350,8 @@
-   void gnutls_transport_set_lowat (gnutls_session_t session, int num) _GNUTLS_GCC_ATTR_DEPRECATED;
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif /* _GNUTLS_COMPAT_H */
diff --git a/net-libs/gnutls/gnutls-2.10.4.ebuild b/net-libs/gnutls/gnutls-2.10.4.ebuild
deleted file mode 100644 (file)
index f3e427c..0000000
+++ /dev/null
@@ -1,108 +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-2.10.4.ebuild,v 1.9 2011/02/28 23:10:11 ranger Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo nls test zlib"
-
-RDEPEND=">=dev-libs/libgcrypt-1.4.0
-       >=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       zlib? ( >=sys-libs/zlib-1.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
diff --git a/net-libs/gnutls/gnutls-2.11.6.ebuild b/net-libs/gnutls/gnutls-2.11.6.ebuild
deleted file mode 100644 (file)
index 72f811d..0000000
+++ /dev/null
@@ -1,114 +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-2.11.6.ebuild,v 1.3 2011/01/10 20:57:46 arfrever Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
diff --git a/net-libs/gnutls/gnutls-2.11.7.ebuild b/net-libs/gnutls/gnutls-2.11.7.ebuild
deleted file mode 100644 (file)
index b1fb9cd..0000000
+++ /dev/null
@@ -1,114 +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-2.11.7.ebuild,v 1.2 2011/03/22 14:39:59 arfrever Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
diff --git a/net-libs/gnutls/gnutls-2.12.0-r1.ebuild b/net-libs/gnutls/gnutls-2.12.0-r1.ebuild
deleted file mode 100644 (file)
index 259c703..0000000
+++ /dev/null
@@ -1,116 +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-2.12.0-r1.ebuild,v 1.1 2011/03/30 20:39:58 arfrever Exp $
-
-EAPI="3"
-
-inherit autotools eutils 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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       epatch "${FILESDIR}/${P}-C++.patch"
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
diff --git a/net-libs/gnutls/gnutls-2.12.0.ebuild b/net-libs/gnutls/gnutls-2.12.0.ebuild
deleted file mode 100644 (file)
index e1f8559..0000000
+++ /dev/null
@@ -1,114 +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-2.12.0.ebuild,v 1.1 2011/03/25 01:19:08 arfrever Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
diff --git a/net-libs/gnutls/gnutls-2.12.1.ebuild b/net-libs/gnutls/gnutls-2.12.1.ebuild
deleted file mode 100644 (file)
index 74f2f05..0000000
+++ /dev/null
@@ -1,114 +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-2.12.1.ebuild,v 1.1 2011/04/03 20:43:14 arfrever Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
similarity index 94%
rename from net-libs/gnutls/gnutls-2.12.6.1.ebuild
rename to net-libs/gnutls/gnutls-2.12.10.ebuild
index 6c23df12652be75fa2a70411a5432fbf3a7e7f34..f2e380c547ec77e581e087b08b9dfae289b57e59 100644 (file)
@@ -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-2.12.6.1.ebuild,v 1.1 2011/07/01 21:40:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.10.ebuild,v 1.1 2011/09/18 07:50:20 scarabeus Exp $
 
 EAPI="3"
 
@@ -30,7 +30,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
 
 # lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
+RDEPEND="
+       app-crypt/p11-kit
+       >=dev-libs/libtasn1-0.3.4
        nls? ( virtual/libintl )
        guile? ( >=dev-scheme/guile-1.8[networking] )
        nettle? ( >=dev-libs/nettle-2.1[gmp] )
diff --git a/net-libs/gnutls/gnutls-2.12.2.ebuild b/net-libs/gnutls/gnutls-2.12.2.ebuild
deleted file mode 100644 (file)
index 0a651a9..0000000
+++ /dev/null
@@ -1,114 +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-2.12.2.ebuild,v 1.1 2011/04/08 21:23:53 arfrever Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
diff --git a/net-libs/gnutls/gnutls-2.12.3.ebuild b/net-libs/gnutls/gnutls-2.12.3.ebuild
deleted file mode 100644 (file)
index 62fb4ca..0000000
+++ /dev/null
@@ -1,114 +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-2.12.3.ebuild,v 1.1 2011/04/22 18:43:36 arfrever Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
diff --git a/net-libs/gnutls/gnutls-2.12.4.ebuild b/net-libs/gnutls/gnutls-2.12.4.ebuild
deleted file mode 100644 (file)
index 3789928..0000000
+++ /dev/null
@@ -1,114 +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-2.12.4.ebuild,v 1.1 2011/05/06 19:48:25 arfrever Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
diff --git a/net-libs/gnutls/gnutls-2.12.5.ebuild b/net-libs/gnutls/gnutls-2.12.5.ebuild
deleted file mode 100644 (file)
index 9a17a4a..0000000
+++ /dev/null
@@ -1,114 +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-2.12.5.ebuild,v 1.1 2011/05/14 18:42:08 arfrever Exp $
-
-EAPI="3"
-
-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.bz2"
-       else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-       fi
-       unset MINOR_VERSION
-fi
-
-# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
-       guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-       sys-devel/libtool
-       doc? ( dev-util/gtk-doc )
-       nls? ( sys-devel/gettext )
-       test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
-
-src_prepare() {
-       # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
-               rm -f "${dir}/lt"* "${dir}/libtool.m4"
-       done
-       find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
-
-       # Use sane .so versioning on FreeBSD.
-       elibtoolize
-}
-
-src_configure() {
-       local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-       econf --htmldir=/usr/share/doc/${P}/html \
-               $(use_enable cxx) \
-               $(use_enable doc gtk-doc) \
-               $(use_enable guile) \
-               $(use_with !nettle libgcrypt) \
-               $(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() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-       if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
-       fi
-
-       if use examples; then
-               docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
-       fi
-}
similarity index 52%
rename from net-libs/gnutls/gnutls-2.12.7.ebuild
rename to net-libs/gnutls/gnutls-3.0.2.ebuild
index 8eefdd5ca14c818bf8f636c275299ae84484e8fe..5d644c35a0bfca5195d62596108cf6402e8af6ac 100644 (file)
@@ -1,8 +1,8 @@
 # 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-2.12.7.ebuild,v 1.1 2011/07/07 07:42:59 hwoarang Exp $
+# $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="3"
+EAPI=4
 
 inherit autotools libtool
 
@@ -16,9 +16,9 @@ else
        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.bz2"
+               SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
        else
-               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
+               SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
        fi
        unset MINOR_VERSION
 fi
@@ -27,16 +27,16 @@ 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="bindist +cxx doc examples guile lzo +nettle nls test zlib"
+IUSE="+cxx doc examples guile +nettle nls static-libs test zlib"
 
 # lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-       nls? ( virtual/libintl )
+RDEPEND="
+       app-crypt/p11-kit
+       >=dev-libs/libtasn1-0.3.4
+       >=dev-libs/nettle-2.1[gmp]
        guile? ( >=dev-scheme/guile-1.8[networking] )
-       nettle? ( >=dev-libs/nettle-2.1[gmp] )
-       !nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-       zlib? ( >=sys-libs/zlib-1.2.3.1 )
-       !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+       nls? ( virtual/libintl )
+       zlib? ( >=sys-libs/zlib-1.2.3.1 )"
 DEPEND="${RDEPEND}
        sys-devel/libtool
        doc? ( dev-util/gtk-doc )
@@ -45,28 +45,25 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P%_pre*}"
 
-pkg_setup() {
-       if use lzo && use bindist; then
-               ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-       fi
-}
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
 
 src_prepare() {
+       local dir
+
        # tests/suite directory is not distributed.
-       sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
+       sed -i \
+               -e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
+               configure.ac || die
 
-       sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
+       sed -i \
+               -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+               doc/Makefile.am || die
 
-       local dir
-       for dir in m4 lib/m4 libextra/m4; do
+       for dir in m4 gl/m4; do
                rm -f "${dir}/lt"* "${dir}/libtool.m4"
        done
        find . -name ltmain.sh -exec rm {} \;
-       for dir in . lib libextra; do
-               pushd "${dir}" > /dev/null
-               eautoreconf
-               popd > /dev/null
-       done
+       eautoreconf
 
        # Use sane .so versioning on FreeBSD.
        elibtoolize
@@ -74,21 +71,22 @@ src_prepare() {
 
 src_configure() {
        local myconf
-       use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-       [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
+       [[ ${VALGRIND_TESTS} != 1 ]] && myconf+=" --disable-valgrind-tests"
 
-       econf --htmldir=/usr/share/doc/${P}/html \
+       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_with !nettle libgcrypt) \
                $(use_enable nls) \
                $(use_with zlib) \
                ${myconf}
 }
 
 src_test() {
-       if has_version dev-util/valgrind && [[ "${VALGRIND_TESTS}" != "1" ]]; then
+       if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then
                elog
                elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
                elog
@@ -98,17 +96,17 @@ src_test() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       default
 
-       dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
+       find "${ED}" -name '*.la' -exec rm -f {} +
 
        if use doc; then
-               dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-               dohtml doc/gnutls.html || die "dohtml failed"
+               dodoc doc/gnutls.{pdf,ps}
+               dohtml doc/gnutls.html
        fi
 
        if use examples; then
                docinto examples
-               dodoc doc/examples/*.c || die "dodoc failed"
+               dodoc doc/examples/*.c
        fi
 }