modified 50anthy-gentoo.el. changed ~x86 to x86. added metadata.xml

5 files changed, 47 insertions, 40 deletions

diff --git a/app-i18n/anthy/ChangeLog b/app-i18n/anthy/ChangeLog
index 284206fa8518..65ef31628278 100644
--- a/app-i18n/anthy/ChangeLog
+++ b/app-i18n/anthy/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for app-i18n/anthy
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/ChangeLog,v 1.2 2003/08/24 18:54:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/ChangeLog,v 1.3 2003/09/04 19:15:04 usata Exp $
 
 *anthy-4300b (20 Aug 2003)
 
+  05 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> anthy-4300b.ebuild,
+  files/50anthy-gentoo.el:
+  Modified 50anthy-gentoo.el to activate anthy.el when you press C-\
+  (It wasn't activated by default if you had (set-language-environment
+  "Japanese") in your ${HOME}/.emacs).  Marked as stable.
+
   25 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> anthy-4300b.ebuild:
   Removed undesired emacs dependency when USE="-emacs".  Thanks to
   Hattya-san <hattya@inter7.jp> in Bug #27175
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index 852dd327c37e..606e343c8d46 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,4 +1,5 @@
-MD5 f2c5bf4ed09553a7a19a8b5141c84ad4 anthy-4300b.ebuild 1105
-MD5 c2fac8be5981a7b00077c2d9db6426ff ChangeLog 678
+MD5 c8705914e6d4b55d82ea00b4b299cc19 anthy-4300b.ebuild 1041
+MD5 8fb759b746661a0734409d56ec7e3618 metadata.xml 540
+MD5 ceb3f9b014d8a65bd5f01f872de596e5 ChangeLog 973
 MD5 83e271d277525e627be3756f01c7010e files/digest-anthy-4300b 64
-MD5 feef50f928e4da72ce6c4fc75410f47b files/50anthy-gentoo.el 194
+MD5 d91fcb424ec63b588900d2d88a8bcee2 files/50anthy-gentoo.el 99
diff --git a/app-i18n/anthy/anthy-4300b.ebuild b/app-i18n/anthy/anthy-4300b.ebuild
index ae6b0b033576..7d14cef9a374 100644
--- a/app-i18n/anthy/anthy-4300b.ebuild
+++ b/app-i18n/anthy/anthy-4300b.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-4300b.ebuild,v 1.2 2003/08/24 18:54:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-4300b.ebuild,v 1.3 2003/09/04 19:15:04 usata Exp $
+
+inherit elisp
 
 IUSE="emacs"
 
@@ -9,51 +11,38 @@ HOMEPAGE="http://anthy.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/anthy/5332/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 SLOT="0"
 
 S="${WORKDIR}/${P}"
 
-DEPEND="virtual/glibc
-	emacs? ( virtual/emacs )"
-
-SITEFILE="50anthy-gentoo.el"
-SITELISP=/usr/share/emacs/site-lisp
+E_DEPEND="emacs? ( ${E_DEPEND} )"
+E_RDEPEND="emacs? ( ${E_DEPEND} )"
+DEPEND="virtual/glibc"
+
+if [ -n "`use emacs`" ] ; then
+	SITEFILE="50anthy-gentoo.el"
+else
+	pkg_postinst () {
+		einfo "Emacs support is disabled."
+	}
+	pkg_postrm () {
+		einfo "Emacs support is disabled."
+	}
+fi
 
 src_compile() {
-	local myconf=""
-
-	use emacs \
-		|| myconf="${myconf} EMACS=no"
 
-	econf ${myconf} || die
+	econf `use emacs >/dev/null 2>&1 || echo EMACS=no` || die
 	emake || die
 }
 
 src_install() {
+
 	einstall || die
 
-	if [ -n "` use emacs`" ] ; then
-		insinto ${SITELISP}
-		doins ${FILESDIR}/${SITEFILE}
-	fi
+	use emacs && elisp-site-file-install ${FILESDIR}/${SITEFILE}
 
 	dodoc AUTHORS ChangeLog DIARY INSTALL NEWS README \
 		doc/[A-Z][A-Z]* doc/protocol.txt
 }
-
-pkg_postinst() {
-
-	if [ -n "` use emacs`" ] ; then
-		inherit elisp
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-
-	if [ -n "` use emacs`" ] ; then
-		inherit elisp
-		elisp-site-regen
-	fi
-}
diff --git a/app-i18n/anthy/files/50anthy-gentoo.el b/app-i18n/anthy/files/50anthy-gentoo.el
index 6746c84228a6..a166df146539 100644
--- a/app-i18n/anthy/files/50anthy-gentoo.el
+++ b/app-i18n/anthy/files/50anthy-gentoo.el
@@ -1,7 +1,5 @@
 
 ;;; anthy site-lisp configuration
 
-(push "/usr/share/emacs/site-lisp/anthy" load-path)
-(load-library "anthy")
-(set-language-environment "Japanese")
-(setq default-input-method "japanese-anthy")
+(set-language-info "Japanese" 'input-method "japanese-anthy")
+
diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
new file mode 100644
index 000000000000..bfdbd2e80b35
--- /dev/null
+++ b/app-i18n/anthy/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+<herd>emacs</herd>
+<longdescription>
+Anthy is a free and secure Japanese kana-kanji server.  This ebuild
+includes cannadic as a server-side dictionary, so you don't need any
+extra package to run it.  You can use anthy with app-i18n/jmode (XIM),
+app-i18n/uim(XIM, GTK+ immodule) and emacs (to enable Anthy support
+for emacs, build this package with emacs USE flag).
+</longdescription>
+</pkgmetadata>