Fix for installation Problem, #235388

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

4 files changed, 75 insertions, 10 deletions

diff --git a/dev-tcltk/tkXwin/ChangeLog b/dev-tcltk/tkXwin/ChangeLog
index cc422e1df1ef..c44d5b36f994 100644
--- a/dev-tcltk/tkXwin/ChangeLog
+++ b/dev-tcltk/tkXwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkXwin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/ChangeLog,v 1.20 2009/08/31 01:50:07 mescalinum Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/ChangeLog,v 1.21 2010/12/07 17:20:59 jlec Exp $
+
+*tkXwin-1.0-r2 (07 Dec 2010)
+
+  07 Dec 2010; Justin Lecher <jlec@gentoo.org> +files/1.0-configure.patch,
+  tkXwin-1.0-r1.ebuild, +tkXwin-1.0-r2.ebuild:
+  Fix for installation Problem, #235388
 
   31 Aug 2009; Federico Ferri <mescalinum@gentoo.org> -tkXwin-1.0.ebuild:
   removed old tkXwin-1.0.ebuild
diff --git a/dev-tcltk/tkXwin/files/1.0-configure.patch b/dev-tcltk/tkXwin/files/1.0-configure.patch
new file mode 100644
index 000000000000..3a0affc6cd68
--- /dev/null
+++ b/dev-tcltk/tkXwin/files/1.0-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index d92a1bf..6d75569 100755
+--- a/configure
++++ b/configure
+@@ -3534,7 +3534,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 cb5f092f1df9..7f56798340f7 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-2009 Gentoo Foundation
+# Copyright 1999-2010 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.11 2009/08/29 18:17:41 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild,v 1.12 2010/12/07 17:21:00 jlec Exp $
 
 inherit eutils
 
@@ -16,20 +16,21 @@ DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3
 	x11-proto/scrnsaverproto
 	x11-proto/xextproto"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-Makefile.in.diff
-	epatch ${FILESDIR}/${PV}-configure.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-Makefile.in.diff
+	epatch "${FILESDIR}"/${PV}-configure.diff
 }
 
 src_compile() {
-	econf --with-tcl=/usr/$(get_libdir) --with-tk=/usr/$(get_libdir) || die
+	econf --with-tcl=/usr/$(get_libdir) --with-tk=/usr/$(get_libdir)
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS INSTALL README
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS INSTALL README || die
 }
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild
new file mode 100644
index 000000000000..b3eae2d735f7
--- /dev/null
+++ b/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 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.1 2010/12/07 17:20:57 jlec Exp $
+
+EAPI="3"
+
+inherit eutils 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"
+
+IUSE="debug threads"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	dev-lang/tk[threads?]
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-Makefile.in.diff \
+		"${FILESDIR}"/${PV}-configure.patch
+	tc-export CC
+}
+
+src_configure() {
+	econf \
+		--with-tcl=/usr/$(get_libdir) \
+		--with-tk=/usr/$(get_libdir) \
+		--enable-gcc \
+		--with-x \
+		--enable-shared \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die
+	dodoc AUTHORS INSTALL README || die
+}