Removed debug IUSE flag. Added to ~alpha

5 files changed, 14 insertions, 83 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index 116b1e218ea0..425612afa7a8 100644
--- a/app-i18n/im-ja/ChangeLog
+++ b/app-i18n/im-ja/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/im-ja
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.20 2004/05/05 08:44:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.21 2004/05/11 15:14:44 usata Exp $
+
+  12 May 2004; Mamoru KOMACHI <usata@gentoo.org> im-ja-0.9-r1.ebuild,
+  im-ja-1.0-r2.ebuild:
+  Removed debug IUSE flag. Added to ~alpha
 
   05 May 2004; Mamoru KOMACHI <usata@gentoo.org> im-ja-0.8.ebuild,
   im-ja-0.9.ebuild, im-ja-1.0-r1.ebuild, im-ja-1.0-r2.ebuild:
diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest
index cd5175b6942b..946bd9dd10cc 100644
--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@@ -1,10 +1,8 @@
 MD5 cfdc56b4c59d99efad4e44cec2b7b3dd im-ja-0.8.ebuild 1169
-MD5 a3c3f6f03c289a41fb084d1e13be6fea ChangeLog 3382
+MD5 1c9be6870bfaae30c3e1cc906ac59706 ChangeLog 3519
 MD5 e6a4d014e5f606f6a37e9d2e6906a988 metadata.xml 605
-MD5 e9d26ec11b7610c7301205f318322704 im-ja-0.9-r1.ebuild 1991
-MD5 cceaf9d9e441b561363764230c8c843b im-ja-1.0-r2.ebuild 2074
+MD5 54e1236705667dc415ba135a98ae17eb im-ja-1.0-r2.ebuild 2151
 MD5 1a5a47abfb65885d8a267ee51b76bb91 files/digest-im-ja-0.8 61
 MD5 8610fb143f74a3c34b8b9c76789c786a files/im-ja-0.9-canna-3.7-gentoo.diff 350
-MD5 f5fcbcecfe2f5d739d30e25f60f20c9f files/digest-im-ja-0.9-r1 61
 MD5 b057732bc6dfad29602fbc0546dc054b files/im-ja-0.9-gtk24-gentoo.diff 2017
 MD5 11de023a5b832cf863b4da9d9e1a4ad7 files/digest-im-ja-1.0-r2 61
diff --git a/app-i18n/im-ja/files/digest-im-ja-0.9-r1 b/app-i18n/im-ja/files/digest-im-ja-0.9-r1
deleted file mode 100644
index c4b327706e2a..000000000000
--- a/app-i18n/im-ja/files/digest-im-ja-0.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bde9e0d85b39591d132c700d5d87047 im-ja-0.9.tar.gz 717708
diff --git a/app-i18n/im-ja/im-ja-0.9-r1.ebuild b/app-i18n/im-ja/im-ja-0.9-r1.ebuild
deleted file mode 100644
index 16c3bac441f9..000000000000
--- a/app-i18n/im-ja/im-ja-0.9-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2004 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.9-r1.ebuild,v 1.5 2004/04/06 03:53:32 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A Japanese input module for GTK2 and XIM"
-HOMEPAGE="http://im-ja.sourceforge.net/"
-SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
-	http://im-ja.sourceforge.net/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE="gnome canna freewnn debug"
-
-DEPEND="dev-lang/perl
-	dev-perl/URI
-	${RDEPEND}"
-RDEPEND="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
-	>=gnome-base/libglade-2.0
-	gnome? ( >=gnome-base/gnome-panel-2.0 )
-	freewnn? ( app-i18n/freewnn )
-	canna? ( app-i18n/canna )"
-
-DOCS="AUTHORS README ChangeLog TODO"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-canna-3.7-gentoo.diff
-	# fix for the bug #45246
-	if has_version '>=x11-libs/gtk+-2.4' ; then
-		use debug || find . -name 'Makefile*' \
-			-exec sed -i -e "/DEPRECATED/d" {} \;
-		cd src
-		epatch ${FILESDIR}/${P}-gtk24-gentoo.diff
-	fi
-}
-
-src_compile() {
-	local myconf
-	export WANT_AUTOMAKE=1.8
-	use gnome || myconf="$myconf --disable-gnome"
-	use canna || myconf="$myconf --disable-canna"
-	use freewnn || myconf="$myconf --disable-wnn"
-	use debug && myconf="$myconf --enable-debug"
-	gnome2_src_compile $myconf
-}
-
-pkg_postinst(){
-	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	gnome2_pkg_postinst
-	einfo
-	einfo "This version of im-ja comes with experimental XIM support."
-	einfo "If you'd like to try it out, run im-ja-xim-server and set"
-	einfo "environment variable XMODIFIERS to @im=im-ja-xim-server"
-	einfo "e.g.)"
-	einfo "\t$ export XMODIFIERS=@im=im-ja-xim-server (sh)"
-	einfo "\t> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
-	einfo
-}
-
-pkg_postrm(){
-	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	gnome2_pkg_postrm
-}
diff --git a/app-i18n/im-ja/im-ja-1.0-r2.ebuild b/app-i18n/im-ja/im-ja-1.0-r2.ebuild
index 9a0f1d942a66..fa449d57d5ee 100644
--- a/app-i18n/im-ja/im-ja-1.0-r2.ebuild
+++ b/app-i18n/im-ja/im-ja-1.0-r2.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2004 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-1.0-r2.ebuild,v 1.2 2004/05/05 08:44:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.0-r2.ebuild,v 1.3 2004/05/11 15:14:44 usata Exp $
 
 inherit gnome2
 
-IUSE="gnome canna freewnn skk anthy debug"
+IUSE="gnome canna freewnn skk anthy"
+# --enable-debug causes build failure with gtk+-2.4
+#IUSE="${IUSE} debug"
 
 DESCRIPTION="A Japanese input module for GTK2 and XIM"
 HOMEPAGE="http://im-ja.sourceforge.net/"
 SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
 	http://im-ja.sourceforge.net/old/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ~ppc ~alpha"
 SLOT="0"
 
 DOCS="AUTHORS README ChangeLog TODO"
@@ -32,7 +34,7 @@ RDEPEND="virtual/glibc
 	skk? ( virtual/skkserv )
 	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )"
 
-use debug && RESTRICT="nostrip"
+#use debug && RESTRICT="nostrip"
 
 src_compile() {
 	local myconf
@@ -44,7 +46,7 @@ src_compile() {
 	use freewnn || myconf="$myconf --disable-wnn"
 	use anthy || myconf="$myconf --disable-anthy"
 	use skk || myconf="$myconf --disable-skk"
-	use debug && myconf="$myconf --enable-debug"
+	#use debug && myconf="$myconf --enable-debug"
 	gnome2_src_compile $myconf || die
 }