dev-tcltk/tkXwin: Add missing dep on x11-libs/libXScrnSaver, #438308; respect CFLAGS, #438310

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

6 files changed, 170 insertions, 6 deletions

diff --git a/dev-tcltk/tkXwin/ChangeLog b/dev-tcltk/tkXwin/ChangeLog
index 0ce68ba77063..df71d7a5a88a 100644
--- a/dev-tcltk/tkXwin/ChangeLog
+++ b/dev-tcltk/tkXwin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/tkXwin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/ChangeLog,v 1.26 2012/06/07 20:43:26 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/ChangeLog,v 1.27 2012/10/14 11:28:52 jlec Exp $
+
+*tkXwin-1.0-r3 (14 Oct 2012)
+
+  14 Oct 2012; Justin Lecher <jlec@gentoo.org> tkXwin-1.0-r1.ebuild,
+  tkXwin-1.0-r2.ebuild, +tkXwin-1.0-r3.ebuild,
+  +files/tkXwin-1.0-configure.patch:
+  Add missing dep on x11-libs/libXScrnSaver, #438308; respect CFLAGS, #438310
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> tkXwin-1.0-r1.ebuild,
   tkXwin-1.0-r2.ebuild:
diff --git a/dev-tcltk/tkXwin/Manifest b/dev-tcltk/tkXwin/Manifest
index ae96076b17a6..69a1d8ac55ca 100644
--- a/dev-tcltk/tkXwin/Manifest
+++ b/dev-tcltk/tkXwin/Manifest
@@ -1,8 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.0-Makefile.in.diff 796 SHA256 a72626c055365de8b7e41c54436ddca5d805ca7f96cc62c9f015ac36989b6455 SHA512 12dfd890912242624ff3801cd92f414525e7ddf74e373e2287529f2d84d90a68dc2ab7dcd69cdd22c7e33d9df2c5499e2db7beed3b74e8167a43ee3b1d814267 WHIRLPOOL 593ce9fd2b1ea9d5f28644aa24fca755a08ca4f4fd7b3e682f4b4fcd922d36b01d1e898752ef3f99b0d91e1f4963968737c08c277690e41e906a01bafeaf979d
 AUX 1.0-configure.diff 299 SHA256 f15f503ea298ee7a85d096edf0d41917f76de429bed2c21cd04b8df9175032a2 SHA512 d4e12a2de0fad5b9c9b7e673b2c713d7ca2ad5ff29c11c0b67d1e10d82460a9d5a0e63ab45b8734815c32d7cb6945b7eeac945235b1637e472fe697a6dfc3db0 WHIRLPOOL 0304e6ae75e95cfecced478327b0b4b069e21098f14732fb19a5ac4282a5b4718edbe9b885c411570f8de53b47e17922c1edc3435f3e9466c4dd176ce8e1909d
 AUX 1.0-configure.patch 200 SHA256 17c0f477382988d01cd10b8f19a0ab193952ed1a5556e27fd24beff6d89753ad SHA512 9040f69ece04d1c54b3f96c37f9210ded44406c680f4244728e1f83552ad597d15e3ec856db8c5304b73b3f3e39f98536ebf1f952ef60b8a216261da6a700da8 WHIRLPOOL d7ed55579355f2cb1223ffe3d5edb671f1416bf7f24cb75add8367a1efb82217e569b5a3688ae754af8f21194df08b0ad8c20cb00b76603f2163d1dae3179c10
+AUX tkXwin-1.0-configure.patch 2262 SHA256 1d461f12200da5ebcea38854ead641f9be4ab700fd62603a27b78065c9eb735b SHA512 1c2ba4e9ecc0781a47e3523b387ed2bee91bf6f255564bfd9af60ab8faf3a4759d848ae5b6cdc612068fee3582413a8e7f792f04c5126578eea92ef8db01a72d WHIRLPOOL 356c31d5bfe6c3605c9c7088a4e7981a441fd5c987fac27c6d7cdd65fbd6546a3b0fa8331d1411f1e304061d1d46d4b2368d287cb05f96fedf1c21ac1de90d9f
 DIST tkXwin-1.0.tgz 168650 SHA256 4390cd165c584162dccf8414d2f4f27bf4dd3b2ad1e66fbe280ee390475fb3c0 SHA512 0313ec6fc81c872019a7e247fcaac899d5d584eb8066e7abf1d1feff7bc741de43a9b8a6212ed6dcd12566e8c995bc658360833c692eea5f1b4b5fc199cf2d6e WHIRLPOOL 375b086509295aa93a5da15f285c3aa2e8336e9c619aabc974910bd52c47ffbec47543be488067b29f433fde4ffe1b854ec638216b61b40388fb7b158a367873
