Cleanup

(Portage version: 2.1.4.3)

3 files changed, 5 insertions, 96 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/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
-}