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

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

8 files changed, 55 insertions, 124 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/Manifest b/app-misc/kanatest/Manifest
index 4ca54cf49432..82f5a9972215 100644
--- a/app-misc/kanatest/Manifest
+++ b/app-misc/kanatest/Manifest
@@ -1,12 +1,15 @@
-DIST kanatest-0.4.2.tar.gz 335955 RMD160 71901a1d8aba44880ae168055227ab939c88ecbd SHA1 cca20787391a44d15acca496e4d795f8231da221 SHA256 c6b00757fd10d6ffea5bf250527192566f06725ff0e2636c9d25087f26e944c2
-DIST kanatest-0.4.3.tar.gz 323448 RMD160 7b8052ff0ef492b4f5a84ee3a72bd7e0f811cfc3 SHA1 96e8f4b8f84f014b41113daf85c81b8a50f73c6a SHA256 f5852b4a9e3f59ba286237019ebdc905b53e22f309fc8967060d0a5be3ce50ff
-DIST kanatest-0.4.4.tar.gz 292813 RMD160 02d5f725ff29c0115f50f0106c996e23408f0218 SHA1 373c73363d1961d5f217f4b70c6404796fd73be2 SHA256 107ba6a7a8c6f18273b8da3e154b419077392851e4bb9cfba2de20f904fc9929
-DIST kanatest-0.4.6.tar.gz 276643 RMD160 7827fd18a5a1bf4c2df60022b94f72327c4fb234 SHA1 4df8e0d760c2de8bb81942505ec94abf9f976dc0 SHA256 0c21bcd41cdab1731b2c3d2c05baa31eb30799e45cbbacc3420938b9c9399aa8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kanatest-0.4.8+gtk-2.22.patch 967 RMD160 f9c47b91e26605e8774484ad8765910142986330 SHA1 bf4ac8a022debf13d24207efa9421a5465280f85 SHA256 9edd7f678175120232db936bcc4b58064d1087ac9af71f70e9bb7c694ff42fa1
 DIST kanatest-0.4.8.tar.gz 302154 RMD160 40862600bffe34e57a231003ab5597e6ac3436fb SHA1 4f316b28898d37597230c918d6ec01b491d66a35 SHA256 a31682604bc6db9c0cb2e15429b8a5b64c04f1ed96df912cab71d4337567c513
-EBUILD kanatest-0.4.2.ebuild 651 RMD160 f314240c5319c56f6b09dd6800936f5227e0499c SHA1 062800f6b20005987811a70e66d3e4bb4ba55614 SHA256 4c36d70f4d9cf10171508350682793fb0f5bf4a980f6e3b5b0a1f7a71cef3578
-EBUILD kanatest-0.4.3.ebuild 772 RMD160 f6a4eb496d47c71e5220c62d9285d09307dd1a14 SHA1 df902b3694d94ce3a2b1bb0c1c745bb35b767c27 SHA256 12cab79c16bf41e91b7f09bd3098863cd64da82a3f8372bd062a273f4246559e
-EBUILD kanatest-0.4.4.ebuild 772 RMD160 608b4eeb41c16e04d24dcbcbb4cde65ae7c6df84 SHA1 41c31946b118b25e104aff3e8ee9b7f194cfd27f SHA256 d2f18b8513a04e08c05cc8d2663dda8b32bb6a01855abeac55148d27a83f3d36
-EBUILD kanatest-0.4.6.ebuild 772 RMD160 ef90f7548bee39d977b429bb7c7abc4d8eb304e4 SHA1 c95bb83e1df314536bc5048210f220258ec1f14d SHA256 bb7eada0a34513907993af211c9c9878a6ccbbddbbec03f800ae2b36e29964db
-EBUILD kanatest-0.4.8.ebuild 775 RMD160 df4ebd01b08bfe83f5cbf67f4544c4f6316aff79 SHA1 1d298a60a2814c2330199f65e0015dcab897ddc6 SHA256 4b3b42317f31318fa40a01780e60eae3269f7bb3983231b925df8b2934d5a6a2
-MISC ChangeLog 3306 RMD160 643c0364460d2bafd13ef4df388d678e3689ef56 SHA1 2d8a97aeb9930a896a22034a048ab9c9ce91a9c0 SHA256 bfa8b374d7a6d335be320dc336e42c1e0b7b8f825a2111b0944beb9d5c2a087a
+EBUILD kanatest-0.4.8.ebuild 800 RMD160 5c6cf875a80257e4fa8dd03a99e8d9d8b6f15c78 SHA1 0a021daceddb540ae767d237adc6508bac31b5d2 SHA256 97438f6f2ce4cb2cc58b5c0ef718fd83ef651330bd8b462f1db6d980f2bf3d8a
+MISC ChangeLog 3670 RMD160 7be9213b15ee3b9685eb9376ed0ad32c70f132cd SHA1 e8f4489052729b908de1bcfae732f2ccf00e9912 SHA256 bf87af9d687d786f7869ee0b2b04c867f7c93d5eee82e83378e679037fed4aff
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky6Un8ACgkQAiZjviIA2Xig6gCbBixg3D+wPtf5pD6oUgImmlYh
+NqYAoOZe6JPlWSS5cB8U7DqA3GFO/Lz6
+=Ae+l
+-----END PGP SIGNATURE-----
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
 }