Migrate to eapi3 and qt4-r2.eclass. Drop patch since that is taken care off by the eclass.

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

4 files changed, 15 insertions, 35 deletions

diff --git a/app-i18n/kimera/ChangeLog b/app-i18n/kimera/ChangeLog
index ad61ea78aab2..0e86d1e93e0e 100644
--- a/app-i18n/kimera/ChangeLog
+++ b/app-i18n/kimera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/kimera
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/ChangeLog,v 1.16 2009/05/15 21:36:33 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/ChangeLog,v 1.17 2010/03/27 00:18:15 yngwin Exp $
+
+  27 Mar 2010; Ben de Groot <yngwin@gentoo.org> kimera-2.11.ebuild,
+  -files/kimera-2.11-gentoo.patch:
+  Migrate to eapi3 and qt4-r2.eclass. Drop patch since that is taken care
+  off by the eclass.
 
   15 May 2009; Markus Meier <maekke@gentoo.org> kimera-2.11.ebuild:
   amd64 stable, bug #269834
diff --git a/app-i18n/kimera/Manifest b/app-i18n/kimera/Manifest
index 38ca6c9f3940..3e0f2916a3f0 100644
--- a/app-i18n/kimera/Manifest
+++ b/app-i18n/kimera/Manifest
@@ -1,5 +1,4 @@
-AUX kimera-2.11-gentoo.patch 405 RMD160 e9611658f49cf5a138ad0f0f49fb2de3ced5b20d SHA1 8c56d39e09eb168e02382d6fda7a14b1eb2e3009 SHA256 2fa94d765a39e9fb70c1cca27e110796834918a8d21db27bd068b1ec61c31ab4
 DIST kimera-2.11.tar.gz 106010 RMD160 0f9d95587a078118a225e3772bfda95612155a1d SHA1 9e6073c0927aaa3a4f4820c6728cfd06eb4e90ee SHA256 4c3ccb532be1d50fa37963a0f0dfa661d92c9c13fcf618c17c9c5dbd66217d98
-EBUILD kimera-2.11.ebuild 926 RMD160 dd6ed93512abc76fec70fe99bdca404460a8ac5f SHA1 16e481ff9f2253cd2aa268eccc1b4858e4500a7c SHA256 8e24fe2cb3afa00de254b40c759320e9b649f70039b556ec511cab2a1bf55224
-MISC ChangeLog 2356 RMD160 176866fb2a9188ab4429dde9d3148be62512b0cd SHA1 93b34903f9cda4d21f7b47ca5a8f0e30743d6682 SHA256 e29f6875c8e260ded6b812710485254a3c6ad9d987b06afe415eefa2deadf5a6
+EBUILD kimera-2.11.ebuild 746 RMD160 e38378c7c782bb88e24e745bc519068e69967c0a SHA1 c9ccd57f9414bed5d696c6d6de15c03f4e05e755 SHA256 beb25fd73b2f95721b3f665ad3ec43ffcaf02343d2d59d14efd6d523e7d4c0a0
+MISC ChangeLog 2555 RMD160 40c79db6b64c66a33535961bab53275f2d8cf847 SHA1 11794d22627ba0c5c04302f6cab06000e292a461 SHA256 d746741192d3e2767f512f120358b2fffc54de01619b85c1b27a64a03514029d
 MISC metadata.xml 355 RMD160 c1c10ed97e03e4a8b57694abd7d474909f308c48 SHA1 38da58f79834c4efa57c0fcefb9d3b59d47bca84 SHA256 3f7fff150e68a77ea53a1005143edef961f39ce50e58a556149202d1d3859e16
diff --git a/app-i18n/kimera/files/kimera-2.11-gentoo.patch b/app-i18n/kimera/files/kimera-2.11-gentoo.patch
deleted file mode 100644
index 41272a1589b4..000000000000
--- a/app-i18n/kimera/files/kimera-2.11-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur kimera-2.11.orig/kimera.pro kimera-2.11/kimera.pro
---- kimera-2.11.orig/kimera.pro	2009-01-26 00:36:40.000000000 +0900
-+++ kimera-2.11/kimera.pro	2009-02-11 09:12:00.000000000 +0900
-@@ -1,5 +1,5 @@
- TEMPLATE        = app
--CONFIG         += qt x11 warn_on release
-+CONFIG         += qt x11 warn_on release nostrip
- QT             += network
- TARGET          = kimera-bin
- VERSION         = 2.11
diff --git a/app-i18n/kimera/kimera-2.11.ebuild b/app-i18n/kimera/kimera-2.11.ebuild
index eb1bad0f1883..20ff230d35b1 100644
--- a/app-i18n/kimera/kimera-2.11.ebuild
+++ b/app-i18n/kimera/kimera-2.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-2.11.ebuild,v 1.4 2010/01/03 11:15:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-2.11.ebuild,v 1.5 2010/03/27 00:18:15 yngwin Exp $
 
-EAPI=1
-inherit eutils multilib qt4
+EAPI=3
+inherit qt4-r2
 
 DESCRIPTION="A Japanese input method which supports the XIM protocol"
 SRC_URI="mirror://sourceforge.jp/kimera/37271/${P}.tar.gz"
@@ -19,24 +19,10 @@ DEPEND="x11-libs/qt-core:4
 	!anthy? ( app-i18n/canna )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+DOCS="AUTHORS README*"
 
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
+src_configure() {
 	local myconf="target.path=/usr/$(get_libdir)/${P}"
-
 	use anthy || myconf="${myconf} no_anthy=1"
-
-	eqmake4 kimera.pro ${myconf} || die
-	emake || die
-}
-
-src_install(){
-	emake INSTALL_ROOT="${D}" install || die
-
-	dodoc AUTHORS README*
+	eqmake4 kimera.pro ${myconf}
 }