fixed selflink patch thanks to Alon Bar-Lev in bug #147800

(Portage version: 2.1.2_pre1)
 (Signed Manifest commit)

3 files changed, 18 insertions, 86 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index bd0e5830ce70..0a91fc78fd91 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -9,10 +9,10 @@ AUX gnutls-1.4.1-as-needed.patch 3045 RMD160 95366b846c5674769ac279a4bc69a4d8da4
 MD5 763571a9ba2b91db8e48617ab813bc46 files/gnutls-1.4.1-as-needed.patch 3045
 RMD160 95366b846c5674769ac279a4bc69a4d8da4f410f files/gnutls-1.4.1-as-needed.patch 3045
 SHA256 978f7f3e23b4f1e1fb53a49407e9adfa7b9c4d30e363631ae43731da9918c153 files/gnutls-1.4.1-as-needed.patch 3045
-AUX gnutls-1.4.4-selflink.patch 748 RMD160 e559ca398b98bdd2c5d4fb80dbcd9cc4b4314799 SHA1 7a9fbc3f6c75af8e6c303ecf8a00eeaf6c7fe2f2 SHA256 6cf9cf2b3ef8380b5408549fd7d5df24ee8fe5ba2a1f266135a931ff89aa1e5e
-MD5 06dc2607bc824d52f566e1b514b05b15 files/gnutls-1.4.4-selflink.patch 748
-RMD160 e559ca398b98bdd2c5d4fb80dbcd9cc4b4314799 files/gnutls-1.4.4-selflink.patch 748
-SHA256 6cf9cf2b3ef8380b5408549fd7d5df24ee8fe5ba2a1f266135a931ff89aa1e5e files/gnutls-1.4.4-selflink.patch 748
+AUX gnutls-1.4.4-selflink.patch 756 RMD160 830b6fc3a9e277698742928f9037f674381b9ada SHA1 9149910647e17fa9c43ab0697f67ee55f3fc8721 SHA256 726cb2ab00774d9aece875ae3ea76458583d1b27c61821db87c5623dae127b31
+MD5 1ce7c84a86097d0fca1c76e20ffd9699 files/gnutls-1.4.4-selflink.patch 756
+RMD160 830b6fc3a9e277698742928f9037f674381b9ada files/gnutls-1.4.4-selflink.patch 756
+SHA256 726cb2ab00774d9aece875ae3ea76458583d1b27c61821db87c5623dae127b31 files/gnutls-1.4.4-selflink.patch 756
 DIST gnutls-1.2.10.tar.bz2 2737849 RMD160 33b0d4e5955b06611141ac2d1e8889b42675cc98 SHA1 18140bebae006e019deb77962836bcd775256aab SHA256 1b16eecc4a8bf2f4941eb7a2ebf0632f908b9c2733457e0076b13a79798dce23
 DIST gnutls-1.2.11.tar.bz2 2756620 RMD160 07b3f4b9fb875c55e981f95aa4edb6c639176331 SHA1 4d5167091c72f994ed97e1406ae886f3c2757d49 SHA256 400c118150b31f475a5d562d60ab6912ed7a52b12ef31b2ad9b30a6960ea446d
 DIST gnutls-1.4.1.tar.bz2 4046780 RMD160 1bb959a118ce8d776693f602034342c31a8737aa SHA1 25d183fef21abbcaab0afe6b5809893aa70b577d SHA256 834e0009a6bfc67c427ba652ae2139f6cce50b4a1ac38214de6249611de73def
@@ -33,14 +33,14 @@ EBUILD gnutls-1.4.1.ebuild 1468 RMD160 47af0e82fa9b128d6255f80043c95e6ce3c58474
 MD5 e1bd943b030b2733afdb1de20a8213e7 gnutls-1.4.1.ebuild 1468
 RMD160 47af0e82fa9b128d6255f80043c95e6ce3c58474 gnutls-1.4.1.ebuild 1468
 SHA256 89b0c973352da16292da172d31f5347ed3dcde7de2746859d6680b92a5d89e7e gnutls-1.4.1.ebuild 1468
