Remove USE=X support, as it isn't supported anymore, #315729

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 14 insertions, 29 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 0d08cd64ac21..7820975d0c6e 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.69 2010/04/16 12:07:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.70 2010/04/17 13:40:36 jlec Exp $
+
+  17 Apr 2010; Justin Lecher <jlec@gentoo.org> expect-5.43.0-r1.ebuild,
+  expect-5.44.1.15.ebuild:
+  Remove USE=X support, as it isn't supported anymore, #315729
 
 *expect-5.43.0-r1 (16 Apr 2010)
 
diff --git a/dev-tcltk/expect/expect-5.43.0-r1.ebuild b/dev-tcltk/expect/expect-5.43.0-r1.ebuild
index 5f1498a7e765..66e2f54523c5 100644
--- a/dev-tcltk/expect/expect-5.43.0-r1.ebuild
+++ b/dev-tcltk/expect/expect-5.43.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v 1.1 2010/04/16 12:07:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v 1.2 2010/04/17 13:40:36 jlec Exp $
 
 EAPI="3"
 
@@ -14,12 +14,11 @@ SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="X doc"
+IUSE="doc"
 
 # We need dejagnu for src_test, but dejagnu needs expect
 # to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
+DEPEND=">=dev-lang/tk-8.2"
 RDEPEND="${DEPEND}"
 
 NON_MICRO_V=${PN}-$(get_version_component_range 1-2)
@@ -29,7 +28,7 @@ src_prepare() {
 	# fix install_name on darwin
 	[[ ${CHOST} == *-darwin* ]] && \
 		epatch "${FILESDIR}"/${P}-darwin.patch
-epatch "${FILESDIR}"/"${P}"-multilib.patch
+	epatch "${FILESDIR}"/"${P}"-multilib.patch
 
 	#fix the rpath being set to /var/tmp/portage/...
 	epatch "${FILESDIR}"/expect-5.39.0-libdir.patch
@@ -68,15 +67,7 @@ src_configure() {
 	#configure needs to find the file tclConfig.sh is
 	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${TCL_HDIR}"
 
-	if use X ; then
-		#--with-x is enabled by default
-		#configure needs to find the file tkConfig.sh and tk.h
-		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
-		myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir)"
-	else
-		#configure knows that tk depends on X so just disable X
-		myconf="$myconf --without-x"
-	fi
+	myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir)"
 
 	econf $myconf --enable-shared
 }
diff --git a/dev-tcltk/expect/expect-5.44.1.15.ebuild b/dev-tcltk/expect/expect-5.44.1.15.ebuild
index b36f4ecb4a4d..f5d1ff702a97 100644
--- a/dev-tcltk/expect/expect-5.44.1.15.ebuild
+++ b/dev-tcltk/expect/expect-5.44.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.2 2010/04/12 20:21:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.3 2010/04/17 13:40:36 jlec Exp $
 
 EAPI="3"
 
@@ -14,13 +14,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="X doc"
+IUSE="doc"
 
 # We need dejagnu for src_test, but dejagnu needs expect
 # to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND="
-	>=dev-lang/tcl-8.2
-	>=dev-lang/tk-8.2"
+DEPEND=">=dev-lang/tk-8.2"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -56,15 +54,7 @@ src_configure() {
 	#configure needs to find the files tclConfig.sh and tclInt.h
 	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/tcl${tclv}/include/generic"
 
-	if use X ; then
-		#--with-x is enabled by default
-		#configure needs to find the file tkConfig.sh and tk.h
-		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
-		myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
-	else
-		#configure knows that tk depends on X so just disable X
-		myconf="$myconf --without-x"
-	fi
+	myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
 
 	econf $myconf --enable-shared || die "econf failed"
 }