Version BUmp

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 81 insertions, 29 deletions

diff --git a/app-misc/klavaro/ChangeLog b/app-misc/klavaro/ChangeLog
index 62af28201c7a..6b5e2e27fb9a 100644
--- a/app-misc/klavaro/ChangeLog
+++ b/app-misc/klavaro/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/klavaro
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/ChangeLog,v 1.19 2014/01/14 13:56:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/ChangeLog,v 1.20 2014/01/28 15:52:21 jlec Exp $
+
+*klavaro-3.0.0 (28 Jan 2014)
+
+  28 Jan 2014; Justin Lecher <jlec@gentoo.org>
+  +files/klavaro-3.0.0-out-of-source.patch, +files/klavaro-3.0.0-static.patch,
+  +klavaro-3.0.0.ebuild, -klavaro-1.9.6.ebuild:
+  Version BUmp
 
   14 Jan 2014; Agostino Sarubbo <ago@gentoo.org> klavaro-1.9.7.ebuild:
   Stable for x86, wrt bug #495340
diff --git a/app-misc/klavaro/files/klavaro-3.0.0-out-of-source.patch b/app-misc/klavaro/files/klavaro-3.0.0-out-of-source.patch
new file mode 100644
index 000000000000..7bd2e92dd92a
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.0.0-out-of-source.patch
@@ -0,0 +1,16 @@
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b73ccc2..990f835 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -29,7 +29,7 @@ AM_LDFLAGS = -static
+ 
+ klavaro_LDADD = @GTK_LIBS@ \
+ 		-lgmodule-2.0 \
+-	       	$(top_srcdir)/gtkdatabox/libgtkdatabox.la
++	       	$(top_builddir)/gtkdatabox/libgtkdatabox.la
+ 
+ if IS_POSIX
+ AM_CFLAGS += -export-dynamic
diff --git a/app-misc/klavaro/files/klavaro-3.0.0-static.patch b/app-misc/klavaro/files/klavaro-3.0.0-static.patch
new file mode 100644
index 000000000000..a44d54ccfad6
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.0.0-static.patch
@@ -0,0 +1,15 @@
+ gtkdatabox/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtkdatabox/Makefile.am b/gtkdatabox/Makefile.am
+index 503f753..d972de9 100644
+--- a/gtkdatabox/Makefile.am
++++ b/gtkdatabox/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id: Makefile.am 4 2008-06-22 09:19:11Z rbock $
+ 
+-lib_LTLIBRARIES		= libgtkdatabox.la
++noinst_LTLIBRARIES		= libgtkdatabox.la
+ libgtkdatabox_la_SOURCES= \
+ 			gtkdatabox.c\
+ 			gtkdatabox_marshal.c\
diff --git a/app-misc/klavaro/klavaro-1.9.6.ebuild b/app-misc/klavaro/klavaro-1.9.6.ebuild
deleted file mode 100644
index e86002edd193..000000000000
--- a/app-misc/klavaro/klavaro-1.9.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-1.9.6.ebuild,v 1.1 2012/12/15 16:10:12 pacho Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
-
-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/gtk+:2
-	x11-libs/gtkdatabox"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.9.5-gold.patch )
diff --git a/app-misc/klavaro/klavaro-3.0.0.ebuild b/app-misc/klavaro/klavaro-3.0.0.ebuild
new file mode 100644
index 000000000000..fe12cd16e3ae
--- /dev/null
+++ b/app-misc/klavaro/klavaro-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-3.0.0.ebuild,v 1.1 2014/01/28 15:52:21 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils versionator
+
+MY_P="${PN}-$(delete_version_separator 2)"
+
+DESCRIPTION="Another free touch typing tutor program"
+HOMEPAGE="http://klavaro.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+static-libs"
+
+RDEPEND="
+	net-misc/curl
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/pango
+"
+# gtk+3 version needed
+#	x11-libs/gtkdatabox
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/gtk-builder-convert
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-out-of-source.patch
+	"${FILESDIR}"/${P}-static.patch
+	)
+
+S="${WORKDIR}"/${MY_P}