Ebuild cleanup, fix for modular X support only (thanks Patrick Lauer for reporting bug #153008). Remove canna useflag as canna is the default.

(Portage version: 2.1.2_pre3-r9)

3 files changed, 31 insertions, 32 deletions

diff --git a/app-i18n/kinput2/ChangeLog b/app-i18n/kinput2/ChangeLog
index 2d7e4bffe176..38aae91adb48 100644
--- a/app-i18n/kinput2/ChangeLog
+++ b/app-i18n/kinput2/ChangeLog
@@ -1,6 +1,10 @@
 # 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.22 2006/10/14 11:03:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/ChangeLog,v 1.23 2006/10/27 18:18:22 flameeyes Exp $
+
+  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
+  reporting bug #153008). Remove canna useflag as canna is the default.
 
   14 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> kinput2-3.1-r1.ebuild:
   Fix DEPEND/RDEPEND and add missing dependency over libXaw. Thanks to Patrick
diff --git a/app-i18n/kinput2/files/digest-kinput2-3.1-r1 b/app-i18n/kinput2/files/digest-kinput2-3.1-r1
index 4894c0b9614b..e9fc64635338 100644
--- a/app-i18n/kinput2/files/digest-kinput2-3.1-r1
+++ b/app-i18n/kinput2/files/digest-kinput2-3.1-r1
@@ -1 +1,3 @@
 MD5 2de20576f150248d1fdfe66d7cc4e510 kinput2-v3.1.tar.gz 512177
+RMD160 c56684769859bbee5f8238cd1af061796ff931e8 kinput2-v3.1.tar.gz 512177
+SHA256 2815c35181f9e9b866fb6e7f3d9bb8814b98312aad703ce5c7560d449eb60a9a kinput2-v3.1.tar.gz 512177
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index 438216a0c8a5..0957407b9c34 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/kinput2-3.1-r1.ebuild,v 1.16 2006/10/14 11:03:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kinput2/kinput2-3.1-r1.ebuild,v 1.17 2006/10/27 18:18:22 flameeyes Exp $
 
 inherit eutils
 
@@ -12,20 +12,20 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
-IUSE="canna freewnn"
+IUSE="freewnn"
 
-RDEPEND="canna? ( >=app-i18n/canna-3.5_beta2-r1 )
-	!amd64? ( freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 ) )
+RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
 	!freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
-	|| ( x11-libs/libXaw <virtual/x11-7 )"
+	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
-		)
-		<virtual/x11-7
-	)"
+	x11-misc/gccmakedep
+	x11-misc/imake
+	app-text/rman"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -33,34 +33,27 @@ src_unpack() {
 	local mysed=""
 
 	unpack ${A}
-	epatch ${FILESDIR}/${PF}-gentoo.diff
+	epatch "${FILESDIR}/${PF}-gentoo.diff"
 
-	use canna \
-		&& mysed="${mysed} -e 's:/\* \(\#define UseCanna\) \*/:\\1:'"
-	use freewnn \
-		&& mysed="${mysed} -e 's:/\* \(\#define UseWnn\) \*/:\\1:'"
-
-	#use sj3 \
-	#	&& mysed="${mysed} -e 's:/\* \(\#Define UseSj3\) \*/:\\1:'"
-	#use atok \
-	#	&& mysed="${mysed} -e 's:/\* \(\#Define UseAtok\) \*/:\\1:'"
-	#use wnn6 \
-	#	&& mysed="${mysed} -e 's:/\* \(\#Define UseWnn6\) \*/:\\1:'"
-
-	use canna || use freewnn \
-		|| mysed="${mysed} -e 's:/\* \(\#define UseCanna\) \*/:\\1:'"
-
-	cp ${S}/Kinput2.conf ${T}
-	eval sed ${mysed} ${T}/Kinput2.conf > ${S}/Kinput2.conf || die
+	if use freewnn; then
+		sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' "${S}/Kinput2.conf"
+	else
+		sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' "${S}/Kinput2.conf"
+	fi
 }
 
 src_compile() {
 	xmkmf -a || die
-	make CDEBUGFLAGS="${CFLAGS}" || die
+	emake \
+		XAPPLOADDIR="/usr/share/X11/app-defaults/" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		|| die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die
+	rm -rf "${D}/usr/lib/X11"
 
 	dodoc README NEWS doc/*
 	newman cmd/${PN}.man ${PN}.1