Fix compilation problem in Bug #27896. Marked stable on x86 for im-ja-0.6

4 files changed, 71 insertions, 39 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index d574996a97c5..ed05fc0188b5 100644
--- a/app-i18n/im-ja/ChangeLog
+++ b/app-i18n/im-ja/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-i18n/im-ja
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.5 2003/08/20 00:56:40 yakina Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.6 2003/09/04 14:39:45 usata Exp $
 
 *im-ja-0.7_p2 (20 Aug 2003)
 
@@ -9,6 +9,11 @@
 
 *im-ja-0.6 (07 Jul 2003)
 
+  04 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> im-ja-0.4.ebuild,
+  im-ja-0.6.ebuild:
+  Added -I/usr/include/wnn to fix compilation bug in #27896.
+  Marked stable on x86 for im-ja-0.6.
+
   07 Jul 2003; Masatomo Nakano <nakano@gentoo.org> im-ja-0.6.ebuild:
   Version bump. closed #23965
 
diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest
index 12102405627a..4fdd36d0709c 100644
--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@@ -1,10 +1,10 @@
+MD5 a300301d661668d4051d256453291b6c ChangeLog 1236
+MD5 a839be5f8502638a4241719f1036d451 im-ja-0.4.ebuild 957
+MD5 5ee089dda85e47d8a5cccbf9c4ee463f im-ja-0.6.ebuild 1657
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 da4f9455f40d857fe5f3933e2b65c434 im-ja-0.5.ebuild 1591
 MD5 fed360ec96b59abdca4c9ed55e58bf48 im-ja-0.7_p2.ebuild 1217
-MD5 25d6b2f2492dc872d23e3bcb4127db5a im-ja-0.4.ebuild 845
-MD5 2bd3497c8b9c8bd2e792264da50f6454 ChangeLog 1050
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 800b2e7324cfa80ef429b66e9952b086 im-ja-0.6.ebuild 1591
-MD5 6f3230b84289fc2f9a9a255f604f324b files/digest-im-ja-0.7_p2 63
 MD5 21cfa892d1937a4396772e7d1582316f files/digest-im-ja-0.4 61
 MD5 8116d40492e309d8a6bcf4ff70bcb49f files/digest-im-ja-0.5 61
 MD5 0d70fbe4f0f67a7a474c20b9f047c60b files/digest-im-ja-0.6 61
+MD5 6f3230b84289fc2f9a9a255f604f324b files/digest-im-ja-0.7_p2 63
diff --git a/app-i18n/im-ja/im-ja-0.4.ebuild b/app-i18n/im-ja/im-ja-0.4.ebuild
index 48a5fece4153..ef9b994cbad5 100644
--- a/app-i18n/im-ja/im-ja-0.4.ebuild
+++ b/app-i18n/im-ja/im-ja-0.4.ebuild
@@ -1,38 +1,45 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.4.ebuild,v 1.1 2003/05/15 17:25:25 yakina Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.4.ebuild,v 1.2 2003/09/04 14:39:45 usata Exp $
 
 DESCRIPTION="A Japanese input module for GTK2"
 HOMEPAGE="http://im-ja.sourceforge.net/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="${HOMEPAGE}${P}.tar.gz
+	${HOMEPAGE}old/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 SLOT=0
 IUSE=""
 
 DEPEND="virtual/glibc
-		>=dev-libs/glib-2.2.1
-		>=dev-libs/atk-1.2.2
-		>=x11-libs/gtk+-2.2.1
-		>=x11-libs/pango-1.2.1
-		>=gnome-base/gconf-2.2
-		app-i18n/freewnn
-		app-i18n/canna"
+	>=dev-libs/glib-2.2.1
+	>=dev-libs/atk-1.2.2
+	>=x11-libs/gtk+-2.2.1
+	>=x11-libs/pango-1.2.1
+	>=gnome-base/gconf-2.2
+	app-i18n/freewnn
+	app-i18n/canna"
 
 src_compile() {
-	econf
+
+	export CPPFLAGS="${CPPFLAGS} -I/usr/include/wnn -I/usr/include/canna"
+	econf || die
 	emake || die "make failed"
 }
 
 src_install () {
-	einstall
-	dodoc AUTHORS COPYING README ChangeLog
+
+	einstall || die
+
+	dodoc AUTHORS README ChangeLog NEWS TODO
 }
 
 pkg_postinst(){
+
 	gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
 }
 
 pkg_postrm(){
+
 	gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
 }
