Added AT ago requested changes, #/etc/pam.d/gdm; correct handling of static-libs and .la files; added missing X deps

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

4 files changed, 23 insertions, 13 deletions

diff --git a/dev-tcltk/tkXwin/ChangeLog b/dev-tcltk/tkXwin/ChangeLog
index c44d5b36f994..34b310d40cce 100644
--- a/dev-tcltk/tkXwin/ChangeLog
+++ b/dev-tcltk/tkXwin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/tkXwin
-# 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 $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/ChangeLog,v 1.22 2011/11/26 11:22:04 jlec Exp $
+
+  26 Nov 2011; Justin Lecher <jlec@gentoo.org> tkXwin-1.0-r1.ebuild,
+  tkXwin-1.0-r2.ebuild, metadata.xml:
+  Added AT ago requested changes, #/etc/pam.d/gdm; correct handling of
+  static-libs and .la files; added missing X deps
 
 *tkXwin-1.0-r2 (07 Dec 2010)
 
diff --git a/dev-tcltk/tkXwin/metadata.xml b/dev-tcltk/tkXwin/metadata.xml
index d9408d8ab078..815cc916f2b6 100644
--- a/dev-tcltk/tkXwin/metadata.xml
+++ b/dev-tcltk/tkXwin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+	<herd>tcltk</herd>
 </pkgmetadata>
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild
index 7f56798340f7..f181639a62e0 100644
--- a/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild
+++ b/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.12 2010/12/07 17:21:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild,v 1.13 2011/11/26 11:22:04 jlec Exp $
 
 inherit eutils
 
-DESCRIPTION="Tcl/Tk library to detect idle periods of an X session."
+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=""
+
 LICENSE="BSD"
 SLOT="0"
+IUSE=""
 KEYWORDS="alpha amd64 ppc sparc x86"
 
-DEPEND=">=dev-lang/tcl-8.3.3
-	>=dev-lang/tk-8.3.3
+DEPEND="
+	dev-lang/tk
 	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 b3eae2d735f7..9bb4a4bc2700 100644
--- a/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild
+++ b/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r2.ebuild,v 1.2 2011/11/26 11:22:04 jlec Exp $
 
 EAPI="3"
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Tcl/Tk library to detect idle periods of an X session."
+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"
+IUSE="debug static-libs threads"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="
 	dev-lang/tk[threads?]
+	x11-libs/libX11
+	x11-libs/libXext
 	x11-proto/scrnsaverproto
 	x11-proto/xextproto"
 RDEPEND="${DEPEND}"
@@ -35,6 +37,7 @@ src_configure() {
 		--enable-gcc \
 		--with-x \
 		--enable-shared \
+		$(use_enable static-libs static) \
 		$(use_enable threads) \
 		$(use_enable debug symbols)
 }
@@ -42,4 +45,5 @@ src_configure() {
 src_install() {
 	emake DESTDIR=${D} install || die
 	dodoc AUTHORS INSTALL README || die
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
 }