Cleanup

Package-Manager: portage-2.1.4.3

4 files changed, 6 insertions, 100 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 5620395c3b88..562128f44423 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.139 2008/01/20 15:30:05 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.140 2008/02/13 10:37:40 alonbl Exp $
+
+  13 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/gnutls-1.4.4-selflink.patch, -gnutls-1.4.4-r1.ebuild:
+  Cleanup
 
   20 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> gnutls-2.2.1.ebuild:
   Don't fail build on bindist, bug#202381, thanks to jacub
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index d3f4bb616922..1ea657dd77a1 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,9 +1,6 @@
-AUX gnutls-1.4.4-selflink.patch 756 RMD160 830b6fc3a9e277698742928f9037f674381b9ada SHA1 9149910647e17fa9c43ab0697f67ee55f3fc8721 SHA256 726cb2ab00774d9aece875ae3ea76458583d1b27c61821db87c5623dae127b31
-DIST gnutls-1.4.4.tar.bz2 4048916 RMD160 a31dfe33934ddf2500ae0e6c67aa265cd5b9ede4 SHA1 8f6ee112c8d93dd726e8e3d0e3fbf234f085a2cd SHA256 dfcdcd622b80b00d28ee40881ee56fec771213110b7fc07048bce07df7cec035
 DIST gnutls-2.0.4.tar.bz2 4911330 RMD160 e7fa86f5f9a78da73575507025cde8be6cdc0be6 SHA1 52e17e749a0ad35c54ef204d43ceecda9e5b70d7 SHA256 af07625c701f4d3b2e44b6cb1f9fcf55f8b45942abdf88cfa61a95ca30d6f91f
 DIST gnutls-2.2.1.tar.bz2 4945945 RMD160 cf0a359940ee6f741364aafd8b2e40e8b6d47127 SHA1 cfc219dad028fd823be766d939dfcec73a408844 SHA256 a2cb85e2d35dfb7dacce20737dec6f0e8c0eccf4062e44c8eeaa74e4cb6f9615
-EBUILD gnutls-1.4.4-r1.ebuild 1881 RMD160 3c776f4bd0f5c3b3b0ceb6bbefa1bfa1d2eb7cc2 SHA1 78829943cbc980c811dcc7044b34e8064f3e2149 SHA256 125708b32ccf06fd5012d96d3a6751883edf28fb890bc62c21fab015feb8ea02
 EBUILD gnutls-2.0.4.ebuild 1436 RMD160 d42ecdcf9259e92457a89b237ed581c19a741494 SHA1 35e2e1c2344ae807987a34a844d54aff29747944 SHA256 cf562ea795bbed27aa91f8c5cf9c6ef65a9b3beb7ceff91005ae49e63e30c70f
 EBUILD gnutls-2.2.1.ebuild 2025 RMD160 c1ac7be743477cbcbdb7b70496f5914ba5ad696c SHA1 5b111ce54eeb043443c3174667de6740567363e4 SHA256 06305c9e7f71e839e11649297cee8d2e8ec455688fe16ab4d1ca9ba312f384ab
-MISC ChangeLog 20566 RMD160 50f743c13f77b3627c49cf0c55f37a390e23a41a SHA1 34d253144c0e00bf6afef94ed22e1f8a45c65b26 SHA256 ec0f930d808f53c70c62b01a8ff06eeb6335787b10e4135243eca93508de910f
+MISC ChangeLog 20688 RMD160 014223d8d49923c36c5a478d8746cd61f4a57b09 SHA1 70ac34f854502b12f758ee32dd0c160f98a10e08 SHA256 674b29dfbb82dbafad0f3389755ce184cd22cd6e787cd39ea6c5f01b74479d35
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch b/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch
deleted file mode 100644
index 297f988dc8db..000000000000
--- a/net-libs/gnutls/files/gnutls-1.4.4-selflink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urNp gnutls-1.4.4.org/libextra/Makefile.am gnutls-1.4.4/libextra/Makefile.am
---- gnutls-1.4.4.org/libextra/Makefile.am	2006-03-08 12:48:08.000000000 +0200
-+++ gnutls-1.4.4/libextra/Makefile.am	2006-09-19 18:14:58.000000000 +0300
-@@ -59,7 +59,7 @@ lib_LTLIBRARIES = libgnutls-extra.la
- 
- libgnutls_extra_la_SOURCES = gnutls_extra.c
- 
--libgnutls_openssl_la_LDFLAGS = -no-undefined
-+libgnutls_openssl_la_LDFLAGS = -no-undefined -L../lib/.libs
- 
- # OpenSSL
- 
-@@ -83,7 +83,7 @@ endif
- # OpenPGP
- 
- libgnutls_extra_la_LIBADD =
--libgnutls_extra_la_LDFLAGS = -no-undefined
-+libgnutls_extra_la_LDFLAGS = -no-undefined -L../lib/.libs
- if ENABLE_OPENPGP
- libgnutls_extra_la_SOURCES += gnutls_openpgp.c
- libgnutls_extra_la_LIBADD += openpgp/libgnutls_openpgp.la
diff --git a/net-libs/gnutls/gnutls-1.4.4-r1.ebuild b/net-libs/gnutls/gnutls-1.4.4-r1.ebuild
deleted file mode 100644
index 0af717197477..000000000000
--- a/net-libs/gnutls/gnutls-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.14 2008/01/16 20:52:48 grobian Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-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 ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="zlib doc nls"
-
-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
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-#>=sys-devel/gettext-0.14.5" autoconf indicates this version but it works
-# without it
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-selflink.patch
-	elibtoolize
-	eautomake
-}
-
-src_compile() {
-	local myconf=""
-
-	econf  \
-		$(use_with zlib) \
-		$(use_enable nls) \
-		--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
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libgnutls.so.12 ]] ; then
-		ewarn "You must re-compile all packages that are linked against"
-		ewarn "Gnutls-1.2.11 by using revdep-rebuild from gentoolkit:"
-		ewarn "# revdep-rebuild --library libgnutls.so.12"
-	fi
-}