diff --git a/app-i18n/im-ja/im-ja-0.6.ebuild b/app-i18n/im-ja/im-ja-0.6.ebuild
index e97894a56551..62e6ac1f4d76 100644
--- a/app-i18n/im-ja/im-ja-0.6.ebuild
+++ b/app-i18n/im-ja/im-ja-0.6.ebuild
@@ -1,55 +1,75 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.6.ebuild,v 1.1 2003/07/07 17:29:48 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.6.ebuild,v 1.2 2003/09/04 14:39:45 usata Exp $
 
 DESCRIPTION="A Japanese input module for GTK2"
 HOMEPAGE="http://im-ja.sourceforge.net/"
 SRC_URI="${HOMEPAGE}${P}.tar.gz
 	${HOMEPAGE}old/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 SLOT=0
+
 IUSE="canna freewnn"
 
 DEPEND="virtual/glibc
-		>=dev-libs/glib-2.2.1
-		>=dev-libs/atk-1.2.2
-		>=x11-libs/gtk+-2.2.1
-		>=x11-libs/pango-1.2.1
-		>=gnome-base/gconf-2.2
-		freewnn? ( app-i18n/freewnn )
-		canna? ( app-i18n/canna )"
+	>=dev-libs/glib-2.2.1
+	>=dev-libs/atk-1.2.2
+	>=x11-libs/gtk+-2.2.1
+	>=x11-libs/pango-1.2.1
+	>=gnome-base/gconf-2.2
+	freewnn? ( app-i18n/freewnn )
+	canna? ( app-i18n/canna )"
+
+GCONFDIR=$(gconftool-2 --get-default-source | sed -e "s|^xml::/|${D}|")
 
 src_unpack() {
+
 	unpack ${A}
+
 	cd ${S}/data
 	# work around
-	sed -e "s|\(GCONF_CONFIG_SOURCE=\)\$(GCONF_CONFIG_SOURCE)|\1\$(GCONF_SCHEMA_CONFIG_SOURCE)|" < Makefile.in > Makefile.in.tmp
-	cp Makefile.in.tmp Makefile.in
+	dosed "s:\(GCONF_CONFIG_SOURCE=\)\$(GCONF_CONFIG_SOURCE):\1\$(GCONF_SCHEMA_CONFIG_SOURCE):" Makefile.in
 }
 
 src_compile() {
-	local gconfdir="`gconftool-2 --get-default-source | sed -e \"s|^xml::/|$D|\"`"
-	local myconf="--with-gconf-source=xml::${gconfdir}"
-	use canna || myconf="$myconf --disable-canna"
-	use freewnn || myconf="$myconf --disable-wnn"
-	econf $myconf
+
+	local myconf
+
+	if [ -n "`use canna`" ] ; then
+		export CPPFLAGS="${CPPFLAGS} -I/usr/include/canna"
+	else
+		myconf="${myconf} --disable-canna"
+	fi
+	if [ -n "`use freewnn`" ] ; then
+		export CPPFLAGS="${CPPFLAGS} -I/usr/include/wnn"
+	else
+		myconf="${myconf} --disable-wnn"
+	fi
+
+	econf --with-gconf-source=xml::${GCONFDIR} \
+		${myconf} || die "econf failed"
 	emake || die "make failed"
 }
 
 src_install () {
-	local gconfdir="`gconftool-2 --get-default-source | sed -e \"s|^xml::/|$D|\"`"
-	einstall
+
+	einstall || die
+
 	# /etc/gconf should be world readable
-	find ${gconfdir} -type d | xargs chmod -R +rx
-	find ${gconfdir} -type f | xargs chmod -R +r
-	dodoc AUTHORS COPYING README ChangeLog
+	find ${GCONFDIR} -type d | xargs chmod -R +rx
+	find ${GCONFDIR} -type f | xargs chmod -R +r
+
+	dodoc AUTHORS README ChangeLog TODO NEWS
 }
 
 pkg_postinst(){
+
 	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
 
 pkg_postrm(){
+
 	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }