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

7 files changed, 51 insertions, 71 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/Manifest b/x11-wm/fvwm/Manifest
index a1fdf9335dc2..ecf84035fe00 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,27 +1,37 @@
-MD5 dda8d844b955f1a44d8a40547d1eae56 fvwm-2.5.12.ebuild 9752
-MD5 b91e90b446bc591842f20d2d5842346c fvwm-2.5.10-r5.ebuild 9832
-MD5 b23a899441a230e45a4fff6a37449370 fvwm-2.5.10-r6.ebuild 9911
-MD5 06177119f5e748d0c95dbd155615fbbd ChangeLog 15152
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 db6f4e2e0a846e7dd9bb975f02983177 ChangeLog 15395
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
-MD5 2ec81c8638226c9a1cc11cf41ff5952a fvwm-2.4.18.ebuild 3132
-MD5 167d7709634ac3bd87c3848b41bd307b fvwm-2.5.10-r3.ebuild 9266
-MD5 2a5b6dde57161daa48ec5946e78554d7 files/fvwm-2.5.10-fvwmbuttonshover.diff.gz 9994
-MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
-MD5 d8a3811b3a9581c42119cdc86dff4c7d files/fvwm-2.5.10-Test-update.diff 702
+MD5 b5f83e93b83ef162f9b4bb65f334c9de fvwm-2.5.12.ebuild 9567
+MD5 3f4d082c8feb0ccdb142c93348026b06 fvwm-2.5.10-r3.ebuild 9079
+MD5 5481c1007030328dde284578257aa04e fvwm-2.5.10-r5.ebuild 9645
+MD5 e2dec71f4cfff54394116c1656172ad5 fvwm-2.4.18.ebuild 2945
+MD5 8e032c7debba0196f50cbb036679259b fvwm-2.5.10-r6.ebuild 9726
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
-MD5 98b1cd33f30ee47c88a2c3da2b2ddc68 files/fvwm-iconman.diff 2383
-MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65
+MD5 5bda5a33cdd7fc8517aa413550ad4e1e files/iconfile-2.5.10.diff 745
 MD5 c8fa1c05cdae43bd53f68942d684f23a files/digest-fvwm-2.5.12 209
-MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
+MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
-MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.diff 2349
+MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
+MD5 98b1cd33f30ee47c88a2c3da2b2ddc68 files/fvwm-iconman.diff 2383
+MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923
 MD5 d15c4e05878e8e2b8a9d5edcf30abdc2 files/fvwm-2.5.9-translucent-menus.diff.gz 58529
-MD5 5bda5a33cdd7fc8517aa413550ad4e1e files/iconfile-2.5.10.diff 745
-MD5 0a39299dd7ca570060f545e659c77604 files/fvwm-2.5.10-FvwmCommand.diff 1013
-MD5 0c1b906138bf4e2977e7be1631f949d9 files/digest-fvwm-2.5.10-r3 128
+MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.diff 2349
+MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65
 MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r5 129
-MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r6 129
-MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
-MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
 MD5 efd2297324dd0241c2a879beadfabdb7 files/fvwm-2.5.10-mips-compat.diff 2306
-MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923
+MD5 0c1b906138bf4e2977e7be1631f949d9 files/digest-fvwm-2.5.10-r3 128
+MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
+MD5 0a39299dd7ca570060f545e659c77604 files/fvwm-2.5.10-FvwmCommand.diff 1013
+MD5 d8a3811b3a9581c42119cdc86dff4c7d files/fvwm-2.5.10-Test-update.diff 702
+MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
+MD5 856bdf34d1530e03fc3aa2c6b3630ccc files/digest-fvwm-2.5.10-r6 129
+MD5 2a5b6dde57161daa48ec5946e78554d7 files/fvwm-2.5.10-fvwmbuttonshover.diff.gz 9994
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBcXmdHTu7gpaalycRAuhsAKDUJ45XS8pHstQI81x9LCdr7+YGlwCg5MYP
++ffV2yD20AinOnMW8CxEJrE=
+=bgYd
+-----END PGP SIGNATURE-----
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