summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-07-08 19:06:34 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-07-08 19:06:34 +0000
commit4e5542cbb6f480f5ab4db81895436d4dea3ec801 (patch)
tree9848e0d208099bf15afd59cf46feaafa799abf8d /dev-lang/tk
parentsparc stable wrt #318813 (diff)
downloadgentoo-2-4e5542cbb6f480f5ab4db81895436d4dea3ec801.tar.gz
gentoo-2-4e5542cbb6f480f5ab4db81895436d4dea3ec801.tar.bz2
gentoo-2-4e5542cbb6f480f5ab4db81895436d4dea3ec801.zip
Added an xscreensaver flag to avoid automagic
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/tk')
-rw-r--r--dev-lang/tk/ChangeLog5
-rw-r--r--dev-lang/tk/tk-8.5.8-r1.ebuild31
2 files changed, 14 insertions, 22 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 0f3629de2647..cae6bbb5b55a 100644
--- 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/tk-8.5.8-r1.ebuild b/dev-lang/tk/tk-8.5.8-r1.ebuild
index 26613aff4f95..17f1c9d034a4 100644
--- 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() {