Version bump. Drop old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 25 insertions, 36 deletions

diff --git a/app-misc/klavaro/ChangeLog b/app-misc/klavaro/ChangeLog
index 6b7efa7ad296..816846a2144f 100644
--- a/app-misc/klavaro/ChangeLog
+++ b/app-misc/klavaro/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/klavaro
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/ChangeLog,v 1.5 2010/01/08 15:15:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/ChangeLog,v 1.6 2010/05/26 10:16:23 scarabeus Exp $
+
+*klavaro-1.5.0 (26 May 2010)
+
+  26 May 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -klavaro-1.3.4.ebuild, -klavaro-1.4.1.ebuild, +klavaro-1.5.0.ebuild:
+  Version bump. Drop old.
 
 *klavaro-1.4.1 (08 Jan 2010)
 
diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index c1fc2b43f62c..0ce244de73b2 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -1,6 +1,14 @@
-DIST klavaro-1.3.4.tar.bz2 694698 RMD160 6e509f9515e9ba4b75e4bcb1d8ff7704593a62c5 SHA1 c1067bcc6858a4aafb95d8a56d6332d0269d7560 SHA256 7d8b3ab150c646e3369bd8ef6bebe1fc4f749568e7488eb7efb0d9d1df4cff57
-DIST klavaro-1.4.1.tar.bz2 765310 RMD160 de2960fedbdba7a1cc4696b7e421b647a40dacd0 SHA1 e9ae55fa9bf146a64860e88164cd69641efb75fc SHA256 24dc28416189a9f8979194c23c0b13d67036af2d70574fd4532ff59c930540e0
-EBUILD klavaro-1.3.4.ebuild 738 RMD160 ebcbeaed6a3807e2565cdbaacaf2c4cccc863afd SHA1 5d75bc32035c1b30b03cb406d33a27d3ef8d0725 SHA256 27d89d1a43c58348709748fcb8f8430d4e440662bfad893a6f6a3bcd434bd691
-EBUILD klavaro-1.4.1.ebuild 744 RMD160 abbdb6bfc364795b8f2ae34796088d781d51a78c SHA1 c484aaa4eb396ea4494eb60316edaf0b3148c692 SHA256 d997f6c98ff226ed4427f4340840a6ec6acc2509cc0821fec80f59a694fb6c38
-MISC ChangeLog 942 RMD160 725a97735978815af476da1d9cd79e8181c7c153 SHA1 2f8e342cbb72ebf43fbffe17637c587076efb23b SHA256 c8ae713827afcf092ffee060e21aa39c376f0435ffdbcbfb69655e3964a7f977
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST klavaro-1.5.0.tar.bz2 748636 RMD160 4c7984f93d03ec1c36f4e3e9bee92fe3b0e4137e SHA1 f671cfd6f618617e6981e536a09dc2bd083e04ee SHA256 79590f45037934fd3b5306ff8155034cbcebe1485034f28df9b55b0de302ee88
+EBUILD klavaro-1.5.0.ebuild 709 RMD160 42cf39b7399e1137b5bbb2fba32b42c733393625 SHA1 e4dcd4300474a12eb2bc87a7956ee408763182a7 SHA256 6d3a2602f219d6d9ce94f2adac065377cb12adb7d635f775e9bdc644ac645ef9
+MISC ChangeLog 1125 RMD160 b2b2f45b998124cf9c03c34e6b0e89c59abc8b52 SHA1 0a9da81e4e37782b85ad8095fb5adc2e281fb044 SHA256 0018b72570c9a9ab78075301e06f63f22d362712eea517372a4a82399c9dfb5a
 MISC metadata.xml 326 RMD160 59e183b66adfd9f909cc9993e95964956a611e4c SHA1 328f15eac3d47176f0da5d73b37002e27d7f9a55 SHA256 04b91f2f0041cdcd7ec7bc38d7893f77fa65ec40cc7a28ce508232bc272b334a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkv89P0ACgkQHB6c3gNBRYeskgCdHhZafXcMOxqAfEHUTfwDInby
+GpgAoI91VHiwdRIsAYc2lQwkE3cE47U4
+=nF4h
+-----END PGP SIGNATURE-----
diff --git a/app-misc/klavaro/klavaro-1.3.4.ebuild b/app-misc/klavaro/klavaro-1.3.4.ebuild
deleted file mode 100644
index b46708eba546..000000000000
--- a/app-misc/klavaro/klavaro-1.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-1.3.4.ebuild,v 1.1 2009/10/26 14:29:49 scarabeus Exp $
-
-inherit eutils
-
-DESCRIPTION="Another free touch typing tutor program"
-HOMEPAGE="http://klavaro.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-misc/curl
-	x11-libs/gtkdatabox
-	x11-libs/libsexy"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	make_desktop_entry klavaro Klavaro "" Education
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-}
diff --git a/app-misc/klavaro/klavaro-1.4.1.ebuild b/app-misc/klavaro/klavaro-1.5.0.ebuild
index dde5a3cca56d..2b098418ab8d 100644
--- a/app-misc/klavaro/klavaro-1.4.1.ebuild
+++ b/app-misc/klavaro/klavaro-1.5.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-1.4.1.ebuild,v 1.1 2010/01/08 15:15:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-1.5.0.ebuild,v 1.1 2010/05/26 10:16:23 scarabeus Exp $
 
-inherit eutils
+EAPI=3
+
+inherit base
 
 DESCRIPTION="Another free touch typing tutor program"
 HOMEPAGE="http://klavaro.sourceforge.net/"
@@ -21,7 +23,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	base_src_install
 	make_desktop_entry klavaro Klavaro "" Education
 	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
 }