summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-01-21 12:06:51 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-01-21 12:06:51 +0000
commitd29f10239b4bd568f7add2ccf2166515046032d3 (patch)
tree9d6c8da9c8cfc28e40df2f47b47028ae4c9a0174 /x11-misc/fxred
parentStable on hppa. See bug #119512. (diff)
downloadgentoo-2-d29f10239b4bd568f7add2ccf2166515046032d3.tar.gz
gentoo-2-d29f10239b4bd568f7add2ccf2166515046032d3.tar.bz2
gentoo-2-d29f10239b4bd568f7add2ccf2166515046032d3.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-misc/fxred')
-rw-r--r--x11-misc/fxred/ChangeLog8
-rw-r--r--x11-misc/fxred/files/digest-fxred-0.71
-rw-r--r--x11-misc/fxred/fxred-0.7.ebuild30
-rw-r--r--x11-misc/fxred/fxred-0.9.ebuild15
4 files changed, 18 insertions, 36 deletions
diff --git a/x11-misc/fxred/ChangeLog b/x11-misc/fxred/ChangeLog
index 2877ebc83b78..dffd5cc3f33c 100644
--- a/x11-misc/fxred/ChangeLog
+++ b/x11-misc/fxred/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/fxred
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/ChangeLog,v 1.10 2005/11/01 14:43:17 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/ChangeLog,v 1.11 2006/01/21 12:06:51 nelchael Exp $
+
+ 21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -fxred-0.7.ebuild,
+ fxred-0.9.ebuild:
+ Fixed DEPEND for modular X.
01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> fxred-0.7.ebuild,
fxred-0.9.ebuild:
diff --git a/x11-misc/fxred/files/digest-fxred-0.7 b/x11-misc/fxred/files/digest-fxred-0.7
deleted file mode 100644
index 1b89ec33696c..000000000000
--- a/x11-misc/fxred/files/digest-fxred-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c96b9ef277c6a5a4721fbbc9c24b29d fxred-0.7.tar.gz 55523
diff --git a/x11-misc/fxred/fxred-0.7.ebuild b/x11-misc/fxred/fxred-0.7.ebuild
deleted file mode 100644
index 56ddc02e8a29..000000000000
--- a/x11-misc/fxred/fxred-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/fxred-0.7.ebuild,v 1.7 2005/11/01 14:43:17 nelchael Exp $
-
-DESCRIPTION="FXred is handler for the red scroll button of the Logitech TrackMan Marble FX, a trackball."
-HOMEPAGE="http://www.larskrueger.homestead.com/files/index.html#X11"
-SRC_URI="http://www.larskrueger.homestead.com/files/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_compile() {
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man || die "./configure failed"
- emake || die
-}
-
-src_install () {
- make DESTDIR=${D} install || die
- dodoc AUTHORS ChangeLog README TODO
- dohtml fxred/docs/en/*.html
- insinto /etc
- doins fxredrc
-}
diff --git a/x11-misc/fxred/fxred-0.9.ebuild b/x11-misc/fxred/fxred-0.9.ebuild
index df8807534cd6..d315ac0f91c7 100644
--- a/x11-misc/fxred/fxred-0.9.ebuild
+++ b/x11-misc/fxred/fxred-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/fxred-0.9.ebuild,v 1.6 2005/11/01 14:43:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/fxred-0.9.ebuild,v 1.7 2006/01/21 12:06:51 nelchael Exp $
DESCRIPTION="FXred is handler for the red scroll button of the Logitech TrackMan Marble FX, a trackball."
HOMEPAGE="http://www.larskrueger.homestead.com/files/index.html#X11"
@@ -10,7 +10,16 @@ SLOT="0"
KEYWORDS="~ppc x86"
IUSE=""
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-libs/libXtst )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( (
+ x11-proto/xextproto
+ x11-proto/xproto
+ x11-libs/libXt )
+ virtual/x11 )"
src_compile() {
./configure \