summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Shakaryan <omp@gentoo.org>2006-10-21 22:24:31 +0000
committerDavid Shakaryan <omp@gentoo.org>2006-10-21 22:24:31 +0000
commit07eec655da0a0e7b0857fcbb777c663a570f6bc8 (patch)
tree9ccaf6409f0f8318dc5883fd32f695583cd79c42 /x11-misc/xfishtank
parentStable on Alpha + ia64. (diff)
downloadgentoo-2-07eec655da0a0e7b0857fcbb777c663a570f6bc8.tar.gz
gentoo-2-07eec655da0a0e7b0857fcbb777c663a570f6bc8.tar.bz2
gentoo-2-07eec655da0a0e7b0857fcbb777c663a570f6bc8.zip
Remove monolithic X from dependencies, fix quotes and other minor cleanup.
(Portage version: 2.1.2_pre3-r6)
Diffstat (limited to 'x11-misc/xfishtank')
-rw-r--r--x11-misc/xfishtank/ChangeLog5
-rw-r--r--x11-misc/xfishtank/xfishtank-2.1.ebuild31
2 files changed, 18 insertions, 18 deletions
diff --git a/x11-misc/xfishtank/ChangeLog b/x11-misc/xfishtank/ChangeLog
index 13216a56c3d4..ec686d9693bb 100644
--- a/x11-misc/xfishtank/ChangeLog
+++ b/x11-misc/xfishtank/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/xfishtank
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfishtank/ChangeLog,v 1.11 2006/04/14 16:02:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfishtank/ChangeLog,v 1.12 2006/10/21 22:24:31 omp Exp $
+
+ 21 Oct 2006; David Shakaryan <omp@gentoo.org> xfishtank-2.1.ebuild:
+ Remove monolithic X from dependencies, fix quotes and other minor cleanup.
14 Apr 2006; Krzysiek Pawlik <nelchael@gentoo.org> xfishtank-2.1.ebuild:
Do not install binaries to /usr/X11R6, see bug #127488.
diff --git a/x11-misc/xfishtank/xfishtank-2.1.ebuild b/x11-misc/xfishtank/xfishtank-2.1.ebuild
index a478873daf39..8bfba2e538fe 100644
--- a/x11-misc/xfishtank/xfishtank-2.1.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.1.ebuild
@@ -1,43 +1,40 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfishtank/xfishtank-2.1.ebuild,v 1.11 2006/04/14 16:02:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfishtank/xfishtank-2.1.ebuild,v 1.12 2006/10/21 22:24:31 omp Exp $
inherit eutils
+MY_P=${P}tp
+
DESCRIPTION="Turns your root window into an aquarium."
HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/demos/"
-MY_P="${P}tp"
SRC_URI="http://www.ibiblio.org/pub/Linux/X11/demos/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="ppc ppc64 x86"
-
IUSE=""
-RDEPEND="|| ( (
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXext )
- virtual/x11 )"
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext"
DEPEND="${RDEPEND}
- || ( (
- x11-proto/xproto
- x11-misc/makedepend )
- virtual/x11 )"
+ x11-proto/xproto
+ x11-misc/makedepend"
+
+S=${WORKDIR}/${MY_P}
src_unpack() {
- unpack "${A}"
+ unpack ${A}
epatch "${FILESDIR}/${MY_P}-Makefile.patch"
}
src_compile() {
- makedepend || die
- emake || die
+ makedepend || die "makedepend failed"
+ emake || die "emake failed"
}
src_install() {
- make BINDIR=/usr/bin DESTDIR=${D} install || die "install failed"
+ make BINDIR=/usr/bin DESTDIR="${D}" install || die "make install failed"
dodoc README README.Linux README.TrueColor README.Why.2.1tp
}