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

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

5 files changed, 32 insertions, 22 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/Manifest b/dev-tcltk/tkXwin/Manifest
index be0ff58e6424..e761bef1962e 100644
--- a/dev-tcltk/tkXwin/Manifest
+++ b/dev-tcltk/tkXwin/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.0-Makefile.in.diff 796 RMD160 f9009e611a36c7c6b7aeb9c30b8b1805994dcf19 SHA1 b5a97adeb909f815573139b295d8ab712d3d76d7 SHA256 a72626c055365de8b7e41c54436ddca5d805ca7f96cc62c9f015ac36989b6455
 AUX 1.0-configure.diff 299 RMD160 ffd145a13ba0db3b2f1a0e5a9c8f4b950386c4fc SHA1 efcab359a8e13701eb0e979fa22f7ed96bebb2a4 SHA256 f15f503ea298ee7a85d096edf0d41917f76de429bed2c21cd04b8df9175032a2
 AUX 1.0-configure.patch 200 RMD160 e46e5eae55936d2dc356cfbb0e0b1d5c6c84716f SHA1 397d1838609477d52c5c09a3ba1c221781621811 SHA256 17c0f477382988d01cd10b8f19a0ab193952ed1a5556e27fd24beff6d89753ad
 DIST tkXwin-1.0.tgz 168650 RMD160 f618e9a3c4b1bb7be4f230b9f7e80a0b18196e24 SHA1 81655b13af710e72916a3a23048414bbf55e0863 SHA256 4390cd165c584162dccf8414d2f4f27bf4dd3b2ad1e66fbe280ee390475fb3c0
-EBUILD tkXwin-1.0-r1.ebuild 915 RMD160 ec2e50613c98de44139b6a788af3ec66b53df09f SHA1 44cef5a228af807ccad3c63ad21c7ecd30eeebb5 SHA256 7cb3ea00bbf8c42aeaaa648e4ae93c54d7cbf36cbb3a5e7592e435d992a00bd1
-EBUILD tkXwin-1.0-r2.ebuild 1036 RMD160 267bd2efeb81a7d85d0b79f56838748587c6a8df SHA1 4b6095463bcdaf04bffe6cb2d9d26b1e62df8425 SHA256 67bc1134b709bd4a6c509ff32076ab75c3dc884845b8475892dd44dbc462a89e
-MISC ChangeLog 2255 RMD160 91ab99cc3427e5b058f38ebb2a03dc0491e30ed4 SHA1 b6f1c3e555b0f3c0ba00877c35b40c163b8afc01 SHA256 3afae26241b73b4d25880ed1e13c64b1b73cf04e4e1fa9fe8439cb7a814e6fae
-MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+EBUILD tkXwin-1.0-r1.ebuild 887 RMD160 baa3e9276a87ff7db9709b6feaf65ce5dc72b2f8 SHA1 86974d9204bea47a4f430197cb713476b79ac77f SHA256 72e6e0689be11a251cd4df4c049d907a2422805e40562db3220e5144a972b286
+EBUILD tkXwin-1.0-r2.ebuild 1176 RMD160 349eda73ca20126c39ed0034cb23903d8f1a3052 SHA1 8d6f04795141dfa93961e8159b74ecdd9046a97d SHA256 d843af0697bc737faef79e934ff3753a6c3789b0c8558cdb1d371a07f6050e69
+MISC ChangeLog 2484 RMD160 54bac657a4f4b7c118147bb1a1b3cf0dcca14c4a SHA1 75b520c9a1d03a187ea244cf656f0114a4c35143 SHA256 8a29d26acdc0893f532a65c27674d9498264fd6e035ace35c714530370020228
+MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkz+bQMACgkQgAnW8HDreRZeuACgmy3FQMGv3ljQ5i3jfLVd29Js
-7dIAn1dVwA157I2QVUBhLrj0VvhiGW9d
-=v4R5
+iEYEAREKAAYFAk7Qy+YACgkQgAnW8HDreRb4CgCeOXRqu59Y+G4HXK11ob9UxsbH
+KQYAoJRqN71hPPVKl6zPKPvByx3rho4q
+=vr2l
 -----END PGP SIGNATURE-----
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
 }