summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Smith <smithj@gentoo.org>2005-07-27 23:23:56 +0000
committerJonathan Smith <smithj@gentoo.org>2005-07-27 23:23:56 +0000
commitf3df34a737fb89017a73a678a4a143ad8e8e15f8 (patch)
treedf3ffdb7388ce733691eab0f3a27d7efefb3a9aa /x11-misc/fireflies
parentadd xterm-256color (diff)
downloadgentoo-2-f3df34a737fb89017a73a678a4a143ad8e8e15f8.tar.gz
gentoo-2-f3df34a737fb89017a73a678a4a143ad8e8e15f8.tar.bz2
gentoo-2-f3df34a737fb89017a73a678a4a143ad8e8e15f8.zip
#100529: dependency fixes. thanks to Ed Catmur <ed@catmur.co.uk> for the patch
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'x11-misc/fireflies')
-rw-r--r--x11-misc/fireflies/ChangeLog5
-rw-r--r--x11-misc/fireflies/Manifest16
-rw-r--r--x11-misc/fireflies/fireflies-2.06-r1.ebuild35
3 files changed, 11 insertions, 45 deletions
diff --git a/x11-misc/fireflies/ChangeLog b/x11-misc/fireflies/ChangeLog
index 2741d3c925b9..38d26d5f9575 100644
--- a/x11-misc/fireflies/ChangeLog
+++ b/x11-misc/fireflies/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/fireflies
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.7 2005/07/27 14:51:35 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.8 2005/07/27 23:23:56 smithj Exp $
+
+ 27 Jul 2005; Jonathan Smith <smithj@gentoo.org> fireflies-2.06-r1.ebuild:
+ #100529: dependency fixes. thanks to Ed Catmur <ed@catmur.co.uk> for the patch
*fireflies-2.06-r1 (27 Jul 2005)
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
index 539956c8df78..e69de29bb2d1 100644
--- a/x11-misc/fireflies/Manifest
+++ b/x11-misc/fireflies/Manifest
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 714d81e652c3a26d7576049d18d2b7bf ChangeLog 1080
-MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
-MD5 9e98cb427ec719fbbf93f21a8250c4a3 fireflies-2.06-r1.ebuild 1479
-MD5 657df9334348d7fe6574bb1607f08b01 files/fireflies-2.06-configure.patch 412
-MD5 4ccda06d3205ecd6959163d9054067dc files/digest-fireflies-2.06-r1 66
-MD5 8f06653a37476519552c8ed711defae0 files/fireflies-2.06-Make.include.in.patch 667
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC55+sl5AvwDPiUowRAlxwAJ9yT78bDHFuxA8U4Kw/AlxTu6SrugCgrNsu
-xkbxXyQStk5YV84n80EKwqA=
-=eJLS
------END PGP SIGNATURE-----
diff --git a/x11-misc/fireflies/fireflies-2.06-r1.ebuild b/x11-misc/fireflies/fireflies-2.06-r1.ebuild
index 945d5b617f41..fab9d2d457d1 100644
--- a/x11-misc/fireflies/fireflies-2.06-r1.ebuild
+++ b/x11-misc/fireflies/fireflies-2.06-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.06-r1.ebuild,v 1.1 2005/07/27 14:51:35 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.06-r1.ebuild,v 1.2 2005/07/27 23:23:56 smithj Exp $
inherit eutils
@@ -18,9 +18,6 @@ RDEPEND="virtual/x11
virtual/opengl
media-libs/libsdl"
-DEPEND="${RDEPEND}
- x11-libs/fltk"
-
src_unpack() {
unpack ${A}
cd ${S}
@@ -30,33 +27,15 @@ src_unpack() {
src_compile() {
local myconf
- local -a mycflagsarr
- local mycppflags
-
- myconf="${myconf}
- --with-bindir=/usr/lib/misc/xscreensaver
- --with-configdir=/usr/share/xscreensaver/config/"
- mycflagsarr=($CFLAGS `fltk-config --cflags`)
- mycppflags="${mycflagsarr[@]##-[^I]*}"
-
- econf ${myconf} || die
- emake \
- CFLAGS="$CFLAGS `fltk-config --cflags`" \
- LDLIBS="$LDLIBS `fltk-config --ldflags`" \
- LDFLAGS="$LDFLAGS `fltk-config --ldflags`" \
- CPPFLAGS="$CPPFLAGS ${mycppflags}" \
- || die
+
+ myconf="--with-bindir=/usr/lib/misc/xscreensaver
+ --with-confdir=/usr/share/xscreensaver/config/"
+
+ econf ${myconf} || die "econf failed"
+ emake || die "emake failed"
}
src_install() {
make DESTDIR=${D} install || die "install failed"
dodoc COPYING COMPILE README TODO
- dobin add-xscreensaver
-}
-
-pkg_postinst() {
- einfo
- einfo "To use fireflies with XScreensaver you need to run"
- einfo "/usr/bin/add-xscreensaver <path to your .xscreensaver file>"
- einfo
}