-EBUILD gnutls-1.4.4.ebuild 1719 RMD160 dc68c436c384766d5204016bf08c308b0522ac53 SHA1 0884bd4d0f933110a32803849fae54df836a5815 SHA256 c5b0e30ec969e94f155eb157e066526a0f8f090d73db4dc140820cdc8800a3ba
-MD5 487900e939ee75adc35e30294e58d8db gnutls-1.4.4.ebuild 1719
-RMD160 dc68c436c384766d5204016bf08c308b0522ac53 gnutls-1.4.4.ebuild 1719
-SHA256 c5b0e30ec969e94f155eb157e066526a0f8f090d73db4dc140820cdc8800a3ba gnutls-1.4.4.ebuild 1719
-MISC ChangeLog 15632 RMD160 594370441300e8085ff7624716e12e77541dcf63 SHA1 5f52dceb7d9b98817c7baa0792dfdf2d6b3aa369 SHA256 bd2d047df2b08e70f386577016cf44c49e9e34c83e494dc0e99757d1a791041d
-MD5 198b7fb27ce6d6eae2ae61321466a659 ChangeLog 15632
-RMD160 594370441300e8085ff7624716e12e77541dcf63 ChangeLog 15632
-SHA256 bd2d047df2b08e70f386577016cf44c49e9e34c83e494dc0e99757d1a791041d ChangeLog 15632
+EBUILD gnutls-1.4.4-r1.ebuild 1521 RMD160 16b9c1acb6bae3d428791637f5a0299f3dea3b0a SHA1 5f3837d0fd388c1e37ce85db8826e0b666a4bcd5 SHA256 82ad59fd8eb2091d180b97edab9d3f719816d2c48a25620c78322a7cf1e1d93f
+MD5 52e4f3a9056699eaef0691f262e6989f gnutls-1.4.4-r1.ebuild 1521
+RMD160 16b9c1acb6bae3d428791637f5a0299f3dea3b0a gnutls-1.4.4-r1.ebuild 1521
+SHA256 82ad59fd8eb2091d180b97edab9d3f719816d2c48a25620c78322a7cf1e1d93f gnutls-1.4.4-r1.ebuild 1521
+MISC ChangeLog 15865 RMD160 daefbbc089fd299ebecb633becf814edf6a1bac6 SHA1 07a3a122d3fadd45bb3cb1717d3627884fe62e67 SHA256 05030036fdd2f3d9cff12ae1f89f09645f42559a05848cd99a29efbfc40c797d
+MD5 6f8758a325e299d2d9fe3a99c8bb5799 ChangeLog 15865
+RMD160 daefbbc089fd299ebecb633becf814edf6a1bac6 ChangeLog 15865
+SHA256 05030036fdd2f3d9cff12ae1f89f09645f42559a05848cd99a29efbfc40c797d ChangeLog 15865
 MISC metadata.xml 276 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c SHA1 1f70a3ead5de1eb0d62a59c084b3a06147256e2f SHA256 abd952a77edadf769a821e7210a01f38850cada9a7677a1561f6aa0ce954f480
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c metadata.xml 276
@@ -57,13 +57,13 @@ SHA256 8d3459d1267af0e4b428e0cc7754900fd0683d7ffc1343efbc734299f88b26ca files/di
 MD5 dc7a3d08731b4d700adadcb93d1a3e4b files/digest-gnutls-1.4.1 244
 RMD160 44feeb4561921ea716793d0cf06ef98dc3fb3eac files/digest-gnutls-1.4.1 244
 SHA256 9b90f6154d6e62a7ca293a0952da6a9981722382f5f90b8af55fa46db7846dc0 files/digest-gnutls-1.4.1 244
-MD5 be730be5feb0bac389fb036a33c1c42b files/digest-gnutls-1.4.4 244
-RMD160 3ac7f1b8772d3ed3329629f22c09773ecded01b1 files/digest-gnutls-1.4.4 244
-SHA256 314e2cbd832d1f021e946afb2adbbf21fdd1946d5724eb8a623934aa0c8cd999 files/digest-gnutls-1.4.4 244
+MD5 be730be5feb0bac389fb036a33c1c42b files/digest-gnutls-1.4.4-r1 244
+RMD160 3ac7f1b8772d3ed3329629f22c09773ecded01b1 files/digest-gnutls-1.4.4-r1 244
+SHA256 314e2cbd832d1f021e946afb2adbbf21fdd1946d5724eb8a623934aa0c8cd999 files/digest-gnutls-1.4.4-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFDb51mdTrptrqvGERAu86AJ9f5FhLajoY3qIF02tD1BTxNaV10wCfWncR
-AgYeFL9MbJg9Pw/h9LWM3p8=
-=bRdd
+iD8DBQFFEFP1mdTrptrqvGERAmGAAJ9wsCquiucOH7m53wqKWAOFUMgqcACfTt+k
+7RoWt4dAzlASTyKQPDor/nc=
+=EugR
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/digest-gnutls-1.4.4 b/net-libs/gnutls/files/digest-gnutls-1.4.4
deleted file mode 100644
index d15ca93b66b4..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 de5e060eeb2da36654e9e8af6b8b012a gnutls-1.4.4.tar.bz2 4048916
-RMD160 a31dfe33934ddf2500ae0e6c67aa265cd5b9ede4 gnutls-1.4.4.tar.bz2 4048916
-SHA256 dfcdcd622b80b00d28ee40881ee56fec771213110b7fc07048bce07df7cec035 gnutls-1.4.4.tar.bz2 4048916
diff --git a/net-libs/gnutls/gnutls-1.4.4.ebuild b/net-libs/gnutls/gnutls-1.4.4.ebuild
deleted file mode 100644
index d353a53b0c79..000000000000
--- a/net-libs/gnutls/gnutls-1.4.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.4.4.ebuild,v 1.3 2006/09/17 21:27:34 dragonheart Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="http://josefsson.org/gnutls/releases/${P}.tar.bz2"
-
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="zlib doc"
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.2
-	>=app-crypt/opencdk-0.5.5
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-2
-	dev-libs/libgpg-error
-	>=dev-libs/libtasn1-0.3.4
-	sys-devel/gettext"
-#>=sys-devel/gettext-0.14.5" autoconf indicates this version but it works
-# without it
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	>=sys-devel/autoconf-2.60"
-# Temporarily added sys-devel/autoconf-2.60 dependency as per bug #147970 until
-# a better solution can be found
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-selflink.patch
-	AT_M4DIR="${S}/m4 ${S}/gl/m4" _elibtoolize --copy --force
-	eautoconf -I m4 -I gl/m4
-}
-
-src_compile() {
-	local myconf=""
-
-	econf  \
-		$(use_with zlib) \
-		--without-included-minilzo \
-		--without-included-opencdk \
-		$(use_enable doc gtk-doc) \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS \
-		README THANKS doc/TODO
-
-	if use doc ; then
-		dodoc doc/README.autoconf doc/tex/gnutls.ps
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}