Cleanup old versions; fix build with GTK+ 2.22 (bug #339480); install TRANSLATORS file and avoid installing duplicate icon/desktop file.

(Portage version: 2.2_rc97/cvs/Linux x86_64)

7 files changed, 42 insertions, 114 deletions

diff --git a/app-misc/kanatest/ChangeLog b/app-misc/kanatest/ChangeLog
index 1acdb5e0246a..1465a8b6fa1e 100644
--- a/app-misc/kanatest/ChangeLog
+++ b/app-misc/kanatest/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/kanatest
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/ChangeLog,v 1.30 2010/03/23 20:39:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/ChangeLog,v 1.31 2010/10/17 01:33:33 flameeyes Exp $
+
+  17 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -kanatest-0.4.2.ebuild, -kanatest-0.4.3.ebuild, -kanatest-0.4.4.ebuild,
+  -kanatest-0.4.6.ebuild, kanatest-0.4.8.ebuild,
+  +files/kanatest-0.4.8+gtk-2.22.patch:
+  Cleanup old versions; fix build with GTK+ 2.22 (bug #339480); install
+  TRANSLATORS file and avoid installing duplicate icon/desktop file.
 
   23 Mar 2010; Brent Baude <ranger@gentoo.org> kanatest-0.4.8.ebuild:
   stable ppc, bug 302320
diff --git a/app-misc/kanatest/files/kanatest-0.4.8+gtk-2.22.patch b/app-misc/kanatest/files/kanatest-0.4.8+gtk-2.22.patch
new file mode 100644
index 000000000000..5db2c1e0adaf
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8+gtk-2.22.patch
@@ -0,0 +1,23 @@
+Index: kanatest-0.4.8/Makefile.am
+===================================================================
+--- kanatest-0.4.8.orig/Makefile.am
++++ kanatest-0.4.8/Makefile.am
+@@ -1,5 +1,5 @@
+ SUBDIRS = src po data
+-ACLOCAL_AMFLAGS = -I m4 -Wall
++ACLOCAL_AMFLAGS = -Wall
+ 
+ EXTRA_DIST = README AUTHORS TRANSLATORS COPYING ChangeLog
+ 
+Index: kanatest-0.4.8/src/Makefile.am
+===================================================================
+--- kanatest-0.4.8.orig/src/Makefile.am
++++ kanatest-0.4.8/src/Makefile.am
+@@ -1,6 +1,5 @@
+ REVISION := $(shell if test -e .svn; then echo -DREV=\"`LC_ALL=C svn info | sed -n '/^Rev/p'| sed -e 's/^Revision:\ //'`\"; fi;)
+-AM_CPPFLAGS = -Wall -DLOCALEDIR=\"$(datadir)/locale\" $(REVISION) \
+-			  -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++AM_CPPFLAGS = -Wall -DLOCALEDIR=\"$(datadir)/locale\" $(REVISION)
+ bin_PROGRAMS = kanatest
+ kanatest_SOURCES = about.c about.h \
+ 				   chart.c chart.h \
diff --git a/app-misc/kanatest/kanatest-0.4.2.ebuild b/app-misc/kanatest/kanatest-0.4.2.ebuild
deleted file mode 100644
index 83a8ae13f90b..000000000000
--- a/app-misc/kanatest/kanatest-0.4.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/kanatest-0.4.2.ebuild,v 1.5 2007/06/17 12:05:04 dertobi123 Exp $
-
-DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
-HOMEPAGE="http://clay.ll.pl/kanatest"
-
-SRC_URI="http://clay.ll.pl/kanatest/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-RDEPEND=">=x11-libs/gtk+-2.6
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-misc/kanatest/kanatest-0.4.3.ebuild b/app-misc/kanatest/kanatest-0.4.3.ebuild
deleted file mode 100644
index fe9a6e806779..000000000000
--- a/app-misc/kanatest/kanatest-0.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/kanatest-0.4.3.ebuild,v 1.1 2007/07/18 17:51:03 matsuu Exp $
-
-inherit eutils
-
-DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
-HOMEPAGE="http://clay.ll.pl/kanatest"
-
-SRC_URI="http://clay.ll.pl/kanatest/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND=">=x11-libs/gtk+-2.6
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	doicon kanatest.svg
-	make_desktop_entry "${PN}" Kanatest "${PN}" "GNOME;Education;X-KDE-Edu-Language;"
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-misc/kanatest/kanatest-0.4.4.ebuild b/app-misc/kanatest/kanatest-0.4.4.ebuild
deleted file mode 100644
index 4297d4368299..000000000000
--- a/app-misc/kanatest/kanatest-0.4.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/kanatest-0.4.4.ebuild,v 1.1 2008/08/09 00:52:27 matsuu Exp $
-
-inherit eutils
-
-DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
-HOMEPAGE="http://clay.ll.pl/kanatest"
-
-SRC_URI="http://clay.ll.pl/kanatest/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND=">=x11-libs/gtk+-2.6
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	doicon kanatest.svg
-	make_desktop_entry "${PN}" Kanatest "${PN}" "GNOME;Education;X-KDE-Edu-Language;"
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-misc/kanatest/kanatest-0.4.6.ebuild b/app-misc/kanatest/kanatest-0.4.6.ebuild
deleted file mode 100644
index df8bc413b9a7..000000000000
--- a/app-misc/kanatest/kanatest-0.4.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/kanatest-0.4.6.ebuild,v 1.1 2008/12/05 16:57:07 matsuu Exp $
-
-inherit eutils
-
-DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
-HOMEPAGE="http://clay.ll.pl/kanatest"
-
-SRC_URI="http://clay.ll.pl/kanatest/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND=">=x11-libs/gtk+-2.6
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	doicon kanatest.svg
-	make_desktop_entry "${PN}" Kanatest "${PN}" "GNOME;Education;X-KDE-Edu-Language;"
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-misc/kanatest/kanatest-0.4.8.ebuild b/app-misc/kanatest/kanatest-0.4.8.ebuild
index b707523feb0e..eec8e186e43b 100644
--- a/app-misc/kanatest/kanatest-0.4.8.ebuild
+++ b/app-misc/kanatest/kanatest-0.4.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/kanatest-0.4.8.ebuild,v 1.5 2010/03/23 20:39:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/kanatest-0.4.8.ebuild,v 1.6 2010/10/17 01:33:33 flameeyes Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
 HOMEPAGE="http://www.clayo.org/kanatest"
@@ -18,11 +18,16 @@ RDEPEND=">=x11-libs/gtk+-2.12
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}+gtk-2.22.patch
+	eautoreconf
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 
-	doicon kanatest.svg
-	make_desktop_entry "${PN}" Kanatest "${PN}" "GNOME;Education;X-KDE-Edu-Language;"
-
-	dodoc AUTHORS ChangeLog README
+	dodoc AUTHORS TRANSLATORS ChangeLog README || die
 }