commit: da8a3244e876ebc37e4e65f2999873c63af19d5e Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> AuthorDate: Thu Sep 24 08:06:11 2015 +0000 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> CommitDate: Thu Sep 24 08:07:05 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8a3244
net-libs/gnutls: cleanup Package-Manager: portage-2.2.20.1 net-libs/gnutls/Manifest | 2 - net-libs/gnutls/gnutls-3.3.15.ebuild | 175 ---------------------------------- net-libs/gnutls/gnutls-3.4.4.1.ebuild | 132 ------------------------- 3 files changed, 309 deletions(-) diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index 2508efc..7dd8f13 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1,6 +1,4 @@ DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11 -DIST gnutls-3.3.15.tar.xz 6286288 SHA256 8961227852911a1974e15bc017ddbcd4779876c867226d199f06648d8b27ba4b SHA512 0d112f20fd1a010c278ecc5c0e9e22a040c5a765073ea722329e9d5d7b4c661c6bd2fc6749903ea562fe44caf9a1643c6d95e2e193bb8c444e2e6418f73d5445 WHIRLPOOL 4a7b28952bcbe837d4f9e9b62b9254a43510363634daa1c9dc61bf07c7734699011bf5963d4556d3f53c45f63cdf6d2447f7b101e026d0d21c94d827bff9c6dc DIST gnutls-3.3.17.1.tar.xz 6339588 SHA256 b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4 SHA512 9f2945abe1251db176fa227f2c90be46dba831af97647f04b960c71a50fc597776be31080733f9417f2242c4c6ae92fa897bf02d5f2ba40863e94df245c03319 WHIRLPOOL 8a04e56a5f47ddaad106081a613ead85a107b013d3e894074745e9439e0a7797b7f528aab5db7e3ac808f1c5c361c4717d7f0cb3abc943a6f912e5b6981db320 DIST gnutls-3.3.18.tar.xz 6275948 SHA256 7a87e7f486d1ada10007356917a412cde6c6114dac018e3569e3aa09e9f29395 SHA512 e7c972458ad0af401121c705ebe86aafa46c02743d963b1b67ca09192c746a9193c73d28501b6c046435259b40ac0f8d201860cd6cf6240a7783b6c01b64286c WHIRLPOOL ce2134515d234d6dbceebefd5602bc7f0d96faff839055fd401149c6969a245f5284d7e29ae2eca810fa6039d7184477b9fda2ae0faa379262434927320ebde3 -DIST gnutls-3.4.4.1.tar.xz 6618988 SHA256 525bd799031948c069fa5ab048c3588592a663a881d2034484782ba73a29c3f5 SHA512 de64c01707496e8b2ba4d750c789ca40c25c0f1df295b31ddef46486b1427ee2b84992f226d3a29265bba06d622c54607e6c7a7525a7e8af1db8a34792e930f2 WHIRLPOOL c92b4a42e44a3016d32c05d845426115db4f0e752d0eebeb6c673f81c34cb346f69f96291923555d9911107042bc1736a8f61e940037f1edf7ebaa3da41a655e DIST gnutls-3.4.5.tar.xz 6552036 SHA256 af88b8e0460728d034ff3f454f7851a09b7f0959a93531b6f8d35658ef0f7aae SHA512 16dfdaecbcc0b02ea762def35724a3433063136429d0eb67d9e009ced14a6ddddfa567f41e03a4fda9c4f68e3625bac41e8966882257099413c9500e33171a2f WHIRLPOOL 9274ae5660ac3f6da839f6a7fe3df4042155259170b069b8b54772d77b18564cc5f5337acc475d0936afe855fe9e046a1fb167bbd6842063c9c0335d218f4393 diff --git a/net-libs/gnutls/gnutls-3.3.15.ebuild b/net-libs/gnutls/gnutls-3.3.15.ebuild deleted file mode 100644 index 4f21b35..0000000 --- a/net-libs/gnutls/gnutls-3.3.15.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 -} diff --git a/net-libs/gnutls/gnutls-3.4.4.1.ebuild b/net-libs/gnutls/gnutls-3.4.4.1.ebuild deleted file mode 100644 index ccd603f..0000000 --- a/net-libs/gnutls/gnutls-3.4.4.1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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/30" # libgnutls.so number -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 +tools 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-4.3[${MULTILIB_USEDEP}] - >=dev-libs/nettle-3.1[gmp,${MULTILIB_USEDEP}] - >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] - tools? ( 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.23.1[${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? ( - sys-apps/texinfo - dev-util/gtk-doc - ) - nls? ( sys-devel/gettext ) - test? ( app-misc/datefudge )" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO ) - -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 tools) \ - $(multilib_native_use_enable doc) \ - $(multilib_native_use_enable doc gtk-doc) \ - $(multilib_native_use_enable guile) \ - $(multilib_native_use_enable crywrap) \ - $(multilib_native_use_enable test tests) \ - $(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) -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --all - - dodoc doc/certtool.cfg - - if use doc; then - 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 -}
