From: Steve Dibb <beandog@gentoo.org>
Date: Thu, 4 Jan 2007 14:04:25 +0000 (+0000)
Subject: Rekeywording ~amd64, adding missing deps, bug 152063
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=40365469489ab147ae8a64a0508b02eddb01ed59;p=gentoo.git

Rekeywording ~amd64, adding missing deps, bug 152063
Package-Manager: portage-2.1.1-r2
---

diff --git a/dev-tcltk/tkXwin/ChangeLog b/dev-tcltk/tkXwin/ChangeLog
index 2a145b239ad5..c2676ea72e4f 100644
--- a/dev-tcltk/tkXwin/ChangeLog
+++ b/dev-tcltk/tkXwin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tcltk/tkXwin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/ChangeLog,v 1.12 2007/01/03 03:31:45 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/ChangeLog,v 1.13 2007/01/04 14:04:25 beandog Exp $
+
+  04 Jan 2007; Steve Dibb <beandog@gentoo.org> tkXwin-1.0-r1.ebuild:
+  Rekeywording ~amd64, adding missing deps, bug 152063
 
   03 Jan 2007; Steve Dibb <beandog@gentoo.org> tkXwin-1.0-r1.ebuild:
   amd64 stable, bug 156217
diff --git a/dev-tcltk/tkXwin/Manifest b/dev-tcltk/tkXwin/Manifest
index 3f2c1e872ee8..31c40244f070 100644
--- a/dev-tcltk/tkXwin/Manifest
+++ b/dev-tcltk/tkXwin/Manifest
@@ -7,18 +7,18 @@ MD5 406f573b69ff8dfb154e6ad54fc7ff47 files/1.0-configure.diff 299
 RMD160 ffd145a13ba0db3b2f1a0e5a9c8f4b950386c4fc files/1.0-configure.diff 299
 SHA256 f15f503ea298ee7a85d096edf0d41917f76de429bed2c21cd04b8df9175032a2 files/1.0-configure.diff 299
 DIST tkXwin-1.0.tgz 168650 RMD160 f618e9a3c4b1bb7be4f230b9f7e80a0b18196e24 SHA1 81655b13af710e72916a3a23048414bbf55e0863 SHA256 4390cd165c584162dccf8414d2f4f27bf4dd3b2ad1e66fbe280ee390475fb3c0
-EBUILD tkXwin-1.0-r1.ebuild 845 RMD160 47639aa0e530fe71aeea280e14b00caf6551b323 SHA1 977f74658dd19cb55d780548b9a5b82d580eaf5b SHA256 77afa7b1f40dd26752c84165ab2b69e781bdf7b13cebf498bd74c2f121963b3b
-MD5 3d2fad29ec204df45a9cd9e1f1c19fe0 tkXwin-1.0-r1.ebuild 845
-RMD160 47639aa0e530fe71aeea280e14b00caf6551b323 tkXwin-1.0-r1.ebuild 845
-SHA256 77afa7b1f40dd26752c84165ab2b69e781bdf7b13cebf498bd74c2f121963b3b tkXwin-1.0-r1.ebuild 845
+EBUILD tkXwin-1.0-r1.ebuild 922 RMD160 f51a46c270121fe179f1a25829894e83109895c9 SHA1 de2e15f8ec58c02dc629df4e3c738f852c7d03ab SHA256 55946252f2f4c5d068562cca79b7a636fdc05fa1f5796ebac75cb61c1ebec19a
+MD5 35c6ca23561e3bae7456281427fbfc01 tkXwin-1.0-r1.ebuild 922
+RMD160 f51a46c270121fe179f1a25829894e83109895c9 tkXwin-1.0-r1.ebuild 922
+SHA256 55946252f2f4c5d068562cca79b7a636fdc05fa1f5796ebac75cb61c1ebec19a tkXwin-1.0-r1.ebuild 922
 EBUILD tkXwin-1.0.ebuild 777 RMD160 8b17a069c7ac3d0a50236c3a158680472f4082e0 SHA1 6c9f73260241fabbc80339263ad23558c4cdb52c SHA256 fa6b36a67edee3293ff2c46d6abf0c3e3e58892e1f6f0ec5f069dd4be12346b0
 MD5 d51dd710a67800d3186e3ba23dc368c7 tkXwin-1.0.ebuild 777
 RMD160 8b17a069c7ac3d0a50236c3a158680472f4082e0 tkXwin-1.0.ebuild 777
 SHA256 fa6b36a67edee3293ff2c46d6abf0c3e3e58892e1f6f0ec5f069dd4be12346b0 tkXwin-1.0.ebuild 777
-MISC ChangeLog 1211 RMD160 9011e630bd41d6e90923101e88aeeaa9ef50df9e SHA1 51c8c59e652693644f986512302a05b1e5bad304 SHA256 983ef72b4d35b867eddedce9a2edd216e3d41a3540b15c7b43777208e0aa8f27
-MD5 df4268bd2671539c074deafd6151f8e4 ChangeLog 1211
-RMD160 9011e630bd41d6e90923101e88aeeaa9ef50df9e ChangeLog 1211
-SHA256 983ef72b4d35b867eddedce9a2edd216e3d41a3540b15c7b43777208e0aa8f27 ChangeLog 1211
+MISC ChangeLog 1336 RMD160 16c1e72b19ebde0f5bab538a73bd955eaf405e1d SHA1 da9c7408a576e740bc782e207a4f4e4cf5209fd9 SHA256 d1b84afac75db8c837d3d940882de1bad2a2d53cb1171895b8eb43d7948ef10a
+MD5 e565a2482b68726e030b96c65a702299 ChangeLog 1336
+RMD160 16c1e72b19ebde0f5bab538a73bd955eaf405e1d ChangeLog 1336
+SHA256 d1b84afac75db8c837d3d940882de1bad2a2d53cb1171895b8eb43d7948ef10a ChangeLog 1336
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild
index b5709fa03670..29e53a7516ab 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-2007 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.3 2007/01/03 03:31:45 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkXwin/tkXwin-1.0-r1.ebuild,v 1.4 2007/01/04 14:04:25 beandog Exp $
 
 inherit eutils
 
@@ -10,10 +10,13 @@ SRC_URI="http://beepcore-tcl.sourceforge.net/${P}.tgz"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=">=dev-lang/tcl-8.3.3
-	>=dev-lang/tk-8.3.3"
+	>=dev-lang/tk-8.3.3
+	|| ( ( x11-proto/scrnsaverproto
+		x11-proto/xextproto ) <virtual/x11-7 )"
+
 
 src_unpack() {
 	unpack ${A}
@@ -24,7 +27,7 @@ src_unpack() {
 
 src_compile() {
 	econf --with-tcl=/usr/$(get_libdir) --with-tk=/usr/$(get_libdir) || die
-	make || die
+	emake || die
 }
 
 src_install() {