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

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

5 files changed, 154 insertions, 3 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/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
+}