summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2015-06-21 06:39:59 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2015-06-21 06:39:59 +0000
commitb9db8e4d2a574eeb2cf3cc999ffac75675548809 (patch)
tree6401e021ae3b9194101b2d8baa4c225121c33f2a /net-libs
parentamd64 stable wrt bug #552450 (diff)
downloadhistorical-b9db8e4d2a574eeb2cf3cc999ffac75675548809.tar.gz
historical-b9db8e4d2a574eeb2cf3cc999ffac75675548809.tar.bz2
historical-b9db8e4d2a574eeb2cf3cc999ffac75675548809.zip
Cleanup, bug#546760, bug#548636
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xBF20DC51
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/gnutls/ChangeLog6
-rw-r--r--net-libs/gnutls/Manifest14
-rw-r--r--net-libs/gnutls/gnutls-3.3.10-r2.ebuild174
-rw-r--r--net-libs/gnutls/gnutls-3.3.12.ebuild174
-rw-r--r--net-libs/gnutls/gnutls-3.3.14.ebuild175
5 files changed, 9 insertions, 534 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index de26acf93b5d..9e7e04d5142b 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/gnutls
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.547 2015/06/17 18:42:05 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.548 2015/06/21 06:39:45 alonbl Exp $
+
+ 21 Jun 2015; Alon Bar-Lev <alonbl@gentoo.org> -gnutls-3.3.10-r2.ebuild,
+ -gnutls-3.3.12.ebuild, -gnutls-3.3.14.ebuild:
+ Cleanup, bug#546760, bug#548636
*gnutls-3.3.15-r1 (17 Jun 2015)
*gnutls-3.4.2-r1 (17 Jun 2015)
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 0352b53aefec..9a3d8e961147 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -17,26 +17,20 @@ AUX gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch 1146 SHA256 064
AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
AUX gnutls-3.4.2-build.patch 4598 SHA256 6ebcbf24784390614588050cea543415d97ae4fd9c9db8299102c53d9f1775ae SHA512 6d8752fb5d37b17f33bec867d10dc41e45d25abbe6682afa9f9f13e8fa8de7939fc98aca60845606f534e2f9f2b15809a17219ce0b7aadbb0ad32cfedf57edbb WHIRLPOOL 94a851730120f167d5fc8ac37449da663b959e365c829b32f5a458855409c2c6fe2e683a355ea02241ecc4cc0df7547c6402fa66f666764548d0113d40c63c3a
DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
-DIST gnutls-3.3.10.tar.xz 6173572 SHA256 e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219 SHA512 3f73af238c48322d1df59b8c27c2bcc5e03f25e632792279a1e25a3712d71108f83b6e135bf1766917e84ec9499f4419c266c2a43a8e2ccd8dd9efd6f15d85ec WHIRLPOOL 1ef664b763acaff9292f96db86f5ad441a4c49141d1d3529ea970cba67fc5714b509be1350250bb01bfd7a863e466b7f4d5590caa5236dddc680b6ca709ec93e
-DIST gnutls-3.3.12.tar.xz 6185624 SHA256 67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b SHA512 71c5ed7dee6c14581f675137b587173065c896040cb023b2910a3503a0f644abedc1f43c4e90c7a47ad4482215426788e272ba4b0b81c0475c2adcd62c4301a7 WHIRLPOOL 2e405e7edd52a828d16ae858d791809905ea02f27ee518847e43c3e56c5e92876d58e210513176c9424703dd65c8834a7516826db55e0eec5039a3d63b25b26e
-DIST gnutls-3.3.14.tar.xz 6286196 SHA256 0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52 SHA512 68f144baaf52c156a9b597701ac1afe04de8a6a646bcd48bb28be4ef33d259d1ade55bec6984d40c0ed5944ca3f8c9ce6243a617961e1de0a94b538e38230fed WHIRLPOOL f140d47d2b7eb2678245394efbb57e47eab58acceddb710b688b407792299d3e139afbd5946bfd5e10ceebae3892516d15753ca4bef17485c46aea07c1185584
DIST gnutls-3.3.15.tar.xz 6286288 SHA256 8961227852911a1974e15bc017ddbcd4779876c867226d199f06648d8b27ba4b SHA512 0d112f20fd1a010c278ecc5c0e9e22a040c5a765073ea722329e9d5d7b4c661c6bd2fc6749903ea562fe44caf9a1643c6d95e2e193bb8c444e2e6418f73d5445 WHIRLPOOL 4a7b28952bcbe837d4f9e9b62b9254a43510363634daa1c9dc61bf07c7734699011bf5963d4556d3f53c45f63cdf6d2447f7b101e026d0d21c94d827bff9c6dc
DIST gnutls-3.4.1.tar.xz 6469756 SHA256 e9b5f58becf34756464216056cd5abbf04315eda80a374d02699dee83f80b12e SHA512 8fd386b66c9bc42f2beaec93b503f83dad9736ba25673aac34a2cc7adc1b5467ae21b859406743df9d698fcf06237bb61404a1f33a8d8ec0da536cc088bf98e0 WHIRLPOOL ae39c0a3397519b78c2c7f07a22cb912e79871c97b3b1729ef17c0bb4fad12a001644bfed9528cfc1bc98bae267bd0aa62c6c9c25e55104061281ba574e76a9f
DIST gnutls-3.4.2.tar.xz 6520688 SHA256 72424d056ad01ed30f0fd6cd447de179c44cfd015d6c9df29bfb95580a27560e SHA512 4c8c122ee3f189b5bbdb90f0a6b849a332e23c4cb87ba3b51d0672578b6b8e13aeaeacf69f8910a7380bb130dcdfd8d505d88d8358bd6b339e97a187990dbbd4 WHIRLPOOL c272c2a7e484fcedb092cdc6d506913ee88f399e6ce84d15fdaa752668cb789bdc6d18bcb353b02806d95fccac567e3a440ccf65027e3ffadaaa2409eb00af58
EBUILD gnutls-2.12.23-r6.ebuild 3722 SHA256 543e9e04375cbe220d9fbf4aa55eb1683f6c21413fa894a14f27d88b73c37de2 SHA512 78eb464911b37d79ad6e330bcc5b6008b902d88e7716e9fd50930f2be59e51f5ef4d17b9f23b1c26da33525dc6ede7043e4ebf22eb1764019a53f4cda827d88d WHIRLPOOL 7e95ff0c7b5fdb15b227c83f381b8be4b8c77e26f7766b7ffa6ee3b13832f67594b0489121fd977bbe893cd550a371cb4664469d6e41f36392a0a8574f1f9676
-EBUILD gnutls-3.3.10-r2.ebuild 4949 SHA256 be952f52f9e3eb120470204795decc82e39a6817baa78830cd4ac3400d245c4d SHA512 f5d2868ba167048ea66c15828d3bc666f9ecb574f835c7496fc9d186ba75d43cd95138caa11ee07cf3fe372ce6092243bd28698e3e83ef6727b9afa62a8700c6 WHIRLPOOL c2f9ccc038f320551c1ca289f899cc62605c13bc7fca317b2b128ef1701cc517bc75f1075866f335634005805f1e0854682152b3f7dd809c7bab9fcf9b90dbc0
-EBUILD gnutls-3.3.12.ebuild 4962 SHA256 a9e68cd7141cfe5d30112915150b17ecb2825b08fa1ed505964faf18b9ef97d9 SHA512 23279a2b4c2e204edee51d8cf5c9eb5550e622f3987aa874adb757bf3c1b08b21b7bd0025bc67f9b7c4ff619c509b5aed7a7ee0790fbbd8c271c49cee24942d6 WHIRLPOOL c82d0c93a0855bafc8ad0cd795d163d28588f86ff7b95c494a6d101007884ddd4a8e4c3ae495e0d986c0fbedff6ff4d1bb98c09bb8cffe4b19e236d7c2dffff4
-EBUILD gnutls-3.3.14.ebuild 5018 SHA256 5be0a6594c786f5dacfd05071163767039f2df2fb82b5dcd0681717c4ec4e7fb SHA512 20dcd24ad9faa34d5cb419dd201857f411ccb925874037d25e3a5673407b14131b3443d921a577b222603b347577be35af3df052095e32782405ac8e3febb7c6 WHIRLPOOL 9b63d5f566a61961a78d5f83bf915ebbd8a3d10c0ba213616e679c2d168e8ab1ed1305be33b76289b46ac35964a8f12b88d30f5b5003dbae912f6ba78409eb74
EBUILD gnutls-3.3.15-r1.ebuild 4950 SHA256 7f370fbe3b1e7ccb0914cbe5999f7179ea7769523a7d66bc6eab785bb447720d SHA512 efea1c678450dad6c2e6c522334599957e2e85005b9a564cf69172a8c80d32c6affff6e7d285e3412acd0e5f48af81758b6d8da3b466947452503844ceb7c6f3 WHIRLPOOL 6add5ec3e8bb6f4a03bc24adf4130a1de83c12cbd39c868ebfee769e22528c5c31fad9e0f98cc9ce0395f9048df2f332c681f93ba4010e430ac5313db8861389
EBUILD gnutls-3.3.15.ebuild 5009 SHA256 0fd0d2f50ace49540bbf0ba70ccf6915016ad986e3de2aa9b14e6b19764ee6ba SHA512 c0fd4f5472166007863464a1f02b1f677a029394464e9ebdb5338f13d57465ce64169b25a83acd814563dfd473ff7b7869223c3f8b306ca39dfd99aa4dd8fdcd WHIRLPOOL b0cd8033f9ec73b2c2760a87e9d9a136c877d9fbc5919c5c8dd0709ac1c4595ca7d21c5ae1f3a12650527b6f8ad0dd65ff7a447a203d160569093210c3933260
EBUILD gnutls-3.4.1.ebuild 4204 SHA256 5a49f3814e0176a15ad3da7c60d5b2fb61e0b0b8ff84edd733b363ac9b6e0a60 SHA512 15cdb71cc56af4ccaa67ff842408b3095bb0f8e8f7b8a7b32171b9b6c4dc3161ecf5068f25d91536b72309821b5f6cb53a6aafcd00241c67353316cec741cca2 WHIRLPOOL d2380a6e59d15b87814adda7c09a5cb97d510d7ee6fda395ae1f2e740bc541b3a37b2aa164dfb20b30ee6657dfa1c9edfba9f141b8fe55e4d68c7a6faf644f63
EBUILD gnutls-3.4.2-r1.ebuild 4174 SHA256 1c63ba9745872137c22a5faeb40e8a26c213f9d3759e306d3c970c4875e807e6 SHA512 8422fdac61e1e35e8970f340b2e1e67f0d0a65cea543980df3135a9ba7554412c932a2f9828d637dd592dadabd10b1b05d99e48e7426d758c5ebebe02d3bcfde WHIRLPOOL a2edeba5b5b8ac608669fe0776413cba3e2400a210963836ff7a925082abeab942be0b28c05dee7d1c429f3ea84176c142cd32828b2c2c48c1b5bf2312427404
-MISC ChangeLog 81882 SHA256 bcdf9cb15396eb22c01184b674e54f3edc8b2e15cf8e93ce972bbbd3600d3ee3 SHA512 e178d3f29f9de218ea3b03ce974248fbe9af3ca6c365e69112a3204f5fe11b9708c5336718d08f1bebcc3427ee6ce066c94cdd92b5eac2535d0cd0bc3beace42 WHIRLPOOL 5e86e940b450f48afcced6a10c4ed4c3289301241138c7fb24454b266da7c0545d8719ad17df76fe25c41788183bb2b3efa50073d43cb8a3c110e88cfcd633aa
+MISC ChangeLog 82039 SHA256 d0139d1a37fe0f26bf5233b6b22d9a35f2ed25a2588280091ad5e57fdd130cef SHA512 3f4f5fb702588c0d20b6bb1e7655636f5189b44e00fa3831467d2195f03e37ed00a97aad7aff90d5c553337a157a134947a4541c2bd00f3a2c0e029e4ca591d2 WHIRLPOOL f114e60ca7ec62e746a910ab953ca5d1ab55402b06721b915d273c6070b11fc15da00d4f608899f8d5e47d3ae546dde32d7c0863b15cd527410b6cbf314da891
MISC metadata.xml 1015 SHA256 e3a234ef8cbc938ec33d80cc1dbdaaeae67beb83cd4f6fdc2a4bd0a3db37d7fb SHA512 a96893cf5d5cce516ff082ae1f8dbf6fbf6bc0bbb2a40d824f8086724c827589369f43dc66be34c9b05dff0af029c1aae9b7d96c891fddc495108433bc5e3fb7 WHIRLPOOL fa8d80766ffada287ab122ddda6afa33ee12f48a2c83245fd56700c3fd38c9b4694d1de2bdad6851a2347f3b0e68339373223533930a102a2e7bd6df82e3d893
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlWBv4IACgkQXYk9GL8g3FHyWQEAgMb3d13cU5xGW2C/U7wduy53
-zMPs0gkuzrMe5zCLQFUA+wdc5r2Tbfge7sIw848J60rXixYBn33IqTr++xObGVNw
-=w898
+iF4EAREIAAYFAlWGXDcACgkQXYk9GL8g3FFpqQD8DeTMQVErUwNepGQdk0PuUSru
+L1cJ4wnzN6l3UtnXi1ABAI1Qxq6czt1fpVgC35PoalgT/00Cgj6HRhn+wBjyzLFF
+=AAql
-----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.3.10-r2.ebuild b/net-libs/gnutls/gnutls-3.3.10-r2.ebuild
deleted file mode 100644
index 5df4799b514b..000000000000
--- a/net-libs/gnutls/gnutls-3.3.10-r2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.10-r2.ebuild,v 1.10 2015/04/27 12:32:21 ago Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
-# heartbeat support is not disabled until re-licensing happens fullyf
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
- <dev-libs/nettle-3[gmp,${MULTILIB_USEDEP}]
- >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
- sys-devel/autogen
- crywrap? ( net-dns/libidn )
- dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
- guile? ( >=dev-scheme/guile-1.8[networking] )
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/automake-1.11.6
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- doc? ( dev-util/gtk-doc )
- nls? ( sys-devel/gettext )
- test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-pkg_setup() {
- # bug#520818
- export TZ=UTC
-}
-
-src_prepare() {
- sed -i \
- -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
- doc/Makefile.am || die
-
- # force regeneration of autogen-ed files
- local file
- for file in $(grep -l AutoGen-ed src/*.c) ; do
- rm src/$(basename ${file} .c).{c,h} || die
- done
-
- # force regeneration of makeinfo files
- # have no idea why on some system these files are not
- # accepted as-is, see bug#520818
- for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
- rm "${file}" || die
- done
-
- # support user patches
- epatch_user
-
- eautoreconf
-
- # Use sane .so versioning on FreeBSD.
- elibtoolize
-
- # bug 497472
- use cxx || epunt_cxx
-}
-
-multilib_src_configure() {
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
- # TPM needs to be tested before being enabled
- # hardware-accell is disabled on OSX because the asm files force
- # GNU-stack (as doesn't support that) and when that's removed ld
- # complains about duplicate symbols
- ECONF_SOURCE=${S} \
- econf \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --disable-valgrind-tests \
- --without-included-libtasn1 \
- --enable-heartbeat-support \
- $(use_enable cxx) \
- $(use_enable dane libdane) \
- $(multilib_native_use_enable doc gtk-doc) \
- $(multilib_native_use_enable doc gtk-doc-pdf) \
- $(multilib_native_use_enable guile) \
- $(multilib_native_use_enable crywrap) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_with pkcs11 p11-kit) \
- $(use_with zlib) \
- --without-tpm \
- --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
- $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/reference/html doc/reference/html || die
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
-
- # symlink certtool for use in other ABIs
- if use test; then
- ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
- fi
- else
- emake -C gl
- emake -C lib
- emake -C extra
- use dane && emake -C libdane
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- # parallel testing often fails
- emake -j1 check
- else
- # use native ABI tools
- ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
- "${BUILD_DIR}"/src/ || die
-
- emake -C gl -j1 check
- emake -C tests -j1 check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake -C lib DESTDIR="${D}" install
- emake -C extra DESTDIR="${D}" install
- use dane && emake -C libdane DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- dodoc doc/certtool.cfg
-
- if use doc; then
- dodoc doc/gnutls.pdf
- dohtml doc/gnutls.html
- else
- rm -fr "${ED}/usr/share/doc/${PF}/html"
- fi
-
- if use examples; then
- docinto examples
- dodoc doc/examples/*.c
- fi
-}
diff --git a/net-libs/gnutls/gnutls-3.3.12.ebuild b/net-libs/gnutls/gnutls-3.3.12.ebuild
deleted file mode 100644
index 9cee1b95cd0a..000000000000
--- a/net-libs/gnutls/gnutls-3.3.12.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.12.ebuild,v 1.2 2015/04/10 07:48:34 patrick Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
-# heartbeat support is not disabled until re-licensing happens fullyf
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
- <dev-libs/nettle-3[gmp,${MULTILIB_USEDEP}]
- >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
- sys-devel/autogen
- crywrap? ( net-dns/libidn )
- dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
- guile? ( >=dev-scheme/guile-1.8[networking] )
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/automake-1.11.6
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- doc? ( dev-util/gtk-doc )
- nls? ( sys-devel/gettext )
- test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-pkg_setup() {
- # bug#520818
- export TZ=UTC
-}
-
-src_prepare() {
- sed -i \
- -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
- doc/Makefile.am || die
-
- # force regeneration of autogen-ed files
- local file
- for file in $(grep -l AutoGen-ed src/*.c) ; do
- rm src/$(basename ${file} .c).{c,h} || die
- done
-
- # force regeneration of makeinfo files
- # have no idea why on some system these files are not
- # accepted as-is, see bug#520818
- for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
- rm "${file}" || die
- done
-
- # support user patches
- epatch_user
-
- eautoreconf
-
- # Use sane .so versioning on FreeBSD.
- elibtoolize
-
- # bug 497472
- use cxx || epunt_cxx
-}
-
-multilib_src_configure() {
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
- # TPM needs to be tested before being enabled
- # hardware-accell is disabled on OSX because the asm files force
- # GNU-stack (as doesn't support that) and when that's removed ld
- # complains about duplicate symbols
- ECONF_SOURCE=${S} \
- econf \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --disable-valgrind-tests \
- --without-included-libtasn1 \
- --enable-heartbeat-support \
- $(use_enable cxx) \
- $(use_enable dane libdane) \
- $(multilib_native_use_enable doc gtk-doc) \
- $(multilib_native_use_enable doc gtk-doc-pdf) \
- $(multilib_native_use_enable guile) \
- $(multilib_native_use_enable crywrap) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_with pkcs11 p11-kit) \
- $(use_with zlib) \
- --without-tpm \
- --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
- $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/reference/html doc/reference/html || die
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
-
- # symlink certtool for use in other ABIs
- if use test; then
- ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
- fi
- else
- emake -C gl
- emake -C lib
- emake -C extra
- use dane && emake -C libdane
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- # parallel testing often fails
- emake -j1 check
- else
- # use native ABI tools
- ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
- "${BUILD_DIR}"/src/ || die
-
- emake -C gl -j1 check
- emake -C tests -j1 check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake -C lib DESTDIR="${D}" install
- emake -C extra DESTDIR="${D}" install
- use dane && emake -C libdane DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- dodoc doc/certtool.cfg
-
- if use doc; then
- dodoc doc/gnutls.pdf
- dohtml doc/gnutls.html
- else
- rm -fr "${ED}/usr/share/doc/${PF}/html"
- fi
-
- if use examples; then
- docinto examples
- dodoc doc/examples/*.c
- fi
-}
diff --git a/net-libs/gnutls/gnutls-3.3.14.ebuild b/net-libs/gnutls/gnutls-3.3.14.ebuild
deleted file mode 100644
index 2a2d027606a9..000000000000
--- a/net-libs/gnutls/gnutls-3.3.14.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.14.ebuild,v 1.3 2015/04/10 08:30:28 alonbl Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
-# heartbeat support is not disabled until re-licensing happens fullyf
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
- <dev-libs/nettle-3[gmp,${MULTILIB_USEDEP}]
- >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
- sys-devel/autogen
- crywrap? ( net-dns/libidn )
- dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
- guile? ( >=dev-scheme/guile-1.8[networking] )
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/automake-1.11.6
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- doc? ( dev-util/gtk-doc )
- nls? ( sys-devel/gettext )
- test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-pkg_setup() {
- # bug#520818
- export TZ=UTC
-}
-
-src_prepare() {
- sed -i \
- -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
- doc/Makefile.am || die
-
- # force regeneration of autogen-ed files
- local file
- for file in $(grep -l AutoGen-ed src/*.c) ; do
- rm src/$(basename ${file} .c).{c,h} || die
- done
-
- # force regeneration of makeinfo files
- # have no idea why on some system these files are not
- # accepted as-is, see bug#520818
- for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
- rm "${file}" || die
- done
-
- # support user patches
- epatch_user
-
- eautoreconf
-
- # Use sane .so versioning on FreeBSD.
- elibtoolize
-
- # bug 497472
- use cxx || epunt_cxx
-}
-
-multilib_src_configure() {
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
- # TPM needs to be tested before being enabled
- # hardware-accell is disabled on OSX because the asm files force
- # GNU-stack (as doesn't support that) and when that's removed ld
- # complains about duplicate symbols
- ECONF_SOURCE=${S} \
- econf \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --disable-valgrind-tests \
- --without-included-libtasn1 \
- --enable-heartbeat-support \
- $(use_enable cxx) \
- $(use_enable dane libdane) \
- $(multilib_native_use_enable doc gtk-doc) \
- $(multilib_native_use_enable doc gtk-doc-pdf) \
- $(multilib_native_use_enable guile) \
- $(multilib_native_use_enable crywrap) \
- $(use_enable nls) \
- $(use_enable openssl openssl-compatibility) \
- $(use_enable static-libs static) \
- $(use_with pkcs11 p11-kit) \
- $(use_with zlib) \
- --without-tpm \
- --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
- $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/reference/html doc/reference/html || die
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
-
- # symlink certtool for use in other ABIs
- if use test; then
- ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
- fi
- else
- emake -C gl
- emake -C lib
- emake -C extra
- use dane && emake -C libdane
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- # parallel testing often fails
- emake -j1 check
- else
- # use native ABI tools
- ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
- "${BUILD_DIR}"/src/ || die
-
- emake -C gl -j1 check
- emake -C tests -j1 check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake -C lib DESTDIR="${D}" install
- emake -C extra DESTDIR="${D}" install
- use dane && emake -C libdane DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- dodoc doc/certtool.cfg
-
- if use doc; then
- dodoc doc/gnutls.pdf
- dohtml doc/gnutls.html
- else
- rm -fr "${ED}/usr/share/doc/${PF}/html"
- fi
-
- if use examples; then
- docinto examples
- dodoc doc/examples/*.c
- fi
-}