summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-05-10 11:53:56 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-05-10 11:53:56 +0000
commite47fd3fa4a48d418b376e6a364df1263ec401615 (patch)
treeffa9b5c5bdd3d3267cac6d172ebe3fc9716806d3 /app-laptop
parentFixed sqlite deps, removed src_unpack. Thanks to Betelgeuse. (diff)
downloadgentoo-2-e47fd3fa4a48d418b376e6a364df1263ec401615.tar.gz
gentoo-2-e47fd3fa4a48d418b376e6a364df1263ec401615.tar.bz2
gentoo-2-e47fd3fa4a48d418b376e6a364df1263ec401615.zip
Handle X/gtk useflags correctly. Fix compiling bug 163542
(Portage version: 2.1.2.5)
Diffstat (limited to 'app-laptop')
-rw-r--r--app-laptop/toshiba-utils/ChangeLog6
-rw-r--r--app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild16
2 files changed, 16 insertions, 6 deletions
diff --git a/app-laptop/toshiba-utils/ChangeLog b/app-laptop/toshiba-utils/ChangeLog
index 40ce4cbdfe41..4868d58828d8 100644
--- a/app-laptop/toshiba-utils/ChangeLog
+++ b/app-laptop/toshiba-utils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-laptop/toshiba-utils
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/ChangeLog,v 1.11 2007/05/09 17:54:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/ChangeLog,v 1.12 2007/05/10 11:53:56 genstef Exp $
+
+ 10 May 2007; Stefan Schweizer <genstef@gentoo.org>
+ toshiba-utils-2.0.1-r2.ebuild:
+ Handle X/gtk useflags correctly. Fix compiling bug 163542
09 May 2007; Stefan Schweizer <genstef@gentoo.org>
toshiba-utils-2.0.1-r2.ebuild:
diff --git a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild
index 82675ede274d..27ef52301a53 100644
--- a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild
+++ b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.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/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild,v 1.3 2007/05/09 17:54:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild,v 1.4 2007/05/10 11:53:56 genstef Exp $
inherit eutils autotools
@@ -12,12 +12,18 @@ SRC_URI="http://www.buzzard.org.uk/toshiba/downloads/toshutils-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-ppc ~x86"
-IUSE="X"
+IUSE="gtk X"
-DEPEND="=x11-libs/gtk+-1*"
+DEPEND="gtk? ( =x11-libs/gtk+-1* )
+ X? ( x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm )"
+RDEPEND="${DEPEND}"
src_unpack() {
unpack ${A} ; cd ${S}
+ sed -i -e "s:asm/io.h:sys/io.h:" src/hotkey.c
+
rm -f config.{cache,log,status} src/*.o
sed -i -e "s:-m486 -O2::" \
@@ -27,13 +33,13 @@ src_unpack() {
src/Makefile.in \
|| die "sed failed"
epatch ${FILESDIR}/${P}-arg-fix.diff
- use X || epatch ${FILESDIR}/${P}-gentoo.diff
+ use gtk || epatch ${FILESDIR}/${P}-gentoo.diff
eautoconf || die "autoconf failed"
}
src_compile() {
econf \
- $(use_with X) \
+ $(use_with X x) \
|| die "econf failed"
make depend || die "make depend failed"
make -C src || die "make src failed"