Version bumped

7 files changed, 28 insertions, 35 deletions

diff --git a/x11-misc/xdesktopwaves/ChangeLog b/x11-misc/xdesktopwaves/ChangeLog
index 69eabd13465e..2501d5bb99d2 100644
--- a/x11-misc/xdesktopwaves/ChangeLog
+++ b/x11-misc/xdesktopwaves/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xdesktopwaves
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdesktopwaves/ChangeLog,v 1.4 2004/11/30 20:05:31 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdesktopwaves/ChangeLog,v 1.5 2004/12/20 08:06:41 dholm Exp $
+
+*xdesktopwaves-1.3 (20 Dec 2004)
+
+  20 Dec 2004; David Holm <dholm@gentoo.org> -xdesktopwaves-1.0.ebuild,
+  -xdesktopwaves-1.1.ebuild, +xdesktopwaves-1.3.ebuild:
+  Version bumped, updated ebuild submitted by egore (at) gmx dot de
+  Removed old versions
 
 *xdesktopwaves-1.1 (30 Nov 2004)
 
diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
index 709feb38b414..9382a88f11d2 100644
--- a/x11-misc/xdesktopwaves/Manifest
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -1,6 +1,4 @@
-MD5 53a69427597c1af87c9122c76cfbbcac ChangeLog 695
+MD5 815a3d8af5d8aa15157ca994f496e238 ChangeLog 949
 MD5 5af3d0d1227b6fcf25c9cf2c246b362c metadata.xml 555
-MD5 b43285dfe4e97b0c3ffea21e17cf2922 xdesktopwaves-1.0.ebuild 624
-MD5 e19208f0f0ad4094d1b0b555abdce49b xdesktopwaves-1.1.ebuild 624
-MD5 ed4d0374e102c3727c87067ae4fc405d files/digest-xdesktopwaves-1.0 68
-MD5 879768906de735b7fa0a8a66353069a0 files/digest-xdesktopwaves-1.1 68
+MD5 c5650604549bbfa66a46a318970cd6aa xdesktopwaves-1.3.ebuild 1056
+MD5 ef24911caee71bb762a34d6cbe5375c5 files/digest-xdesktopwaves-1.3 68
diff --git a/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.0 b/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.0
deleted file mode 100644
index e67bd35ec777..000000000000
--- a/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a4760fd21010fe292682d8680d4ff083 xdesktopwaves-1.0.tar.gz 37622
diff --git a/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.1 b/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.1
deleted file mode 100644
index a19547bf7546..000000000000
--- a/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eaeef9eb3285ccac9f94287ef1b75073 xdesktopwaves-1.1.tar.gz 39691
diff --git a/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.3 b/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.3
new file mode 100644
index 000000000000..5f56cd52268c
--- /dev/null
+++ b/x11-misc/xdesktopwaves/files/digest-xdesktopwaves-1.3
@@ -0,0 +1 @@
+MD5 4ef1233527cb3bbf06b8fdc407b04ebe xdesktopwaves-1.3.tar.gz 49302
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.1.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.1.ebuild
deleted file mode 100644
index 246172db35ee..000000000000
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.1.ebuild
+++ /dev/null
@@ -1,24 +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/xdesktopwaves/xdesktopwaves-1.1.ebuild,v 1.1 2004/11/30 20:05:31 dholm Exp $
-
-DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water"
-HOMEPAGE="http://xdesktopwaves.sourceforge.net/"
-LICENSE="GPL-2"
-DEPEND="virtual/x11"
-
-SLOT="0"
-KEYWORDS="~ppc ~x86 ~amd64"
-IUSE=""
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin xdesktopwaves
-	doman xdesktopwaves.1
-	dodoc COPYING README
-}
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.0.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3.ebuild
index 2716e4c448b2..b63b06394014 100644
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.0.ebuild
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdesktopwaves/xdesktopwaves-1.0.ebuild,v 1.3 2004/11/22 13:43:02 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdesktopwaves/xdesktopwaves-1.3.ebuild,v 1.1 2004/12/20 08:06:41 dholm Exp $
+
+inherit eutils
 
 DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water"
 HOMEPAGE="http://xdesktopwaves.sourceforge.net/"
@@ -14,11 +16,22 @@ IUSE=""
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 src_compile() {
-	emake || die
+	emake || die "failed building program"
+	cd xdwapi
+	emake || die "failed building demo"
 }
 
 src_install() {
-	dobin xdesktopwaves
+	dobin xdesktopwaves xdwapi/xdwapidemo
 	doman xdesktopwaves.1
+	insinto /usr/share/pixmaps
+	doins xdesktopwaves.xpm
+	make_desktop_entry xdesktopwaves "xdesktopwaves" xdesktopwaves.xpm
 	dodoc COPYING README
 }
+
+pkg_preinst() {
+	einfo "To see what xdesktopwaves is able to do, start it by running"
+	einfo "'xdesktopwaves' and then run 'xdwapidemo'. You should see the"
+	einfo "supported effects on your desktop"
+}