Added an xscreensaver flag to avoid automagic

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 0f3629de2647d2d25935b81c544a4e7f383b3dd0..cae6bbb5b55a276b635388b522bf43368825c61a 100644 (file)
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.135 2010/06/16 07:42:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.136 2010/07/08 19:06:34 bicatali Exp $
+
+  08 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> tk-8.5.8-r1.ebuild:
+  Added an xscreensaver flag to avoid automagic
 
   16 Jun 2010; Justin Lecher <jlec@gentoo.org> tk-8.5.8-r1.ebuild:
   Compile in src_compile, fix for 324201

diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index c653393a834f656770765b873c5d77cff25264ef..deb506d4a02918afd6e8ecd6178f9f363c5adb24 100644 (file)
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -21,14 +21,14 @@ EBUILD tk-8.4.18.ebuild 3184 RMD160 3ff8c49bdf6772738d4ef291b960be458c5efa14 SHA
 EBUILD tk-8.4.19-r1.ebuild 3274 RMD160 c95f1671405984decf0036c14fcdb13dfc79a0d6 SHA1 592f5a98aa235b49500fae2372d81d96f093f3c9 SHA256 1845870b1bb5e2ade5c13d6f984f03bd5dc1d72d4e0aab32e497ec5e4926d13e
 EBUILD tk-8.5.7-r1.ebuild 2880 RMD160 445ae6825eb80c09dade8b9eb834697662be1ab1 SHA1 89ec94ed94dbd33245b451c319beeb0037878afd SHA256 efd70fe2b92b24ce91ccc8b03e99f20dc830f8ebe7bf4a2bbd6836de8eb24e15
 EBUILD tk-8.5.7.ebuild 2788 RMD160 33d13d8ecaf787790b88542ca6c8f3d33cea2e87 SHA1 026b94312e94938f8669158d20425e440f9d2947 SHA256 3e94c5b87a44b0e30f0966c6b63e3fcdd8656d76042270387656732dd98b2bd7
-EBUILD tk-8.5.8-r1.ebuild 3342 RMD160 45716b47db93473f0438f4f43c4187d9e69a01fc SHA1 2e97271cf49ecf02a13871f38787080517a8bbc6 SHA256 6302b9fccf2a9f685bf5513867bd9f19ba837c093ba72fd05c109d6067a6a2e0
+EBUILD tk-8.5.8-r1.ebuild 3141 RMD160 eb00073b2842e38e5eec454dd83a3a0e724e4a2b SHA1 e8850e9586182e6973174eb40c2ec747230ffece SHA256 5108459dbfdb407aa1e2f06dc263a7100ac2b70fdac6153f6e5c7a24769302ef
 EBUILD tk-8.5.8.ebuild 2877 RMD160 7f84e6f65afe403e9ee6aea3a5fd629172e42603 SHA1 7f564ffe4fcafc6d9888f9b33f55d53776c90913 SHA256 f60916dab64ec2208209934e44b0ed23b5e1599ae930f50e197432a5c03b54bf
-MISC ChangeLog 18214 RMD160 c2adab7be4caf83751aaea19d90e540fe2c0f964 SHA1 6fb4b467cc39f9bc19bc0a181f33b6312108eba4 SHA256 1498940ac7f5c9679a47baa4d23ec8e357bb04e89bf7f1bf9243de06c626c499
+MISC ChangeLog 18342 RMD160 c7d5be8b56b51c5e2fbd31e28245406f1be37eef SHA1 2ddbbce508f85e0083e1c2bf444975b5f1734910 SHA256 5bd64c683e7b5de8efc6e5987124e350981a7f8937058f7c4a0a40bf4aaaea71
 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwYgHAACgkQgAnW8HDreRYh9ACeJgJPoRKZIx6IUK7+4ECnIxWV
-Y84An2ddilQflNC7AGrwOS3EJrGcJJiO
-=soWW
+iEYEARECAAYFAkw2Ie8ACgkQ1ycZbhPLE2CMmACff2B95nQlxs+P/WAYqdzuT9f5
+r+4An3jVilgKeSfrUUGqG96vY/KVJaoO
+=EvP1
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/tk/tk-8.5.8-r1.ebuild b/dev-lang/tk/tk-8.5.8-r1.ebuild
index 26613aff4f9527aa823087af0d667b39703594af..17f1c9d034a4c7b18aa980d653c0080aa0484066 100644 (file)
--- a/dev-lang/tk/tk-8.5.8-r1.ebuild
+++ b/dev-lang/tk/tk-8.5.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.8-r1.ebuild,v 1.3 2010/06/16 07:42:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.8-r1.ebuild,v 1.4 2010/07/08 19:06:34 bicatali Exp $
 
 EAPI="3"
 
@@ -14,31 +14,19 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua"
+IUSE="debug threads truetype aqua xscreensaver"
 
-RDEPEND="!aqua? ( x11-libs/libX11 )
+RDEPEND="!aqua? (
+               x11-libs/libX11
+               x11-libs/libXt
+               truetype? ( x11-libs/libXft )
+               xscreensaver? ( x11-libs/libXScrnSaver ) )
        ~dev-lang/tcl-${PV}"
 DEPEND="${RDEPEND}
-       !aqua? (
-       truetype? ( x11-libs/libXft )
-       x11-libs/libXt
-       x11-proto/xproto
-       )"
+       !aqua? ( x11-proto/xproto )"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-       if use threads ; then
-               ewarn ""
-               ewarn "PLEASE NOTE: You are compiling ${P} with"
-               ewarn "threading enabled."
-               ewarn "Threading is not supported by all applications"
-               ewarn "that compile against tcl. You use threading at"
-               ewarn "your own discretion."
-               ewarn ""
-       fi
-}
-
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
 
@@ -63,7 +51,8 @@ src_configure() {
                $(use_enable threads) \
                $(use_enable aqua) \
                $(use_enable truetype xft) \
-               $(use_enable debug symbols) || die
+               $(use_enable xscreensaver xss) \
+               $(use_enable debug symbols)
 }
 
 src_compile() {