Fix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212.

7 files changed, 24 insertions, 113 deletions

diff --git a/app-text/wdiff/ChangeLog b/app-text/wdiff/ChangeLog
index b0ff8ec33b03..02766eb2ce27 100644
--- a/app-text/wdiff/ChangeLog
+++ b/app-text/wdiff/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/wdiff
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.13 2004/09/05 23:21:46 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.14 2004/10/16 20:02:59 vapier Exp $
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org> wdiff-0.5-r2.ebuild:
+  Fix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212.
 
 *wdiff-0.5-r2 (05 Sep 2004)
 
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index cd3feeb5a8d3..2c875f0d24da 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,10 +1,16 @@
-MD5 1a43bfac2fc543a70b5f9e9d68882586 ChangeLog 1864
-MD5 f8e7a31aced0c9f217d9afa8fb3d2d39 wdiff-0.5.ebuild 956
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ce9b7f33c786a667bc3976be796134db ChangeLog 2017
 MD5 64ed5942489fe8d8672fabf259c4412a metadata.xml 255
-MD5 18c0b6b89fed06daaef39a316889b1f8 wdiff-0.5-r1.ebuild 1023
-MD5 7e8cf795f81edcc5ce4c1a329c394e8c wdiff-0.5-r2.ebuild 1071
-MD5 d6f2ef7713b8a0187fd684b0d8010347 files/digest-wdiff-0.5 128
-MD5 d6f2ef7713b8a0187fd684b0d8010347 files/digest-wdiff-0.5-r1 128
+MD5 8aec0da0c445a6da6630a8acb27b7649 wdiff-0.5-r2.ebuild 1078
 MD5 9857b4daaad6db84f5c7dd600a7e7b4c files/wdiff-0.5-segfault-fix.diff 487
-MD5 c0daaa4f7a7f181a9900d082fe2f5a7a files/wdiff-0.5-avoid-wraps.diff 401
 MD5 d6f2ef7713b8a0187fd684b0d8010347 files/digest-wdiff-0.5-r2 128
+MD5 c0daaa4f7a7f181a9900d082fe2f5a7a files/wdiff-0.5-avoid-wraps.diff 401
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBcX5/HTu7gpaalycRAlXNAKD7v8G//nFNuZidZVsR9AikiXPUNwCgrVJ3
+jOC/p4/jZxdUgFp3t8udZ4o=
+=dhCW
+-----END PGP SIGNATURE-----
diff --git a/app-text/wdiff/files/digest-wdiff-0.5 b/app-text/wdiff/files/digest-wdiff-0.5
deleted file mode 100644
index 492c83e04f6c..000000000000
--- a/app-text/wdiff/files/digest-wdiff-0.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7f9c78f5dd6fb4f3dabe28fbd4d14319 wdiff-0.5.tar.gz 129267
-MD5 9a919e76ca95db105427d827ed1a4c31 wdiff-0.5-gentoo.diff.bz2 253
diff --git a/app-text/wdiff/files/digest-wdiff-0.5-r1 b/app-text/wdiff/files/digest-wdiff-0.5-r1
deleted file mode 100644
index 492c83e04f6c..000000000000
--- a/app-text/wdiff/files/digest-wdiff-0.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7f9c78f5dd6fb4f3dabe28fbd4d14319 wdiff-0.5.tar.gz 129267
-MD5 9a919e76ca95db105427d827ed1a4c31 wdiff-0.5-gentoo.diff.bz2 253
diff --git a/app-text/wdiff/wdiff-0.5-r1.ebuild b/app-text/wdiff/wdiff-0.5-r1.ebuild
deleted file mode 100644
index 38605c9e8a9d..000000000000
--- a/app-text/wdiff/wdiff-0.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.5-r1.ebuild,v 1.3 2004/09/03 00:31:28 dholm Exp $
-
-inherit eutils
-
-IUSE="build"
-
-DESCRIPTION="Create a diff disregarding formatting"
-HOMEPAGE="http://www.gnu.org/software/wdiff/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~mips ~ppc"
-
-DEPEND="sys-libs/libtermcap-compat
-	sys-apps/diffutils
-	sys-apps/less"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-segfault-fix.diff
-}
-
-src_compile() {
-	# Cannot use econf here because the configure script that
-	# comes with wdiff is too old to understand the standard
-	# options.
-
-	./configure --prefix=/usr || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	if ! use build
-	then
-		dodoc COPYING ChangeLog NEWS README
-		doman wdiff.1
-	else
-		rm -rf ${D}/usr/share/info
-	fi
-}
diff --git a/app-text/wdiff/wdiff-0.5-r2.ebuild b/app-text/wdiff/wdiff-0.5-r2.ebuild
index 1da932c7680e..fa179b35207c 100644
--- a/app-text/wdiff/wdiff-0.5-r2.ebuild
+++ b/app-text/wdiff/wdiff-0.5-r2.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.5-r2.ebuild,v 1.1 2004/09/05 11:50:44 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.5-r2.ebuild,v 1.2 2004/10/16 20:02:59 vapier Exp $
 
 inherit eutils
 
-IUSE="build"
-
 DESCRIPTION="Create a diff disregarding formatting"
 HOMEPAGE="http://www.gnu.org/software/wdiff/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 	mirror://gentoo/${P}-gentoo.diff.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc x86"
+IUSE="build"
 
-DEPEND="sys-libs/libtermcap-compat
-	sys-apps/diffutils
+DEPEND="sys-apps/diffutils
 	sys-apps/less"
 
 src_unpack() {
@@ -25,6 +23,7 @@ src_unpack() {
 	epatch ${WORKDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-segfault-fix.diff
 	epatch ${FILESDIR}/${P}-avoid-wraps.diff
+	sed -i 's:-ltermcap:-lncurses:' configure
 }
 
 src_compile() {
@@ -41,7 +40,7 @@ src_install() {
 
 	if ! use build
 	then
-		dodoc COPYING ChangeLog NEWS README
+		dodoc ChangeLog NEWS README
 		doman wdiff.1
 	else
 		rm -rf ${D}/usr/share/info
diff --git a/app-text/wdiff/wdiff-0.5.ebuild b/app-text/wdiff/wdiff-0.5.ebuild
deleted file mode 100644
index d8126ac8249b..000000000000
--- a/app-text/wdiff/wdiff-0.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.5.ebuild,v 1.8 2004/06/28 04:18:57 ciaranm Exp $
-
-inherit eutils
-
-DESCRIPTION="Create a diff disregarding formatting"
-HOMEPAGE="http://www.gnu.org/software/wdiff/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~mips"
-IUSE="build"
-
-DEPEND="sys-libs/libtermcap-compat
-	sys-apps/diffutils
-	sys-apps/less"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	# Cannot use econf here because the configure script that
-	# comes with wdiff is too old to understand the standard
-	# options.
-
-	./configure --prefix=/usr || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	if ! use build
-	then
-		dodoc COPYING ChangeLog NEWS README
-	else
-		rm -rf ${D}/usr/share/info
-	fi
-}