Version bump and remove old.

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

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 2c111fdc337f28c171e9167982e6d8eb28e529d6..16e11c606045e2791e5d340506c264b229d53d24 100644 (file)
--- 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.316 2011/10/15 19:59:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.317 2011/10/21 19:10:25 radhermit Exp $
+
+*gnutls-2.12.12 (21 Oct 2011)
+
+  21 Oct 2011; Tim Harder <radhermit@gentoo.org> -gnutls-2.12.10.ebuild,
+  -gnutls-2.12.11.ebuild, +gnutls-2.12.12.ebuild:
+  Version bump and remove old.
 
 *gnutls-3.0.4 (15 Oct 2011)
 

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 5d3b667cd4c66cc91bade07f6d25b545f9a394cd..74de7ff18618518de72bbed4ba9decf5a0d32925 100644 (file)
--- 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.10.tar.bz2 7253056 RMD160 d1151b1c421cd2b66bd6363f26e0a135b6cff984 SHA1 52ed0bfa3dc7900f8da22f29eaace6ec34439223 SHA256 c21f2e6ba9c78bfe681cfe24f0e8c73e3244da305a57a3287c6c7173a6d9a304
-DIST gnutls-2.12.11.tar.bz2 7162654 RMD160 d8892c8ab44a69e45d43125fd653c25e62d1fb9d SHA1 30c8977c3f32b48e523e09cb8ce8952d80520a4f SHA256 00b58e1aafe99bbd0cb371e7f1df9cc58bf807301cf70a7eebedeee093991360
+DIST gnutls-2.12.12.tar.bz2 7195302 RMD160 d0e26b56c44e363f95871c5e80359fab20176b25 SHA1 6c87591705b21f7cae845ecdae158a6c5d8f2847 SHA256 7cfd0a58b4e0810cbe9ec1c6854b56aeb9a3c29746a93836ee784b04de131181
 DIST gnutls-3.0.3.tar.xz 4281044 RMD160 455ad881e5abacb8a3b581534cbef24b256d1ff5 SHA1 0e6c325ae12cf1a4bd7d25125b8d58d51472fc14 SHA256 1c9f7e5e22b30cc7e558b00aa0a78388852b62b241c68c4f5dce1cb39ca6298b
 DIST gnutls-3.0.4.tar.xz 4289052 RMD160 0137ca396fc9cc48139b37f9246601efa323a518 SHA1 4e893b1a55865cbf12a8d43e1bde34fd549cc0d8 SHA256 a367e79229d14742b128fb65c3257ee0cb7b43c9afaf52cb9eb41fc044c9b09a
 EBUILD gnutls-2.10.5.ebuild 2837 RMD160 08f973e7eab9f993a3be578f84455f623df06969 SHA1 00d1384fcb7b2f720a23decdb5c2563be3680da3 SHA256 62595d10eff18850b36d623cb66cbcdccc6d5e01ae71b5d06fd5898e165f139e
-EBUILD gnutls-2.12.10.ebuild 3149 RMD160 ac00128e761fc1d84e742c2b20e15f45c9ffc66c SHA1 3201bd3d7fd8e8087531d851c396ebb77d87ff1f SHA256 46cf777e7174bf01ecb7f4942ff379a2153f61241ba5c70010e8377089baa69c
-EBUILD gnutls-2.12.11.ebuild 3149 RMD160 ae31ae8775ac879131bb6cc03270fb167c61af5d SHA1 7cbe4941e08f188c9f0e02e320e82622d668aa63 SHA256 dc7592dd53e4a391c0cde2dc5034c661c969cafcda40e9eb8cbd27ee263ceddc
+EBUILD gnutls-2.12.12.ebuild 3149 RMD160 0b8d1587dd5c3bdad1a0716ffe5174af21481935 SHA1 a5723e886a98f63d853097ef91600d80840cb484 SHA256 bce0a3eef622a963bfb599d7c412e7993ecc56506afc2d36179515db40c8fd3b
 EBUILD gnutls-3.0.3.ebuild 2768 RMD160 310a64ad55eecc2b8f3f7b7010f7d845343f8c9e SHA1 b7266a284b0f9cfd6e4fdc50e8d3d14f1a48bce1 SHA256 c2a7eba33a07f59ec11f54eb712c045c7e4823dc2434665729b2220e37c14793
 EBUILD gnutls-3.0.4.ebuild 2768 RMD160 74f04b2e06abf8d10f7580017a25f5f7dd80e2ef SHA1 cb1a3fba83cdc56e207a42412d47207cefbc6e4e SHA256 8c6d7a618b8bcc8a060df9a23594b9bde83dd7c1010b5b9e972f1917a3559aad
