From 328d42c8865552a197d2fbd2ee8de66abc898d21 Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Sun, 18 Sep 2016 14:37:08 +0200
Subject: app-i18n/scim-tomoe: Stop relying on gucharmap:0

Package-Manager: portage-2.3.0
---
 app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild | 38 --------------------------
 app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild | 26 ++++++++++++++++++
 2 files changed, 26 insertions(+), 38 deletions(-)
 delete mode 100644 app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild
 create mode 100644 app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild

diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild
deleted file mode 100644
index 2831d2c6e201..000000000000
--- a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
-HOMEPAGE="http://tomoe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gucharmap"
-
-RDEPEND=">=app-i18n/scim-1.2.0
-	>=app-i18n/libtomoe-gtk-0.6.0[gucharmap=]
-	gucharmap? ( >=gnome-extra/gucharmap-1.4 )
-	>=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.0"
-
-src_prepare() {
-	# Fix build with gcc-4.3, bug #
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	# Fix build with gucharmap-2.24, bug #243160
-	epatch "${FILESDIR}/${P}-gucharmap2.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild
new file mode 100644
index 000000000000..54ba846fd5cd
--- /dev/null
+++ b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM"
+HOMEPAGE="http://tomoe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-i18n/scim-1.2.0
+	>=app-i18n/libtomoe-gtk-0.6.0
+	>=x11-libs/gtk+-2.4:2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35.0
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
-- 
cgit v1.2.3-65-gdbad