clean older version; tidy

7 files changed, 16 insertions, 120 deletions

diff --git a/games-action/trackballs/ChangeLog b/games-action/trackballs/ChangeLog
index 3e33fbbd3a49..3545fb0a4435 100644
--- a/games-action/trackballs/ChangeLog
+++ b/games-action/trackballs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/trackballs
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/trackballs/ChangeLog,v 1.8 2004/06/24 22:00:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/trackballs/ChangeLog,v 1.9 2004/08/08 11:49:16 mr_bones_ Exp $
+
+  08 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/0.9.2-destdir-icons.patch, -files/0.9.2-sparkle.patch,
+  -trackballs-0.9.2.ebuild, trackballs-1.0.0.ebuild:
+  clean older version; tidy
 
   19 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> trackballs-0.9.2.ebuild,
   trackballs-1.0.0.ebuild:
diff --git a/games-action/trackballs/Manifest b/games-action/trackballs/Manifest
index 53cd93a6b58e..87b7e9f2f9cc 100644
--- a/games-action/trackballs/Manifest
+++ b/games-action/trackballs/Manifest
@@ -1,8 +1,4 @@
-MD5 d7259b2f21d3fe5491ab058c4de4fcb0 trackballs-1.0.0.ebuild 1429
-MD5 69df931e04adae58081409a25c4c7527 trackballs-0.9.2.ebuild 1282
-MD5 1af36f719c409eb93dc6eba46b11a9e9 ChangeLog 1120
+MD5 d1b8101775a36ff60543619e4d240780 ChangeLog 1322
+MD5 70d016505f686a540fd5989bf1b15b61 trackballs-1.0.0.ebuild 1384
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 4dcba68e2d9c9f02314e61e1cd9a4a7c files/digest-trackballs-0.9.2 142
 MD5 0b573a1444721dee7dc128fb20c380e4 files/digest-trackballs-1.0.0 142
