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

4 files changed, 26 insertions, 27 deletions

diff --git a/app-misc/tdl/ChangeLog b/app-misc/tdl/ChangeLog
index e1a7abff7d85..87301c622883 100644
--- a/app-misc/tdl/ChangeLog
+++ b/app-misc/tdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tdl
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/ChangeLog,v 1.12 2004/10/05 13:34:52 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/ChangeLog,v 1.13 2004/10/16 19:30:08 vapier Exp $
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org> tdl-1.4.1.ebuild,
+  tdl-1.5.2.ebuild:
+  Fix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> tdl-1.4.1.ebuild,
   tdl-1.5.2.ebuild:
diff --git a/app-misc/tdl/Manifest b/app-misc/tdl/Manifest
index a1a1df7f6199..9acf7b2affa0 100644
--- a/app-misc/tdl/Manifest
+++ b/app-misc/tdl/Manifest
@@ -1,8 +1,18 @@
-MD5 38d23abbdee930d6dacc60913661da8c tdl-1.5.2.ebuild 1551
-MD5 dbf293692a2a603c487ca2dee318a61a tdl-1.4.1.ebuild 1339
-MD5 b5afec0aae7682d76dc09e270009c2fe ChangeLog 1439
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bcfc1499bae852095fa0d041ec6bd6ea ChangeLog 1605
 MD5 96e865f5c22f4de4451408833a2667e1 metadata.xml 479
+MD5 20e1c622a364a9418ecc2904539ee0f2 tdl-1.4.1.ebuild 1203
+MD5 d8d39f1cc84e17ee4cb97387924b99da tdl-1.5.2.ebuild 1318
 MD5 e99939886dd2c94f740140ef76236e33 files/digest-tdl-1.4.1 60
-MD5 faf29f05b6930bde649efeaae5b33de2 files/digest-tdl-1.5.2 60
 MD5 ff06d78684e7e3ab92ff23b37b1a9388 files/screenshot.png 24689
+MD5 faf29f05b6930bde649efeaae5b33de2 files/digest-tdl-1.5.2 60
 MD5 8e3a75855c82e4ffb3b73e8e2634f38c files/tdl-1.5.2-tar-gz-asc.txt 189
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBcXbMHTu7gpaalycRAhDmAJsFuymJbBpGurUnDmxeIniOmTmQUACfaTTb
+xXapuuuMuQwgAvZBTCuA/+c=
+=ZlEh
+-----END PGP SIGNATURE-----
diff --git a/app-misc/tdl/tdl-1.4.1.ebuild b/app-misc/tdl/tdl-1.4.1.ebuild
index 232d5455df09..606a62a730e5 100644
--- a/app-misc/tdl/tdl-1.4.1.ebuild
+++ b/app-misc/tdl/tdl-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.4.1.ebuild,v 1.10 2004/10/05 13:34:52 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.4.1.ebuild,v 1.11 2004/10/16 19:30:08 vapier Exp $
 
 DESCRIPTION="Command line To Do List manager"
 HOMEPAGE="http://www.rc0.org.uk/tdl/"
@@ -14,8 +14,7 @@ IUSE="readline ncurses doc"
 RDEPEND="
 	readline? (
 		>=sys-libs/readline-4.3
-		ncurses? ( sys-libs/ncurses )
-		!ncurses? ( sys-libs/libtermcap-compat )
+		sys-libs/ncurses
 	)"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
@@ -28,11 +27,7 @@ src_compile() {
 	if ! use readline; then
 		myconf="${myconf} --without-readline"
 	else
-		if use ncurses; then
-			sed -i 's#-ltermcap#-lncurses#g' ${S}/configure
-		else
-			sed -i 's#-lncurses##g' ${S}/configure
-		fi
+		sed -i 's#-ltermcap#-lncurses#g' ${S}/configure
 	fi
 
 	./configure ${myconf} || die "configure failed, sorry!"
diff --git a/app-misc/tdl/tdl-1.5.2.ebuild b/app-misc/tdl/tdl-1.5.2.ebuild
index 2648baaf95b8..8f2548a57877 100644
--- a/app-misc/tdl/tdl-1.5.2.ebuild
+++ b/app-misc/tdl/tdl-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.5.2.ebuild,v 1.10 2004/10/13 20:14:27 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.5.2.ebuild,v 1.11 2004/10/16 19:30:08 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -14,8 +14,7 @@ KEYWORDS="x86 alpha ppc ~amd64"
 IUSE="readline ncurses doc"
 
 RDEPEND=">=sys-libs/readline-4.3
-	ncurses? ( sys-libs/ncurses )
-	!ncurses? ( sys-libs/libtermcap-compat )"
+	sys-libs/ncurses"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	>=sys-apps/sed-4
@@ -27,18 +26,9 @@ src_compile() {
 	if ! use readline; then
 		myconf="${myconf} --without-readline"
 
-		if use ncurses; then
-			sed -i 's#\($(LIB_READLINE)\)#\1 -lncurses##g' ${S}/Makefile.in
-		else
-			sed -i 's#\($(LIB_READLINE)\)#\1 -ltermcap##g' ${S}/Makefile.in
-		fi
-	fi
-
-	if use ncurses; then
-		sed -i 's#-ltermcap#-lncurses#g' ${S}/configure
-	else
-		sed -i 's#-lncurses##g' ${S}/configure
+		sed -i 's#\($(LIB_READLINE)\)#\1 -lncurses##g' ${S}/Makefile.in
 	fi
+	sed -i 's#-ltermcap#-lncurses#g' ${S}/configure
 
 	# XXX: do not replace with econf.
 	${S}/configure ${myconf} || die "configure failed, sorry!"