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

6 files changed, 21 insertions, 51 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index bdc978339887..6f53aedd3ae9 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.82 2004/10/06 15:50:11 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.83 2004/10/16 19:42:09 vapier Exp $
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org> fvwm-2.4.18.ebuild,
+  fvwm-2.5.10-r3.ebuild, fvwm-2.5.10-r5.ebuild, fvwm-2.5.10-r6.ebuild,
+  fvwm-2.5.12.ebuild:
+  Fix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212.
 
 *fvwm-2.5.12 (06 Oct 2004)
 
diff --git a/x11-wm/fvwm/fvwm-2.4.18.ebuild b/x11-wm/fvwm/fvwm-2.4.18.ebuild
index 7f19d831d5c5..64f90030e653 100644
--- a/x11-wm/fvwm/fvwm-2.4.18.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.18.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/x11-wm/fvwm/fvwm-2.4.18.ebuild,v 1.5 2004/07/15 01:12:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.18.ebuild,v 1.6 2004/10/16 19:42:09 vapier Exp $
 
 inherit gnuconfig
 
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="x86 alpha ppc sparc"
 LICENSE="GPL-2 FVWM"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
+RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
 		gtk? ( =x11-libs/gtk+-1.2*
 				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
 						>=media-libs/imlib-1.9.14-r1 ) )
@@ -46,12 +44,7 @@ src_compile() {
 	else
 		myconf="${myconf} --with-readline-library"
 
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
+		myconf="${myconf} --without-termcap-library"
 	fi
 
 	# fvwm configure doesnt provide a way to disable gtk support if the
diff --git a/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild b/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild
index d7314a69f2be..7e90e0391614 100644
--- a/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.10-r3.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/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild,v 1.10 2004/08/20 01:56:16 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10-r3.ebuild,v 1.11 2004/10/16 19:42:09 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="x86 alpha sparc ppc amd64"
 LICENSE="GPL-2 FVWM"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
+RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
 		gtk? ( =x11-libs/gtk+-1.2*
 				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
 						>=media-libs/imlib-1.9.14-r1 )
@@ -96,12 +94,7 @@ src_compile() {
 	else
 		myconf="${myconf} --with-readline-library"
 
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
+		myconf="${myconf} --without-termcap-library"
 	fi
 
 	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
diff --git a/x11-wm/fvwm/fvwm-2.5.10-r5.ebuild b/x11-wm/fvwm/fvwm-2.5.10-r5.ebuild
index d0070fe0edf4..83bb53a2c57e 100644
--- a/x11-wm/fvwm/fvwm-2.5.10-r5.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.10-r5.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/x11-wm/fvwm/fvwm-2.5.10-r5.ebuild,v 1.6 2004/08/20 01:56:16 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10-r5.ebuild,v 1.7 2004/10/16 19:42:09 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~alpha ~sparc ppc ~amd64"
 LICENSE="GPL-2 FVWM"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
+RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
 		gtk? ( =x11-libs/gtk+-1.2*
 				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
 						>=media-libs/imlib-1.9.14-r1 )
@@ -110,12 +108,7 @@ src_compile() {
 	else
 		myconf="${myconf} --with-readline-library"
 
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
+		myconf="${myconf} --without-termcap-library"
 	fi
 
 	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
diff --git a/x11-wm/fvwm/fvwm-2.5.10-r6.ebuild b/x11-wm/fvwm/fvwm-2.5.10-r6.ebuild
index 80c2ea67df9c..26a922090b4d 100644
--- a/x11-wm/fvwm/fvwm-2.5.10-r6.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.10-r6.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/x11-wm/fvwm/fvwm-2.5.10-r6.ebuild,v 1.6 2004/09/08 10:00:24 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10-r6.ebuild,v 1.7 2004/10/16 19:42:09 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ppc64 ppc"
 LICENSE="GPL-2 FVWM"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
+RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
 		gtk? ( =x11-libs/gtk+-1.2*
 				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
 						>=media-libs/imlib-1.9.14-r1 )
@@ -111,12 +109,7 @@ src_compile() {
 	else
 		myconf="${myconf} --with-readline-library"
 
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
+		myconf="${myconf} --without-termcap-library"
 	fi
 
 	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
diff --git a/x11-wm/fvwm/fvwm-2.5.12.ebuild b/x11-wm/fvwm/fvwm-2.5.12.ebuild
index 577b4dc36902..c9b247852c05 100644
--- a/x11-wm/fvwm/fvwm-2.5.12.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.12.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/x11-wm/fvwm/fvwm-2.5.12.ebuild,v 1.2 2004/10/06 18:30:38 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.12.ebuild,v 1.3 2004/10/16 19:42:09 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,9 +16,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc64 ~ppc ~amd64 ~sparc"
 LICENSE="GPL-2 FVWM"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
+RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
 		gtk? ( =x11-libs/gtk+-1.2*
 				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
 						>=media-libs/imlib-1.9.14-r1 )
@@ -89,12 +87,7 @@ src_compile() {
 	else
 		myconf="${myconf} --with-readline-library"
 
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
+		myconf="${myconf} --without-termcap-library"
 	fi
 
 	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously