5 files changed, 62 insertions, 127 deletions
diff --git a/app-misc/slashtime/ChangeLog b/app-misc/slashtime/ChangeLog
index b372cf6f389f..fe1c44250682 100644
--- a/app-misc/slashtime/ChangeLog
+++ b/app-misc/slashtime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/slashtime
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/slashtime/ChangeLog,v 1.6 2008/10/18 20:25:54 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/slashtime/ChangeLog,v 1.7 2008/11/25 18:51:47 serkan Exp $
+
+*slashtime-0.5.9 (25 Nov 2008)
+
+  25 Nov 2008; Serkan Kaba <serkan@gentoo.org>
+  -files/slashtime-0.5.8-jardir-and-symlink.patch,
+  +files/slashtime-0.5.9-jardir-and-symlink.patch,
+  -slashtime-0.5.8-r1.ebuild, +slashtime-0.5.9.ebuild:
+  Version bump. Remove old.
 
 *slashtime-0.5.8-r1 (18 Oct 2008)
 
diff --git a/app-misc/slashtime/Manifest b/app-misc/slashtime/Manifest
index 65de604dd9f8..f22f9387e79b 100644
--- a/app-misc/slashtime/Manifest
+++ b/app-misc/slashtime/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX slashtime-0.5.8-jardir-and-symlink.patch 4843 RMD160 0e5ab513f290f691c5b98a2ae56dbd3eb1bbf7f0 SHA1 e6137ddaa451c4b5d9dacaa802b130b2e1ca3e1a SHA256 71bfabfce1b8d11e3664b01c52dc9cf7d57547d188dac3888983835a8510b7bd
+AUX slashtime-0.5.9-jardir-and-symlink.patch 2453 RMD160 4dbf02b8adcc7e7166aaac1851583b44448b4012 SHA1 7a2d8e2a0372be1091adc511beceb1d9ef029166 SHA256 34ec5ce8064a251ba1835374790866f5fc270293f6f8967146704114bd0277ad
 DIST slashtime-0.5.8.tar.bz2 49100 RMD160 f08c9a38165a7b4cd0e1656c2593095f85c6ddb8 SHA1 b22ccac2b5c1f581d78bd5d0bc047279e4ba7ab7 SHA256 8ed3069c138e3ab6825ea5ef7b0366c121b6170056566a86a567419b6126594b
-EBUILD slashtime-0.5.8-r1.ebuild 1431 RMD160 e4049344c2c1b15c09a295799b63bfe912e17e71 SHA1 54fbfa1ed61e86faaa54350de88c297f5c9bce42 SHA256 209877a1e5cc78ebd7cb616627c822c3fac408b4fab3c25c556d44a4c6ecd1a5
+DIST slashtime-0.5.9.tar.bz2 50386 RMD160 a85974e238e5dd8956ab7607bdd918d452a31d76 SHA1 61836bfea72da2ca698ecba6a6ce1b189f2fa3bc SHA256 2ac2179080b4e3874841b6a3f16861a062bb371c40e3cc4ec353df99a3b3f034
 EBUILD slashtime-0.5.8.ebuild 1296 RMD160 47940c9da6598efd18a941ed3338cc72ac2bc686 SHA1 e1d21214601b0c83621faea743f11b6357dcf0c6 SHA256 631ac50097e873045f206c33f203fb240208a776ebdffda97427d77e53022158
-MISC ChangeLog 1219 RMD160 ddcfb33e99ab57b26d79c996cbb458c28d9b1dd4 SHA1 e18e948c42fe8ec2ffb0ce786f51900a873a24c0 SHA256 95a73ed958b7fd7bd0bf030273157cc77c820ce624e6bf51f7da61a52ff8b430
+EBUILD slashtime-0.5.9.ebuild 1428 RMD160 1f293aab337ebe0c3be37e9e80a4f22eb08b4e8f SHA1 08ed6ef5505a8a582835f777989324074bef719b SHA256 202d5f7b538b116eb5b9869e50e4356bbac6d451d417b9b8f2f6051138c5c75e
+MISC ChangeLog 1484 RMD160 5416f2b3410db057af42df57ed5098c126828ee5 SHA1 ec9e4025d15bfd018ceef93102f0063692181d80 SHA256 36352663f1e2f7522288d0aa4b3eeccb45ae06e08d143795f0054686ba6786be
 MISC metadata.xml 345 RMD160 4b71f346671b9f15ae0d3d39dd008a565aa0db40 SHA1 822464fb0553d7d6de3f9228eee7176eda90d4b7 SHA256 a9ff1d86577b1c04f96d2b796cd497802a6012c6d321fae009f880e92d37a9df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj6Rl0ACgkQRh6X64ivZaIYJwCeLKo8z7SXnLkDO+WtRQ6aOxWz
-cWcAnjHJaqBu+sIUBRzB9xvrXFY3yq+4
-=crTY
+iEYEARECAAYFAkksSUgACgkQRh6X64ivZaJyBwCeOB+sl3EO2KeLz5Rx9mMrVdW5
+N4cAni05CNDE4x4cRc+KFFhT01ukK/fU
+=IPyM
 -----END PGP SIGNATURE-----