-MD5 fcf7f10beeaa8a2736651e005c08e21b files/0.9.2-destdir-icons.patch 1832
-MD5 a31aca7fa7d6a2acecd5140f6986361f files/0.9.2-sparkle.patch 299
diff --git a/games-action/trackballs/files/0.9.2-destdir-icons.patch b/games-action/trackballs/files/0.9.2-destdir-icons.patch
deleted file mode 100644
index aaaf11721031..000000000000
--- a/games-action/trackballs/files/0.9.2-destdir-icons.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- Makefile.am.orig	2003-06-20 11:33:42.000000000 -0400
-+++ Makefile.am	2003-06-20 11:33:47.000000000 -0400
-@@ -3,4 +3,4 @@
- EXTRA_DIST = $(pkgdata_DATA) 
- 
- install-pkgdataDATA:
--	./installIcons $(bindir)
-+	./installIcons $(bindir) $(DESTDIR)
---- installIcons.orig	2003-10-11 00:55:29.864701376 -0400
-+++ installIcons	2003-10-11 00:56:10.453530936 -0400
-@@ -9,13 +9,13 @@
- if [ -d /usr/share/applications ]; then
- 
-     # Install the desktop file in appropriate place
--    install trackballs.desktop /usr/share/applications
-+    install trackballs.desktop $2/usr/share/applications
- else
- 
-     # Attempt to install the desktop file in the old way
-     for path in /usr/share /usr/local/share /opt/share /opt/kde/share /opt/kde3/share /opt/kde3.1/share ; do
- 	if [ -d $path/applnk/Games/Arcade ]; then
--	    install trackballs.desktop $path/applnk/Games/Arcade
-+	    install trackballs.desktop $2/$path/applnk/Games/Arcade
- 	fi
-     done
- fi
-@@ -23,14 +23,14 @@
- # Now install the icons everywhere they might be needed
- for path in /usr/share /usr/local/share /opt/share /opt/kde/share /opt/kde3/share /opt/kde3.1/share ; do
-     if [ -d $path/icons/default.kde/32x32/apps ]; then
--	install trackballs-32x32.png $path/icons/default.kde/32x32/apps/trackballs.png
-+	install trackballs-32x32.png $2/$path/icons/default.kde/32x32/apps/trackballs.png
-     fi
-     
-     if [ -d $path/icons/default.kde/48x48/apps ]; then
--	install trackballs-48x48.png $path/icons/default.kde/48x48/apps/trackballs.png
-+	install trackballs-48x48.png $2/$path/icons/default.kde/48x48/apps/trackballs.png
-     fi
-     
-     if [ -d $path/icons/default.kde/64x64/apps ]; then
--	install trackballs-64x64.png $path/icons/default.kde/64x64/apps/trackballs.png
-+	install trackballs-64x64.png $2/$path/icons/default.kde/64x64/apps/trackballs.png
-     fi
- done
diff --git a/games-action/trackballs/files/0.9.2-sparkle.patch b/games-action/trackballs/files/0.9.2-sparkle.patch
deleted file mode 100644
index 322a878abdbd..000000000000
--- a/games-action/trackballs/files/0.9.2-sparkle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sparkle2d.cc.orig	2003-06-20 00:53:04.000000000 -0400
-+++ sparkle2d.cc	2003-06-20 00:53:14.000000000 -0400
-@@ -174,7 +174,7 @@
-   speed[1] = 2.*frandom()-1.;
-   return add(pos, speed, 0.5+frandom()*2., 1., col);
- }
--int Sparkle2D::add(float pos[2]);
-+//int Sparkle2D::add(float pos[2]);
- 
- 
- /*
diff --git a/games-action/trackballs/files/digest-trackballs-0.9.2 b/games-action/trackballs/files/digest-trackballs-0.9.2
deleted file mode 100644
index 8045cf0c22a7..000000000000
--- a/games-action/trackballs/files/digest-trackballs-0.9.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b51fb581a966fec1ff0bdee66871723f trackballs-0.9.2.tar.gz 4828477
-MD5 e58d1c7d046f4010a2b3c92383522459 trackballs-music-0.9.0.tbz2 7693212
diff --git a/games-action/trackballs/trackballs-0.9.2.ebuild b/games-action/trackballs/trackballs-0.9.2.ebuild
deleted file mode 100644
index c97e968a0d0f..000000000000
--- a/games-action/trackballs/trackballs-0.9.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/trackballs/trackballs-0.9.2.ebuild,v 1.4 2004/06/24 22:00:03 agriffis Exp $
-
-inherit games eutils
-
-DESCRIPTION="simple game similar to the classical game Marble Madness"
-HOMEPAGE="http://trackballs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-music-0.9.0.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/libsdl
-	>=dev-util/guile-1.6*
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	media-libs/sdl-ttf"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/${PV}-sparkle.patch
-	cd ${S}/share/icons
-	epatch ${FILESDIR}/${PV}-destdir-icons.patch
-	cd ${S}
-	automake || die "automake failed"
-}
-
-src_compile() {
-	egamesconf \
-		--with-highscores=${GAMES_STATEDIR}/${PN}-highscores || \
-			die "egamesconf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/share/applications
-	make DESTDIR="${D}" install            || die "make install failed"
-	insinto "${GAMES_DATADIR}/${PN}/music"
-	doins "${WORKDIR}"/tb_*.ogg            || die "doins failed"
-	dodoc AUTHORS ChangeLog README* NEWS   || die "dodoc failed"
-	prepgamesdirs
-}
diff --git a/games-action/trackballs/trackballs-1.0.0.ebuild b/games-action/trackballs/trackballs-1.0.0.ebuild
index 0561566b8bb6..702194566604 100644
--- a/games-action/trackballs/trackballs-1.0.0.ebuild
+++ b/games-action/trackballs/trackballs-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/trackballs/trackballs-1.0.0.ebuild,v 1.4 2004/06/24 22:00:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/trackballs/trackballs-1.0.0.ebuild,v 1.5 2004/08/08 11:49:16 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -27,27 +27,27 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e 's/icons//' share/Makefile.in \
-			|| die "sed share/Makefile.in failed"
+		|| die "sed share/Makefile.in failed"
 }
 
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \
-		--with-highscores=${GAMES_STATEDIR}/${PN}-highscores || \
-			die "egamesconf failed"
+		--with-highscores=${GAMES_STATEDIR}/${PN}-highscores \
+		|| die "egamesconf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install            || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	insinto /usr/share/pixmaps
 	doins share/icons/*png || die "doins failed"
 	make_desktop_entry trackballs "Trackballs" trackballs-48x48.png
 	insinto "${GAMES_DATADIR}/${PN}/music"
-	doins "${WORKDIR}"/tb_*.ogg            || die "doins failed"
-	dodoc AUTHORS ChangeLog README* NEWS   || die "dodoc failed"
+	doins "${WORKDIR}"/tb_*.ogg || die "doins failed"
+	dodoc AUTHORS ChangeLog README* NEWS
 	prepgamesdirs
 }