Added imsettings related file. Clean up.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 111 insertions, 3 deletions

diff --git a/app-i18n/kinput2/ChangeLog b/app-i18n/kinput2/ChangeLog
index 38aae91adb48..b701504f3052 100644
--- a/app-i18n/kinput2/ChangeLog
+++ b/app-i18n/kinput2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/kinput2
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.23 2006/10/27 18:18:22 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.24 2012/01/22 11:14:22 matsuu Exp $
+
+*kinput2-3.1-r2 (22 Jan 2012)
+
+  22 Jan 2012; MATSUU Takuto <matsuu@gentoo.org> +files/xinput-kinput2,
+  +kinput2-3.1-r2.ebuild:
+  Added imsettings related file. Clean up.
 
   27 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> kinput2-3.1-r1.ebuild:
   Ebuild cleanup, fix for modular X support only (thanks Patrick Lauer for
diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest
index 5137fbda8f4a..78936ce756a2 100644
--- a/app-i18n/kinput2/Manifest
+++ b/app-i18n/kinput2/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kinput2-3.1-r1-gentoo.diff 3806 RMD160 a3b05457dbb0738f2b85b37c1097a138a9167f57 SHA1 371105d0fd28d473e6ebbf928118b4bb70bc5680 SHA256 58e6292f03e23103a31ab0dfb614d0e2fa801bfef56a33f539e9bf6d3c7d792c
+AUX xinput-kinput2 119 RMD160 624c7118e675176186443f0c83d61dfb610270ff SHA1 4275b2bf78590842978037b7ad8be643dbef2be3 SHA256 7011b2a2a84ed3d7c06d597850640331de96a6f5943d1c376f74017040c773df
 DIST kinput2-v3.1.tar.gz 512177 RMD160 c56684769859bbee5f8238cd1af061796ff931e8 SHA1 48050f70e7c0cc67193ea260f8d7f6e822a02ca3 SHA256 2815c35181f9e9b866fb6e7f3d9bb8814b98312aad703ce5c7560d449eb60a9a
 EBUILD kinput2-3.1-r1.ebuild 1410 RMD160 a335f7eb347f09ab49d53079362983c16afc91ea SHA1 f25199328a5b6cef54512446cf2d53f0723a81de SHA256 a03302a6986268f3363e675919f97899bbaf10f870bfb679f3628fab8bd3d4dc
-MISC ChangeLog 2949 RMD160 721021b3837caff097d828dc3bcf673a5e7bcae8 SHA1 3929c8ba89430fa2104f3349d9c9178645429bf5 SHA256 d0cd1cda455100fdcd6fa28411d5df4dc234bbcc1f3f82f99b61062e6a879f16
+EBUILD kinput2-3.1-r2.ebuild 1726 RMD160 c2b9c00fc4d8c45ad08951553879a96b0052a8d5 SHA1 1556b3c4266e498136a8c4df7fc07980542aa118 SHA256 40144757e613694ba341a23aa916813c4c29acf59557640a93b11f2975e7fc62
+MISC ChangeLog 3119 RMD160 716dce3f4ee84568318ee40cb6bbaabca9d8e577 SHA1 0a92369e561c33276169c3d28bba945f5c7cc46e SHA256 7ec135146523459e1f1184c5e10f4ed81233e562041bda13640dd479fc5456ca
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPG++UAAoJECaGw+YFKA1pfiYP/0cZnxa+7D5nPFmLEL2h0h+y
+Xx9no5SNRGHxiynV1xchYlJZpv+567tPnoqtLbccrjZbWvoc01duLHM856lZKXVa
+/NkQaCmJk7B7vJG/zlcym+2NnOXjeWhfmFWo1GsZbiY2Yq9GdOuEcWZFAyugsHyP
+FN23I1/RCwK/Hf4P3PU8y26iOnis7+Hz7D0+dKZywa0oS8VQSKOB9/xIlzuMaymG
+tC+PI5S04xkZUG3JMXog88MysWQAXq5wpCu917lrrHTwr19SHidMWyFJaS6sZDlw
+skAfq71jMg5ZLdkZ8W/znWwyigSoyGGvZX4p8QeBxFdSapgq/qFZ3rH3JLkPV6ZH
+gYAe7b8lvkIp8Q8ClECsnjVl5SYETU3UpnPiFvm7V+JaplTdAMHb7OehjEHgXJ3j
+GuId3FldzZtwk6mFGG/uPB2QIrckVBCouiTvHSy9OGDalZ13yNahQH0J2vaE6ipP
+umD4ctDXj4RzItiUNacGHqNff9DmkAwsD9ikENaIxyRUAkKhP8ojDLxFhrEelCt3
+hQtwj6A/hxhezD+tNou8K/WGxCrVdIddd7fygzQWDPUhMxi6DSeS+fgfh91za9tf
+paKQG+Qw5MB6MuAcCe29eQAzaO8QkKJyy9ZKYhGKMgwsXb+Gy2qbHOYa/JWf7CEk
+4pOMj159wvPlEr9ljbqC
+=Der2
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2
new file mode 100644
index 000000000000..16de07ca4f7e
--- /dev/null
+++ b/app-i18n/kinput2/files/xinput-kinput2
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM=@EPREFIX@/usr/bin/kinput2
+XIM_ARGS="-@SERVER@ +kinput -xim"
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
new file mode 100644
index 000000000000..dc47a8902d91
--- /dev/null
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/kinput2-3.1-r2.ebuild,v 1.1 2012/01/22 11:14:22 matsuu Exp $
+
+EAPI="3"
+inherit eutils
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="A Japanese input server which supports the XIM protocol"
+HOMEPAGE="http://www.nec.co.jp/canna/"
+SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="freewnn"
+
+RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
+	!freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXt"
+
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake
+	app-text/rman"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-r1-gentoo.diff"
+
+	if use freewnn; then
+		sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf || die
+	else
+		sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf || die
+	fi
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults/" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		|| die
+}
+
+src_install() {
+	emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die
+	rm -rf "${ED}/usr/lib/X11" || die
+
+	local server
+	if use freewnn; then
+		server="wnn"
+	else
+		server="canna"
+	fi
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		-e "s:@SERVER@:${server}:g" \
+		"${FILESDIR}/xinput-kinput2" > "${T}/kinput2.conf" || die
+	doins "${T}/kinput2.conf" || die
+
+	dodoc README NEWS doc/* || die
+	newman cmd/${PN}.man ${PN}.1 || die
+}