-MISC ChangeLog 47397 RMD160 882993f04430e9625c1d535fa5f27ceb95889945 SHA1 bdde1da32fb7481aa855aa8d57d1ec45a8180c71 SHA256 1c9443b7f26e44933387233a7973f533b019f470a4858da68b3b06aa6c4bc561
+MISC ChangeLog 47583 RMD160 b699e0065c0adc78e846b6c7368f6f7effdd1f26 SHA1 2853df0702623807cf5fa907efb92b60551d8d30 SHA256 f10a4480bad77d042b668d34991ce3500b8387e2236e01cf27e17b868a41846f
 MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOmeYzAAoJEEqz6FtPBkyjAycIAJePPPGD4us/oSzJUlD2dB9N
-afE2cRijfLeUvE7u/DoKTFnu9EJtRUzRr/WtrzTAtbfogZrHbRUBuY5eayITSH5o
-rgMc7vSaHMeDx9Li5WPUtod/MUUWpOkixTh4CkkT+qGbVj55yilw//YRe66mABwi
-B4iZw289i2OaYqOaeztHImd9HDKB8kvm1bgad1Sf6ZXTETMg9Ko+qdYR2uPdjk+E
-OdYVMa5rnI2EpcYm92YEzLAbObNGwHJRa2/L8uqzAiDoFhd3XzfsjA03WBQofL1N
-fCD9H/aKnO8wEhpuWnz+vvPo/CdlrZL8Tzkz5pmarGUS02sKpVW6syphL5HFNac=
-=PReW
+iQEcBAEBCgAGBQJOocOnAAoJEEqz6FtPBkyjfPMH/3YNfey3LIaW7DbEGrpYv7RR
+nKLgbp6/9vjouZgbH9o5tbEMQX6eSmTJ0Ss0deOLm/yGewa3SFmMWZio3xYLsiwd
+Tg9+6ifLcvmQm9uTeKHJOa9xYBlYOzZ5V3Ud/7PWrBowglx8kJrzzTxjrpJtWQW+
+daSJk/xRmrk/Dd8ktRJXwjn7TrFI16kjXI04AoIdL5+oEJ8FCGfgDsap/CtGilkJ
+92K5PT6cIoL2OGJ5JD6YpaJ34OD9DOmcfk5CuWzwSogd8ajLTx5e3Tmvm8IXTWW/
+Z2UbMlY7uZyNKrxcpS9uC+EID9dG/YxTGEeEe5rKOfhKJBecocgBfA+pMrc/Spg=
+=KHRR
 -----END PGP SIGNATURE-----

diff --git a/net-libs/gnutls/gnutls-2.12.11.ebuild b/net-libs/gnutls/gnutls-2.12.11.ebuild
deleted file mode 100644 (file)
index 7598c92..0000000
--- a/net-libs/gnutls/gnutls-2.12.11.ebuild
+++ /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.11.ebuild,v 1.1 2011/09/21 06:37:18 radhermit 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"
-
-# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
-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-2.12.10.ebuild b/net-libs/gnutls/gnutls-2.12.12.ebuild
similarity index 98%
rename from net-libs/gnutls/gnutls-2.12.10.ebuild
rename to net-libs/gnutls/gnutls-2.12.12.ebuild
index f2e380c547ec77e581e087b08b9dfae289b57e59..840a11f971afa4f03701c7e9bd0e8af85b9c824d 100644 (file)
--- a/net-libs/gnutls/gnutls-2.12.10.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.12.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-2.12.10.ebuild,v 1.1 2011/09/18 07:50:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.12.ebuild,v 1.1 2011/10/21 19:10:25 radhermit Exp $
 
 EAPI="3"