From e04a8af3da4df2362e2330ff2145429d7667d97c Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Sat, 12 Nov 2011 23:20:03 +0000 Subject: [PATCH] Version bump and remove old. Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64 --- net-libs/gnutls/ChangeLog | 8 +- net-libs/gnutls/Manifest | 22 ++-- net-libs/gnutls/gnutls-2.12.12.ebuild | 114 ------------------ ...nutls-3.0.5.ebuild => gnutls-3.0.8.ebuild} | 4 +- 4 files changed, 19 insertions(+), 129 deletions(-) delete mode 100644 net-libs/gnutls/gnutls-2.12.12.ebuild rename net-libs/gnutls/{gnutls-3.0.5.ebuild => gnutls-3.0.8.ebuild} (93%) diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog index 3249e99e0ee5..beba88af2709 100644 --- a/net-libs/gnutls/ChangeLog +++ b/net-libs/gnutls/ChangeLog @@ -1,6 +1,12 @@ # 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.320 2011/11/08 22:43:31 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.321 2011/11/12 23:20:03 radhermit Exp $ + +*gnutls-3.0.8 (12 Nov 2011) + + 12 Nov 2011; Tim Harder -gnutls-2.12.12.ebuild, + -gnutls-3.0.5.ebuild, +gnutls-3.0.8.ebuild: + Version bump and remove old. *gnutls-3.0.7 (08 Nov 2011) *gnutls-2.12.14 (08 Nov 2011) diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index da4b438eb862..1e1e06b92f89 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -2,25 +2,23 @@ Hash: SHA512 DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b37047382 SHA1 4530657082a0e754356de89a5529d1ad7a18e777 SHA256 c086d5426ef04427038db6af1a4dc62ff32694e91e759ebf9bb3380243ebd9c9 -DIST gnutls-2.12.12.tar.bz2 7195302 RMD160 d0e26b56c44e363f95871c5e80359fab20176b25 SHA1 6c87591705b21f7cae845ecdae158a6c5d8f2847 SHA256 7cfd0a58b4e0810cbe9ec1c6854b56aeb9a3c29746a93836ee784b04de131181 DIST gnutls-2.12.14.tar.bz2 7166618 RMD160 855c89c46898e7b934a8f6b7466d3089031c9f9a SHA1 e5680f78ee51ff9ebb9749b39504d3e981a19242 SHA256 5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3 -DIST gnutls-3.0.5.tar.xz 4306124 RMD160 7dda96427d173b9bc2ab49ba62397f692cd900b7 SHA1 9ded8c3c7888d8e34fd019fe9a9c641dbd721e83 SHA256 58120d5b23bb674a036b6519d784a7edaa79535ffad2def34bc0f05dc5ced3bc DIST gnutls-3.0.7.tar.xz 4292724 RMD160 fde59594f617c18d32eaa15bbac9e7e45dd8fd2d SHA1 b99aed5cb48e1c156a2e2c6b2becb6c049c299af SHA256 32c744274a8cb01887cdd5e72717b77fd3d31b3337c94c7b138fc16edac7b7c0 +DIST gnutls-3.0.8.tar.xz 4257072 RMD160 b8ae537d21701954cbdd9baf76c14b465766b48d SHA1 b62457ff7422034b6f2974633e78c81fca5a8213 SHA256 ba4e194be89035b468e5db18e0582de42c9876f6cf91d56699de0986aa3c9761 EBUILD gnutls-2.10.5.ebuild 2837 RMD160 08f973e7eab9f993a3be578f84455f623df06969 SHA1 00d1384fcb7b2f720a23decdb5c2563be3680da3 SHA256 62595d10eff18850b36d623cb66cbcdccc6d5e01ae71b5d06fd5898e165f139e -EBUILD gnutls-2.12.12.ebuild 3086 RMD160 861e1f00c9138a2c9f5024ca492f7d56b41ea73d SHA1 fa16f660e4308740a71fa6b8bf6041245766d76c SHA256 f8b0d58bb3f7c18730bb3c7ee43ca474ddcf04916d9ad58eb7d959cf1f80ce16 EBUILD gnutls-2.12.14.ebuild 3135 RMD160 88251de44cf0c853bc6a7481ad4576f330cf3642 SHA1 216750229e71d5b19cb8103f68a512c6c83dee36 SHA256 b40701f16f92520f26c92e7465d06b51387b59102f010ef8c49efe566a81dd3a -EBUILD gnutls-3.0.5.ebuild 2693 RMD160 db576fe2f0fdd1b1ec5ba1c47a9510ea57d6fb6f SHA1 72e08c90dbaa01d50027ae01ab8e2a923db600df SHA256 f6e72c8f94af1621b28ca92a3ca0131ef1a3ea635ad3adef1b5d5cd3940446ea EBUILD gnutls-3.0.7.ebuild 2686 RMD160 9d07e833183c94d2975564a94645a70cf9a0db97 SHA1 b4920173cb4be3eaab0100c0dbc722b5546d3197 SHA256 5d45c2d5fba853a4532e45d6da2c2b86f1502e9c3003bc76c1636660ac73afe6 -MISC ChangeLog 48176 RMD160 5f4cc490673066343a8fb3ef6633dd9d532c04a6 SHA1 e09118dc4cb9f6df695c4457dcf70017b45a2c73 SHA256 b10ec7c97f47519d01786b711265afa80be5766f80f21a273c64b0670020c143 +EBUILD gnutls-3.0.8.ebuild 2686 RMD160 b4a87dfcef6f1b29de2d2e5f6d898ba240cf474d SHA1 445b945b9997b2b095806c1c12478688bac38eb6 SHA256 8898056850479b494984633c47b31f34f8c51e4ca87760e8e210ac52af495505 +MISC ChangeLog 48356 RMD160 298e3079d1085a0fb2a61cb66d90591d9e1c24ac SHA1 740d62fa9c961096f39b16029f9a4f5be89dd46d SHA256 8223e77ad9a7a4a19287afded94bd02b81a9d2c6220908a8844d631ca5b0eadb MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOubCZAAoJEEqz6FtPBkyjjeoH+gN6d2EG3dWmYUSXFDXuLDR9 -dqIzWz+/l7NOcpgjjIPVM9oiVB8ZvT1wZ1TaSH5bNZ3pRGAx6U+VnPLkARwiCqP+ -tulz3mgL9f+aMzXceNKYx7LKPq0Xo1xWOV3+6IZB0DL+Yy7vCblvwWJoJTlLP2kM -idfVkxDQUgb7ONIjzZQnzq0Dkcbql+mvb18z9erak+0PpVBMuAW1i0K+XRhRRGut -I9q1XOLoo/8RzIQ/wia4VT8P/ZpRUnwb8CkOofFi+qGC3vMYEUzOrassjqwCsfzH -RVQgrmzZlveD5VOlzI6EKNqRrdk2zgyzYXilDMRKV9Hf7c6LDNfDTlhwNfhrEak= -=lFNo +iQEcBAEBCgAGBQJOvv8tAAoJEEqz6FtPBkyjgFUIAIrxIPtgKhnRyjJ4CJj5SO6+ +wjBWMftRn9mRkUI2mu3BE3lOp6NM/RX4LIrMXm27je9gjA6GJjfZKeQwEEp6Dfye +hmjAe3iYZQvCJGoOCG96X1zDXBbIQyrc9Fqdc44BCrc7qpUzHkaI+dH/jaVt+Q0Q +aS7DBePguhnV8d+pub3Wv+o12/kCJxzBtS7glFEnKdTvfycWRCa+VyMZ4oE9a43h +UlXUowhPkfuRHIlKs26pN1h8P0AEucDmf4tuyd/gISI3OfjxsttnatWhEowT4BqS +R9nxl2rPYkNEsdORaMA5h62QXnvDzekIFGNs9gEy6/2H083wXFlD5mgZ3IjGpqw= +=Mbew -----END PGP SIGNATURE----- diff --git a/net-libs/gnutls/gnutls-2.12.12.ebuild b/net-libs/gnutls/gnutls-2.12.12.ebuild deleted file mode 100644 index d02d1fe09040..000000000000 --- a/net-libs/gnutls/gnutls-2.12.12.ebuild +++ /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.12.ebuild,v 1.2 2011/11/05 19:28:49 hwoarang 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 - -# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library. -LICENSE="GPL-3 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib" - -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] ) - !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-3.0.5.ebuild b/net-libs/gnutls/gnutls-3.0.8.ebuild similarity index 93% rename from net-libs/gnutls/gnutls-3.0.5.ebuild rename to net-libs/gnutls/gnutls-3.0.8.ebuild index f0bf1af82d59..8eb87863578c 100644 --- a/net-libs/gnutls/gnutls-3.0.5.ebuild +++ b/net-libs/gnutls/gnutls-3.0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.5.ebuild,v 1.2 2011/11/05 19:28:49 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.8.ebuild,v 1.1 2011/11/12 23:20:03 radhermit Exp $ EAPI=4 @@ -27,7 +27,7 @@ fi LICENSE="GPL-3 LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="+cxx doc examples guile +nettle nls pkcs11 static-libs test zlib" +IUSE="+cxx doc examples guile nls pkcs11 static-libs test zlib" RDEPEND=">=dev-libs/libtasn1-0.3.4 >=dev-libs/nettle-2.2[gmp] -- 2.26.2