diff --git a/app-misc/slashtime/files/slashtime-0.5.8-jardir-and-symlink.patch b/app-misc/slashtime/files/slashtime-0.5.8-jardir-and-symlink.patch
deleted file mode 100644
index 6cdc1b85db05..000000000000
--- a/app-misc/slashtime/files/slashtime-0.5.8-jardir-and-symlink.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: serkan@gentoo.org-20081014204742-m1f1undpfdbu4ikc
-# target_branch: ../mainline/
-# testament_sha1: 8cd8d12ef2cb826a26b67f1550386f4dcc9e73bb
-# timestamp: 2008-10-15 00:11:58 +0300
-# base_revision_id: andrew@operationaldynamics.com-20081014015640-\
-#   81xaue23uz6g5bce
-# 
-# Begin patch
-=== modified file 'Makefile'
---- Makefile	2008-07-13 05:10:28 +0000
-+++ Makefile	2008-10-14 20:47:42 +0000
-@@ -61,7 +61,7 @@
- 
- install: all \
- 		$(DESTDIR)$(PREFIX) \
--		$(DESTDIR)$(PREFIX)/share/java/slashtime-$(APIVERSION).jar \
-+		$(DESTDIR)$(JARDIR)/slashtime-$(APIVERSION).jar \
- 		tmp/stamp/install-pixmaps \
- 		$(DESTDIR)$(PREFIX)/share/applications/slashtime.desktop \
- 		$(DESTDIR)$(PREFIX)/bin/slashtime
-@@ -74,7 +74,7 @@
- 	@echo -e "MKDIR\t$@/"
- 	-mkdir -p $@
- 
--$(DESTDIR)$(PREFIX)/share/java:
-+$(DESTDIR)$(JARDIR):
- 	@echo -e "MKDIR\t$@/"
- 	-mkdir -p $@
- 
-@@ -111,11 +111,13 @@
- 	cp -f share/pixmaps/*.png $(DESTDIR)$(PREFIX)/share/pixmaps
- 	touch $@
- 
--$(DESTDIR)$(PREFIX)/share/java/slashtime-$(APIVERSION).jar: \
--		$(DESTDIR)$(PREFIX)/share/java \
-+$(DESTDIR)$(JARDIR)/slashtime-$(APIVERSION).jar: \
-+		$(DESTDIR)$(JARDIR) \
- 		tmp/slashtime.jar
- 	@echo -e "INSTALL\t$@"
- 	cp -f tmp/slashtime.jar $@
-+	@echo -e "SYMLINK\t$(@D)/slashtime.jar -> slashtime-$(APIVERSION).jar"
-+	cd $(@D) && rm -f slashtime.jar && ln -s slashtime-$(APIVERSION).jar slashtime.jar
- 
- 
- # --------------------------------------------------------------------
-
-=== modified file 'configure'
---- configure	2008-10-14 01:51:05 +0000
-+++ configure	2008-10-14 20:47:42 +0000
-@@ -343,6 +343,7 @@
- # --------------------------------------------------------------------
- 
- my $prefix;
-+my $jardir;
- my $compiler;
- my $runtime;
- my $jdk_home;
-@@ -375,6 +376,9 @@
- 	} elsif (($key =~ /^--prefix$/) ||
- 		 ($key =~ /^prefix$/)) {
- 		$prefix="$value";
-+	} elsif (($key =~ /^--jardir$/) ||
-+		 ($key =~ /^jardir$/)) {
-+		$jardir="$value";
- 	} elsif ($key =~ /^runtime/) {
- 		$runtime="$value";
- 	} elsif ($key =~ /^compiler/) {
-@@ -394,6 +398,10 @@
- 	$prefix="/usr/local";
- }
- 
-+if (!$jardir) {
-+	$jardir=$prefix . "/share/java";
-+}
-+
- 
- # check jdk_home override. compiler and runtime are checked 
- # later (at the end) against choices that have been validated.
-@@ -1340,6 +1348,7 @@
- 
- print CONFIG "APIVERSION=$apiversion\n";
- print CONFIG "VERSION=$version\n";
-+print CONFIG "JARDIR=$jardir\n";
- 
- # --------------------------------------------------------------------
- # Done! Create .config file
-
-# Begin bundle
-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
diff --git a/app-misc/slashtime/files/slashtime-0.5.9-jardir-and-symlink.patch b/app-misc/slashtime/files/slashtime-0.5.9-jardir-and-symlink.patch
new file mode 100644
index 000000000000..9d043a2169d6
--- /dev/null
+++ b/app-misc/slashtime/files/slashtime-0.5.9-jardir-and-symlink.patch
@@ -0,0 +1,45 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20081125183337-ifvpj401fgsg06c0
+# target_branch: ../slashtime/
+# testament_sha1: 79b7360b8e1df73365cf59d8b1f463389cb83831
+# timestamp: 2008-11-25 20:35:14 +0200
+# base_revision_id: andrew@operationaldynamics.com-20081125121459-\
+#   l71olekszk51uk8r
+# 
+# Begin patch
+=== modified file 'Makefile'
+--- Makefile	2008-11-08 07:44:27 +0000
++++ Makefile	2008-11-25 18:33:37 +0000
+@@ -84,7 +84,7 @@
+ # --------------------------------------------------------------------
+ 
+ install: all \
+-		$(DESTDIR)$(PREFIX)/share/java/slashtime-$(APIVERSION).jar \
++		$(DESTDIR)$(JARDIR)/slashtime-$(APIVERSION).jar \
+ 	 	tmp/stamp/install-pixmaps \
+ 	 	tmp/stamp/install-translations \
+ 		$(DESTDIR)$(PREFIX)/share/applications/slashtime.desktop \
+
+# Begin bundle
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfWKaaoAAdTfgCAwVWP//3//
+/3S////wUAR6vADFQAaAaIk8qeEaYp5IDI0xMgD1PJHpGR6nhRtTJoOMmTQxGJowCMBMIAwE00aZ
+GgGGkahhQZGo08Q0ah6nqDJhHqMIwQABjjJk0MRiaMAjATCAMBNNGmRoBhJIIAE00BTwTTVP0mjN
+QEekaaaPNUbSNPSGAjOtDYTBIKfRyEorPDVnYSggjRhdSh6AnQQZG0xG4G7yD9FMQjQowZ1TlVZa
+WZ3jQg+dJrzCMJhLXaDM51u7qaVufzPU1NeNaBVqKMCmBWGQ2hML6IsREkWUgCiiZ/n6Ahmzcvl5
+mnFcwL8VwVpA3IqA3bGAxhn+mY7KJGh9kZOxBkO+T3ous4Om86sKXUCZTyj/dC1jcOSVBp9gEDhx
+j2nYVhoAYnmckpx3iQOTHK7u6HIlGZ2o+A/0RLZ0J2cMcgJ18rD33mAqC0vyyAbb5nMfuxIBiCRF
+3k/GkrAsMo5C0Dn25AijMSSFOnXE9c81pzYy6bwJAIcHAW0S6Rw0sXX0/2AxQYtW3LENZIaEVMPK
+y3uagmDQFOJwGf1gzUy2hMVlhSTj3k/+Bd411GCOvLUUARKVVECuJUFroyUC+ks0mcoHIVcQIxlN
+D2OnMQJIUkH5ArjLjwCnyNBcbqi0kMRcQLduaESFwXmZXBHQRRHuMfI9rC+LDe01CEsrqDeML5fg
+dPalaAs0JSQG4hjolxZPmtiYR1a3w6ZkZxUBnsaGdpDbkfsJzs2OpXS4Lmx+vS07iZeSLCfYLDn8
+V8kW+gpLwRdDTeDK5cySpxsDU4IDgPDtVA9Kor9u2UWCb+bEPAbsxcOFtIU1SGTrkmx0nliwLrNv
+w0X20Pn7/rh6+TDIaf4yeR3+YMENQF2YIFHUFhIkHF7joH7m0iB8aCEn2IiEsSBmQ3pESHh1suZk
+GsF7OdSaZFPHP4F5QbO4yHMbmPJroHo+chvJTnl40EwSAROkq6Okrf7shsxNzRY5GLHkkuak4GBS
+ohAePMZQj53xOr4U7jXQjxv2i72w6HErajVGBQ15pbrroKTPj4jWQR6cDTbZ1KUKZkHJRFrtrvRL
+6O5kGqAayJI04k4HacL8Nh4ONFByA8Zlv22anBX2k4ECKDGB3O3peSC6W4Dy3HyocyKmLVmudWW5
+kfX7hKbB4E8hYKKo3oppf4ftojCiZkDIq3oLdffZL+HQB20/1pM5xCr1B58ojcvMj9rNPAOF4bAa
+MyLRRB3U1ZfvlLJUc/e9UTqaO2BBGPrnfwIu9UAwZPQMgoP1RmgSoZEXGANkQmYXT7XhtkQX06P+
+7Q2CmANnFBN2IYHI3oKg9nCC2P26LEst0B0VFEAoANmWsIhkKVEhMIZQkga3SnMEzUXUsn9aNFSC
+knpcIeGELQhBhmGWlH5vkG18X9Rn++JYupO4AZJDJiJYPxrawo1BPaX8nFIsQU3UyWbIn2JExVco
+lU5ugTCoQToYUWC6DzAgZdGsNpPZCS07a64LBB56AHIhrZwTG4uqaQyvfWi6N5QXBT/4u5IpwoSH
+rFNNUA==
diff --git a/app-misc/slashtime/slashtime-0.5.8-r1.ebuild b/app-misc/slashtime/slashtime-0.5.9.ebuild
index a2900bb8d796..b0b107a7fef3 100644
--- a/app-misc/slashtime/slashtime-0.5.8-r1.ebuild
+++ b/app-misc/slashtime/slashtime-0.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/slashtime/slashtime-0.5.8-r1.ebuild,v 1.1 2008/10/18 20:25:54 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/slashtime/slashtime-0.5.9.ebuild,v 1.1 2008/11/25 18:51:47 serkan Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="source"