(hopefully) fixed #95408, version bump, cleanup, added gtk USE flag to

newest ebuild
(Portage version: 2.0.51.22-r1)

8 files changed, 46 insertions, 53 deletions

diff --git a/x11-misc/lavaps/ChangeLog b/x11-misc/lavaps/ChangeLog
index 828a1786fd6b..3e18c2561cc3 100644
--- a/x11-misc/lavaps/ChangeLog
+++ b/x11-misc/lavaps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/lavaps
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v 1.10 2004/06/24 22:27:22 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v 1.11 2005/06/14 23:13:11 smithj Exp $
+
+*lavaps-2.7 (14 Jun 2005)
+
+  14 Jun 2005; Jonathan Smith <smithj@gentoo.org> -lavaps-1.20.ebuild,
+  -lavaps-1.21.ebuild, +lavaps-2.7.ebuild:
+  (hopefully) fixed #95408, version bump, cleanup, added gtk USE flag to
+  newest ebuild
 
   01 Jun 2004; Brandon Hale <tseng@gentoo.org> lavaps-2.4.ebuild:
   Add IUSE=
diff --git a/x11-misc/lavaps/Manifest b/x11-misc/lavaps/Manifest
index ebbb0a5976e5..da484926d9dd 100644
--- a/x11-misc/lavaps/Manifest
+++ b/x11-misc/lavaps/Manifest
@@ -1,8 +1,6 @@
-MD5 79acee656473b65f19c9239113d7d6b1 lavaps-1.20.ebuild 572
-MD5 aca5c916c1abf640fb9ee6f8fcd56fdc lavaps-2.4.ebuild 571
-MD5 4413c3591f760ca33a7acd3bd6c258fa lavaps-1.21.ebuild 572
 MD5 9dd315192ac8d5825a3aac4d1c074594 ChangeLog 1288
+MD5 aca5c916c1abf640fb9ee6f8fcd56fdc lavaps-2.4.ebuild 571
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 33ab37835961211a1eaf3eddc22cfeb3 files/digest-lavaps-1.20 63
-MD5 be7ca220c33f57f4502925ebe3104bb4 files/digest-lavaps-1.21 63
+MD5 d76f9262aee1aca47a02fcb05020fd18 lavaps-2.7.ebuild 572
 MD5 34d8c98cfb7f3c538f8177c24c2b4152 files/digest-lavaps-2.4 62
+MD5 ccae6ec1333b846db55deb7538155cc6 files/digest-lavaps-2.7 62
diff --git a/x11-misc/lavaps/files/digest-lavaps-1.20 b/x11-misc/lavaps/files/digest-lavaps-1.20
deleted file mode 100644
index c66dafdceb05..000000000000
--- a/x11-misc/lavaps/files/digest-lavaps-1.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 947fda00fd65162fdf0d02d7ef9b76c5 lavaps-1.20.tar.gz 160724
diff --git a/x11-misc/lavaps/files/digest-lavaps-1.21 b/x11-misc/lavaps/files/digest-lavaps-1.21
deleted file mode 100644
index 520cab22d509..000000000000
--- a/x11-misc/lavaps/files/digest-lavaps-1.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb86cc10c6bda4ed27e447ac736d1d0b lavaps-1.21.tar.gz 194218
diff --git a/x11-misc/lavaps/files/digest-lavaps-2.7 b/x11-misc/lavaps/files/digest-lavaps-2.7
new file mode 100644
index 000000000000..72a53d47d70b
--- /dev/null
+++ b/x11-misc/lavaps/files/digest-lavaps-2.7
@@ -0,0 +1 @@
+MD5 cf56a2becae9053130768e4dff5b4a59 lavaps-2.7.tar.gz 399332
diff --git a/x11-misc/lavaps/lavaps-1.20.ebuild b/x11-misc/lavaps/lavaps-1.20.ebuild
deleted file mode 100644
index 4f59194f07ee..000000000000
--- a/x11-misc/lavaps/lavaps-1.20.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/lavaps-1.20.ebuild,v 1.8 2004/07/15 00:54:16 agriffis Exp $
-
-DESCRIPTION="Lava Lamp graphical representation of running processes."
-SRC_URI="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/${P}.tar.gz"
-HOMEPAGE="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=dev-lang/tk-8.3.3
-	virtual/x11"
-
-src_install() {
-
-	dobin lavaps
-	doman lavaps.1
-	dodoc COPYING README
-}
diff --git a/x11-misc/lavaps/lavaps-1.21.ebuild b/x11-misc/lavaps/lavaps-1.21.ebuild
deleted file mode 100644
index 0aa53aba337d..000000000000
--- a/x11-misc/lavaps/lavaps-1.21.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/lavaps-1.21.ebuild,v 1.7 2004/07/15 00:54:16 agriffis Exp $
-
-DESCRIPTION="Lava Lamp graphical representation of running processes."
-SRC_URI="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/${P}.tar.gz"
-HOMEPAGE="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=dev-lang/tk-8.3.3
-	virtual/x11"
-
-src_install() {
-
-	dobin lavaps
-	doman lavaps.1
-	dodoc COPYING README
-}
diff --git a/x11-misc/lavaps/lavaps-2.7.ebuild b/x11-misc/lavaps/lavaps-2.7.ebuild
new file mode 100644
index 000000000000..33f4ec66a95a
--- /dev/null
+++ b/x11-misc/lavaps/lavaps-2.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/lavaps-2.7.ebuild,v 1.1 2005/06/14 23:13:11 smithj Exp $
+
+DESCRIPTION="Lava Lamp graphical representation of running processes."
+SRC_URI="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/${P}.tar.gz"
+HOMEPAGE="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="gtk"
+
+DEPEND=">=dev-lang/tk-8.3.3
+	virtual/x11
+	gtk? ( x11-libs/gtk+ )
+	!gtk? ( dev-lang/tcl )"
+
+src_compile() {
+	local myconf="--with-x"
+	use gtk && myconf="${myconf} --with-gtk" \
+		|| myconf="${myconf} --with-tcltk"
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	doman lavaps.1
+	dodoc COPYING README
+	dohtml doc/*.html
+}