-EBUILD tkXwin-1.0-r1.ebuild 899 SHA256 ea8b24c7e19fe62467aa3d924f6b9092c86dd63652724009b060d61fd03b4ea3 SHA512 2448283fac76a6b407a40e0dbbb4c3e4ded1985f62e4f9758c11e8d7c99b13fda09c5e6c74e83956f39ade0d79f3b338320c8504025cd809c3b48ee1d73dedf4 WHIRLPOOL 053b283aeac8cfe716fa305415c3340d90a10dbf5a38ac6ff65f05b47490f8a8d2629a0c48677f476925324bbaba3e616e7b0aa27892588128ae4dc5b87193c9
-EBUILD tkXwin-1.0-r2.ebuild 1188 SHA256 e6bec23de7f9fe9b9b51af58dfd57d5d2bf23cae0a072a1ad8a523515f840b39 SHA512 8ca1a57b3cf481fee76111fa5c6f75380511fdbaf7f4bb52e542301add6e32a531152a8b3d45f6b270709be7e122e5c6069fc5e421248ccc6cc82bf06bf59b83 WHIRLPOOL a5956414fc94a956b478da92d3c18dda10cb6cc944ee5182f94e4ca2fa4c9ed0a161f4659335914402daea656ff45a450d15fd5be39baea6c13fc83a483dbb7c
-MISC ChangeLog 2948 SHA256 ec148329c7937fed7277a392863d45d142765dff135a388b16a7ca2c69feccfc SHA512 420c61004d2522a08ada9ca728384d49646af0a9485d7f2ae54d344d051856a5994a622c9d2ed9342c343f1fc41cde7e3f0c190721eef6a575c2b7a61b953ada WHIRLPOOL 0dcf35c8ce9fbb750b2c6633775de5c8f48470c0f824b24c33f3264fc8a56523d917e2472888731380c6fac002b5183bed526e2eb40d12b252b92a713bff17b2
+EBUILD tkXwin-1.0-r1.ebuild 920 SHA256 cc1bf03e3ff7cdebb6339f380aa71bd74a7914aad3f4ddd4fc21fa18d2833f13 SHA512 59b687e950ff658541d2d98e6271abe16f0db08b7cd09552e8018620885cb4f2fa6a6301b798b8f5733b8c67c0c9ea1db334fa0779849ada07e5ee6f697bae2c WHIRLPOOL fb6406d4f6c9ab34849efde9e5a71592a13c9f3f29634a4c8bba5376612a8f419a011ec4c31df59cb5182d23bb7b0d2654379c90cb28831ae0ae84389b3d6ab2
+EBUILD tkXwin-1.0-r2.ebuild 1208 SHA256 d528f30fb78e11fcb971e4149f21b2a4d41220d81e070343586ee0769838bde7 SHA512 cfce2f0e887fe5b44bfce079d02731f06d6760cc61a460529c56b1a2846a88ebbf55ff7b0525af9db93cb441d649d6c59ba023d670b4f911b0efb1346a4b1a33 WHIRLPOOL 71c87aaf364ac68843e29e989bbf233c2919322ccb44dad0c97eddd6490cf99794d9fa4634cadccb347eca11b4922d78a29715457a3670c2279cb02a4e8b1465
+EBUILD tkXwin-1.0-r3.ebuild 1130 SHA256 debce730c12ebb37e50079473ac879d82a7b23f954c34126471263a5a6f0d60c SHA512 f34c5fab72f6c3e147003ae5f57e7e0a1dcf75645fe0df1be773d2b1809797f02bec1a86f43e0b7154b91f3f6a6b403d6e9897c01b7a626cdb2ad2bedb48944f WHIRLPOOL bbe2aaf899fec69cd364ecd59fb7604b026a944e3f422abe3d7a26b5ffe0de10e78252d77c26354e589f984a0d30776c0e2ab378613495f39b32f2dc56508e0a
+MISC ChangeLog 3207 SHA256 ca668dce262e2cc6bc0820258473502c2c1a05e66d84198caf70b7d50df57932 SHA512 8765b4a602140c649b6aca722911920db8721272e3b389bb01913dab82da9c66c008d157ba1a53fc4f4b8606217f0ab99fb71d44f195df4bcace3de3505f96d3 WHIRLPOOL 79e4950c6463c0b4a84138a523c890b2d0d3ef90e06f86eb25e11230b68217ce55577f6d53d98251e5927b9c74810a2f18ddf70452d88c049a1c42d890220948
 MISC metadata.xml 159 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029 SHA512 7072291f336a01c6b6b0da289ab72b58c47062f94a06fed23a4982b776b5711df68662a3d8ff3a6954e2699817bda9780e01920056e29164944ead4d0fe815b6 WHIRLPOOL cb245ca2202ce7a680a703d76cf8dcb11e7627fddcc3c0bd9127855263f0e3d48db44511c2257ae793a0cb1d4a7764ffba5ceb992ff1a351d8f8a7ab96307683
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlB6ofcACgkQgAnW8HDreRZF6QCfYD2OnG1qPf1fIdnF924ffaQD
+evsAoNLvNIfMh0Pa7IBGUMCxuju6MOIf
+=IYij
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch b/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch
new file mode 100644
index 000000000000..ac2f84b97f21
--- /dev/null
+++ b/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch
@@ -0,0 +1,93 @@
+ configure | 43 +++----------------------------------------
+ 1 file changed, 3 insertions(+), 40 deletions(-)
+
+diff --git a/configure b/configure
+index d92a1bf..d8605a0 100755
+--- a/configure
++++ b/configure
+@@ -823,7 +823,6 @@ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+-CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+ echo "configure:829: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+@@ -839,23 +838,6 @@ rm -f conftest*
+ 
+ fi
+ 
+-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-
+ # Check whether --enable-static or --disable-static was given.
+ if test "${enable_static+set}" = set; then
+   enableval="$enable_static"
+@@ -2078,7 +2060,6 @@ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+-CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+ echo "configure:2084: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+@@ -2094,24 +2075,6 @@ rm -f conftest*
+ 
+ fi
+ 
+-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-
+-
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -3403,9 +3366,9 @@ fi
+ 
+ 
+ if test "${SHARED_BUILD}" = "1" ; then
+-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
++    CFLAGS+=' ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
+ else
+-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
++    CFLAGS+=' ${CFLAGS_WARNING}'
+ fi
+ 
+ #--------------------------------------------------------------------
+@@ -3534,7 +3497,7 @@ fi
+     
+ 
+ 
+-PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin
++PKG_TCL=${libdir}/tkXwin
+ 
+ 
+ 
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild
index 770a40b1bd63..af2133797de2 100644
--- a/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild
+++ b/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild,v 1.14 2012/06/07 20:43:26 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild,v 1.15 2012/10/14 11:28:52 jlec Exp $
 
 inherit eutils multilib
 
