Reintroduced USE=X again on request of aballier

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 50 insertions, 26 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 7820975d0c6e..9d02aec9ac0b 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.70 2010/04/17 13:40:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.71 2010/04/23 10:44:12 jlec Exp $
+
+  23 Apr 2010; Justin Lecher <jlec@gentoo.org> expect-5.43.0-r1.ebuild,
+  expect-5.44.1.15.ebuild:
+  Reintroduced USE=X again on request of aballier
 
   17 Apr 2010; Justin Lecher <jlec@gentoo.org> expect-5.43.0-r1.ebuild,
   expect-5.44.1.15.ebuild:
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index ca3d465fbe57..36ebbf8b2ff6 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -15,15 +15,15 @@ DIST expect-5.43.0.tar.gz 525572 RMD160 2cc91f5bd42c7429550747c590085edb9a517a59
 DIST expect-5.44.1.15.tar.bz2 547655 RMD160 e992c650f546cc5fedaebc5f9617893a9f0905a9 SHA1 946c3591d16c216f409882f294378fc53e4f6c0a SHA256 c8565b869d67389995684b60553685168dd40135aa50022bd759f2d5e757d6f1
 EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 37e2632986cfa482437551c2e8842fa773505d66 SHA1 21a51490a22cbcaac3ff158159af9583d34082e1 SHA256 e3315c6b5fd88d502bc53c735ca654308084a3cd4d0ba814b197f92ff4229183
 EBUILD expect-5.42.1-r2.ebuild 3182 RMD160 15ba15d1cf65267408c690390e8139576dc71509 SHA1 cce29a75c72bb943f3d55f2715c7eb1baffcbc4b SHA256 f9b02c01b8473854790f4f153ddf48b9ed63db4b3d76145001eda1c99e658553
-EBUILD expect-5.43.0-r1.ebuild 3521 RMD160 2881192177cac2d57736f3186066fc305cda65a0 SHA1 bbaa2523813287c29774a5d60a53774fef725b4d SHA256 f0b952e177624739d4a6b27142e74fbbf9cb95bfda43ee7c46a8545b748ed537
+EBUILD expect-5.43.0-r1.ebuild 3820 RMD160 49a753c043884ebebe8018b964de122f111f7d78 SHA1 8bd6235c2e20d34664973bc4aec95f567f8d29c7 SHA256 de5dcecfa85e53ae9166711673bfba1bf308439b523e49faf7baae279fe1f25a
 EBUILD expect-5.43.0.ebuild 3539 RMD160 9b361ac2065c322c017271b7931c4c809bdcd9db SHA1 5d8a4211466e0d49d777afb1e11a5f305787788f SHA256 b68fcde292800697bb761562efc4682ac6fa8c77b6a807f639bbf404a9d3bac9
-EBUILD expect-5.44.1.15.ebuild 2766 RMD160 617ab72f45404fdb4acb309cc5afecb2cfcd7d7b SHA1 566a9bf94981a19af806bf3126930ea2e80ffbc1 SHA256 2406e52c9e8ef2b06e8217b4f9202ec4f126fad1bfcd0df1188f6d4599ae7a6f
-MISC ChangeLog 10009 RMD160 5be285747fde1c1592536a497d22c1b98a6ce3cd SHA1 31f636c7f761f945327b2702184e3d52097a9505 SHA256 af50740a725537aaf553d11b01902a602d52c936c813cbb5eaa737216485ecb9
+EBUILD expect-5.44.1.15.ebuild 3142 RMD160 74ede70c795bb44c768089f2eb00a11cb32bbfed SHA1 0e5c9e828aed4879feed9845274f94ff22f24858 SHA256 35c6cd17e464f5d9434cb23335ad165acbe9f6a000b2b6129b11960107f7df67
+MISC ChangeLog 10159 RMD160 ddff7142eb69ba7cf637196bbf8bc26438e4e167 SHA1 c21ba79746c333dd1feafa13e587e1d54f923766 SHA256 dad180bbb5abfbfd173b8315b21ca450605dfe65c81ab9ed6b51e1b8d1572898
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvJuloACgkQgAnW8HDreRanWACgzsU6AeTlQTHst9KB6IfChHuI
-Fy8AoMPBHrixRNjXurcvoDx+ED/2fvK4
-=NFqA
+iEYEARECAAYFAkvRegIACgkQgAnW8HDreRbIjgCgn9n4GTt3OWnHU4gXmKeofpyb
++GwAn1JlFfLXIL+f8HcAt5Vqn+EMuK4q
+=vlXj
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.43.0-r1.ebuild b/dev-tcltk/expect/expect-5.43.0-r1.ebuild
index 66e2f54523c5..3494353aaf2b 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.2 2010/04/17 13:40:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v 1.3 2010/04/23 10:44:12 jlec Exp $
 
 EAPI="3"
 
@@ -14,11 +14,12 @@ 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="doc"
+IUSE="doc X"
 
 # We need dejagnu for src_test, but dejagnu needs expect
 # to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tk-8.2"
+DEPEND=">=dev-lang/tcl-8.2
+	X? ( >=dev-lang/tk-8.2 )"
 RDEPEND="${DEPEND}"
 
 NON_MICRO_V=${PN}-$(get_version_component_range 1-2)
@@ -61,13 +62,20 @@ src_prepare() {
 src_configure() {
 	local myconf
 	local tcl_version
-	tcl_version="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
+	tcl_version="$(best_version dev-lang/tcl | cut -d- -f3 | cut -d. -f1,2)"
 	TCL_HDIR="${EPREFIX}/usr/$(get_libdir)/tcl${tcl_version}/include"
-
 	#configure needs to find the file tclConfig.sh is
 	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${TCL_HDIR}"
 
-	myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir)"
+	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=/usr/$(get_libdir)"
+	else
+		#configure knows that tk depends on X so just disable X
+		myconf="$myconf --without-x"
+	fi
 
 	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 f5d1ff702a97..f8a8e0daf74e 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.3 2010/04/17 13:40:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.4 2010/04/23 10:44:12 jlec Exp $
 
 EAPI="3"
 
@@ -14,11 +14,12 @@ 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="doc"
+IUSE="debug doc threads X"
 
 # We need dejagnu for src_test, but dejagnu needs expect
 # to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tk-8.2"
+DEPEND=">=dev-lang/tcl-8.2[threads?]
+	X? ( >=dev-lang/tk-8.2[threads?] )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -49,14 +50,25 @@ src_configure() {
 	# version number.
 	tclv=$(grep TCL_VER ${EPREFIX}/usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
 	#tkv isn't really needed, included for symmetry and the future
-	#tkv=$(grep	 TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-
-	#configure needs to find the files tclConfig.sh and tclInt.h
+	#tkv=$(grep	 TK_VER ${EPREFIX}/usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
 	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/tcl${tclv}/include/generic"
 
-	myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
-
-	econf $myconf --enable-shared || die "econf failed"
+#	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
+
+	econf \
+		$myconf \
+		--enable-shared \
+		$(use_enable threads) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols)
 }
 
 src_test() {
@@ -76,11 +88,11 @@ src_install() {
 	if use doc ; then
 		docinto examples
 		local scripts=$(make -qp | \
-						sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
-		exeinto /usr/share/doc/${PF}/examples
-		doexe ${scripts}
+			sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
+		insinto /usr/share/doc/${PF}/examples
+		doins ${scripts} || die
 		local scripts_manpages=$(make -qp | \
-			   sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
+		       sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
 		for m in ${scripts_manpages}; do
 			dodoc example/${m}.man
 		done