bump x11-plugins/wmspaceclock to version 1.2d. Version 1.2b stable for x86. Wipe out old ebuilds.

6 files changed, 37 insertions, 19 deletions

diff --git a/x11-plugins/wmspaceclock/ChangeLog b/x11-plugins/wmspaceclock/ChangeLog
index eb58726ca2ce..104e134329e5 100644
--- a/x11-plugins/wmspaceclock/ChangeLog
+++ b/x11-plugins/wmspaceclock/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/wmspaceclock
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/ChangeLog,v 1.6 2004/06/28 21:37:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/ChangeLog,v 1.7 2004/07/22 09:22:54 s4t4n Exp $
+
+*wmspaceclock-1.2d (22 Jul 2003)
+
+  22 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmspaceclock-1.2d.ebuild:
+  Version bump.
+  wmspaceclock-1.2b.ebuild:
+  Stable for x86.
+  wmspaceclock-1.1.ebuild:
+  Remove old ebuilds.
 
   28 Jun 2004; Aron Griffis <agriffis@gentoo.org> wmspaceclock-1.1.ebuild,
   wmspaceclock-1.2b.ebuild:
diff --git a/x11-plugins/wmspaceclock/Manifest b/x11-plugins/wmspaceclock/Manifest
index 6976d40f5bab..d0078787292a 100644
--- a/x11-plugins/wmspaceclock/Manifest
+++ b/x11-plugins/wmspaceclock/Manifest
@@ -1,6 +1,6 @@
-MD5 6cc328c1995818c1dbaa1d8c80a3356b wmspaceclock-1.1.ebuild 783
-MD5 8523dd3d24f3a86cdafb2472ec43d3b1 wmspaceclock-1.2b.ebuild 746
-MD5 5af5973d2890ab50b4c40332c2cecfa3 ChangeLog 778
+MD5 4248b951d6a6f59e918646c8d1af5bc2 wmspaceclock-1.2b.ebuild 742
+MD5 03ec5457087193c6b787bf92cddd8e7f wmspaceclock-1.2d.ebuild 909
+MD5 6fe8082f4ae9083a7e5c15378eff79ac ChangeLog 999
 MD5 22920e4561ba95417c861c5f0f495bd6 metadata.xml 461
 MD5 d494f3f060141ab4baefd1fc2aa33823 files/digest-wmspaceclock-1.2b 67
-MD5 273d312e95c3a9f485649e4e65106592 files/digest-wmspaceclock-1.1 66
+MD5 dfdfd55daef0e7dd9675b4f674282846 files/digest-wmspaceclock-1.2d 67
diff --git a/x11-plugins/wmspaceclock/files/digest-wmspaceclock-1.1 b/x11-plugins/wmspaceclock/files/digest-wmspaceclock-1.1
deleted file mode 100644
index e318de2bcdf3..000000000000
--- a/x11-plugins/wmspaceclock/files/digest-wmspaceclock-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b6985a507d094b7b82105a16f8ebc48 spaceclock-1.1.tar.bz2 84120
diff --git a/x11-plugins/wmspaceclock/files/digest-wmspaceclock-1.2d b/x11-plugins/wmspaceclock/files/digest-wmspaceclock-1.2d
new file mode 100644
index 000000000000..23f30af1d100
--- /dev/null
+++ b/x11-plugins/wmspaceclock/files/digest-wmspaceclock-1.2d
@@ -0,0 +1 @@
+MD5 97bcf9cc8a5518f8b37752beba9a7a9c spaceclock-1.2d.tar.bz2 86967
diff --git a/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild b/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild
index b4a3678f960d..eb3d9b12e97e 100644
--- a/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild
+++ b/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild,v 1.5 2004/06/28 21:37:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/wmspaceclock-1.2b.ebuild,v 1.6 2004/07/22 09:22:54 s4t4n Exp $
 
 DESCRIPTION="A sexy anti-aliased dockapp clock"
 HOMEPAGE="http://wmspaceclock.sourceforge.net"
 SRC_URI="mirror://sourceforge/wmspaceclock/${P/wm/}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND="virtual/libc
 	virtual/x11
diff --git a/x11-plugins/wmspaceclock/wmspaceclock-1.1.ebuild b/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild
index 439b0cf587b7..8f735a6d43b6 100644
--- a/x11-plugins/wmspaceclock/wmspaceclock-1.1.ebuild
+++ b/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild
@@ -1,31 +1,40 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/wmspaceclock-1.1.ebuild,v 1.6 2004/06/28 21:37:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmspaceclock/wmspaceclock-1.2d.ebuild,v 1.1 2004/07/22 09:22:55 s4t4n Exp $
 
 DESCRIPTION="A sexy anti-aliased dockapp clock"
 HOMEPAGE="http://wmspaceclock.sourceforge.net"
 SRC_URI="mirror://sourceforge/wmspaceclock/${P/wm/}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 amd64"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 DEPEND="virtual/libc
 	virtual/x11
-	>=dev-libs/STLport-4.5.3
-	>=media-libs/gdk-pixbuf-0.20"
+	>=media-libs/gdk-pixbuf-0.20
+	>=sys-apps/sed-4"
 S=${WORKDIR}/spaceclock
 
-src_compile() {
+src_unpack()
+{
+	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:/usr/local:/usr:" \
-		-e "s:-g3 -O2:${CFLAGS}:" \
-		< Makefile.orig > Makefile
+
+	# let't wipe out some dirt the author forgot in his tarball
+	rm -fr pixmaps/.xvpics &>/dev/null
+	rm -fr pixmaps/CVS     &>/dev/null
+}
+
+src_compile()
+{
+	sed	-i "s:/usr/local:/usr:" Makefile
+	sed	-i "s:-g3 -O2:${CFLAGS}:" Makefile
+	./configure
 	make
 }
 
-src_install() {
+src_install()
+{
 	dodir /usr/bin
 	make DESTDIR=${D} install || die
 }