@@ -15,6 +15,7 @@ KEYWORDS="alpha amd64 ppc sparc x86"
 
 DEPEND="
 	dev-lang/tk
+	x11-libs/libXScrnSaver
 	x11-proto/scrnsaverproto
 	x11-proto/xextproto"
 RDEPEND="${DEPEND}"
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild
index 6d141d92557f..575a7861b5f8 100644
--- a/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild
+++ b/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild,v 1.6 2012/06/07 20:43:26 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild,v 1.7 2012/10/14 11:28:52 jlec Exp $
 
 EAPI="3"
 
@@ -17,6 +17,7 @@ KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 DEPEND="
 	dev-lang/tk[threads?]
+x11-libs/libXScrnSaver
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-proto/scrnsaverproto
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r3.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r3.ebuild
new file mode 100644
index 000000000000..cc9b93f35df9
--- /dev/null
+++ b/dev-tcltk/tkXwin/tkXwin-1.0-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r3.ebuild,v 1.1 2012/10/14 11:28:52 jlec Exp $
+
+EAPI=4
+
+inherit autotools-utils multilib toolchain-funcs
+
+DESCRIPTION="Tcl/Tk library to detect idle periods of an X session"
+HOMEPAGE="http://beepcore-tcl.sourceforge.net/"
+SRC_URI="http://beepcore-tcl.sourceforge.net/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug static-libs threads"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	dev-lang/tk[threads?]
+	x11-libs/libXScrnSaver
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+		"${FILESDIR}"/${PV}-Makefile.in.diff
+		"${FILESDIR}"/${P}-configure.patch
+	)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	tc-export CC
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		--with-tk="${EPREFIX}/usr/$(get_libdir)"
+		--enable-gcc
+		--with-x
+		$(use_enable threads)
+		$(use_enable debug symbols)
+	)
+	autotools-utils_src_configure
+}