Fixed LICENSE. Removed old versions. drop ucs4 local USE flag.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

8 files changed, 11 insertions, 300 deletions

diff --git a/app-i18n/anthy/ChangeLog b/app-i18n/anthy/ChangeLog
index c91297a57e07..8cc720572e0c 100644
--- a/app-i18n/anthy/ChangeLog
+++ b/app-i18n/anthy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/anthy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/ChangeLog,v 1.127 2009/08/09 12:35:26 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/ChangeLog,v 1.128 2009/09/17 16:32:11 matsuu Exp $
+
+  17 Sep 2009; MATSUU Takuto <matsuu@gentoo.org> -anthy-7500b.ebuild,
+  -anthy-7900.ebuild, anthy-9100d.ebuild, -anthy-9100e.ebuild,
+  -anthy-9100g.ebuild, anthy-9100h.ebuild:
+  Fixed LICENSE. Removed old versions.
 
   09 Aug 2009; nixnut <nixnut@gentoo.org> anthy-9100h.ebuild:
   ppc stable #275687
diff --git a/app-i18n/anthy/anthy-7500b.ebuild b/app-i18n/anthy/anthy-7500b.ebuild
deleted file mode 100644
index d0557fba6553..000000000000
--- a/app-i18n/anthy/anthy-7500b.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-7500b.ebuild,v 1.11 2008/01/26 17:47:43 grobian Exp $
-
-inherit elisp-common eutils autotools libtool
-
-IUSE="emacs ucs4"
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/19902/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
-SLOT="0"
-
-DEPEND="!app-i18n/anthy-ss
-	emacs? ( virtual/emacs )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	eautomake
-
-	elibtoolize
-
-}
-
-src_compile() {
-
-	local myconf
-	local cannadicdir=/var/lib/canna/dic/canna
-
-	use emacs || myconf="EMACS=no"
-	use ucs4 && myconf="${myconf} --enable-ucs4"
-
-	if has_version 'app-dicts/canna-2ch'; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		sed -i -e /placename/a"read ${cannadicdir}/nichan.ctd" \
-			mkworddic/dict.args.in
-	fi
-
-	econf ${myconf} || die
-	emake -j1 || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/50anthy-gentoo.el
-
-	dodoc AUTHORS DIARY NEWS README ChangeLog
-
-	rm doc/Makefile*
-	dodoc doc/*
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	use emacs && elisp-site-regen
-
-}
diff --git a/app-i18n/anthy/anthy-7900.ebuild b/app-i18n/anthy/anthy-7900.ebuild
deleted file mode 100644
index 4c23938bc808..000000000000
--- a/app-i18n/anthy/anthy-7900.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-7900.ebuild,v 1.9 2008/01/26 17:47:43 grobian Exp $
-
-inherit autotools elisp-common eutils
-
-IUSE="emacs ucs4"
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/20887/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
-SLOT="0"
-
-DEPEND="!app-i18n/anthy-ss
-	emacs? ( virtual/emacs )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	local cannadicdir=/var/lib/canna/dic/canna
-
-	if has_version 'app-dicts/canna-2ch'; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		sed -i /placename/a"read ${cannadicdir}/nichan.ctd" \
-			mkworddic/dict.args.in
-	fi
-
-	epatch "${FILESDIR}"/${P}-asneeded.diff
-
-	eautomake
-	elibtoolize
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use emacs || myconf="EMACS=no"
-	use ucs4 && myconf="${myconf} --enable-ucs4"
-
-	econf ${myconf} || die
-	emake -j1 || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/50anthy-gentoo.el
-
-	dodoc AUTHORS DIARY NEWS README ChangeLog
-
-	docinto doc
-	rm doc/Makefile*
-	dodoc doc/*
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	use emacs && elisp-site-regen
-
-}
diff --git a/app-i18n/anthy/anthy-9100d.ebuild b/app-i18n/anthy/anthy-9100d.ebuild
index e820185fef73..612c18d7855e 100644
--- a/app-i18n/anthy/anthy-9100d.ebuild
+++ b/app-i18n/anthy/anthy-9100d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-9100d.ebuild,v 1.8 2008/03/07 16:34:08 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-9100d.ebuild,v 1.9 2009/09/17 16:32:12 matsuu Exp $
 
 inherit elisp-common eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="Anthy -- free and secure Japanese input system"
 HOMEPAGE="http://anthy.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/anthy/27771/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 SLOT="0"
 
diff --git a/app-i18n/anthy/anthy-9100e.ebuild b/app-i18n/anthy/anthy-9100e.ebuild
deleted file mode 100644
index 52cd6df53052..000000000000
--- a/app-i18n/anthy/anthy-9100e.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-9100e.ebuild,v 1.2 2008/02/29 16:34:36 jer Exp $
-
-inherit elisp-common eutils
-
-IUSE="emacs"
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/29142/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-
-DEPEND="!app-i18n/anthy-ss
-	emacs? ( virtual/emacs )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	local cannadicdir=/var/lib/canna/dic/canna
-
-	if has_version 'app-dicts/canna-2ch'; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		sed -i /placename/a"read ${cannadicdir}/nichan.ctd" \
-			mkworddic/dict.args.in
-	fi
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use emacs || myconf="EMACS=no"
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/50anthy-gentoo.el
-
-	dodoc AUTHORS DIARY NEWS README ChangeLog
-
-	docinto doc
-	rm doc/Makefile*
-	dodoc doc/*
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	use emacs && elisp-site-regen
-
-}
diff --git a/app-i18n/anthy/anthy-9100g.ebuild b/app-i18n/anthy/anthy-9100g.ebuild
deleted file mode 100644
index 4ce83cd0a438..000000000000
--- a/app-i18n/anthy/anthy-9100g.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-9100g.ebuild,v 1.1 2009/01/29 15:12:01 matsuu Exp $
-
-inherit elisp-common eutils
-
-IUSE="emacs"
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/37336/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-
-DEPEND="!app-i18n/anthy-ss
-	emacs? ( virtual/emacs )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	local cannadicdir=/var/lib/canna/dic/canna
-
-	if has_version 'app-dicts/canna-2ch'; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		sed -i \
-			-e "/set_input_encoding eucjp/aread /var/lib/canna/dic/canna/nichan.ctd" \
-			mkworddic/dict.args.in || die
-	fi
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use emacs || myconf="EMACS=no"
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/50anthy-gentoo.el
-
-	dodoc AUTHORS DIARY NEWS README ChangeLog
-
-	docinto doc
-	rm doc/Makefile*
-	dodoc doc/*
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	use emacs && elisp-site-regen
-
-}
diff --git a/app-i18n/anthy/anthy-9100h.ebuild b/app-i18n/anthy/anthy-9100h.ebuild
index 74cfcea8bfc4..281472f413a0 100644
--- a/app-i18n/anthy/anthy-9100h.ebuild
+++ b/app-i18n/anthy/anthy-9100h.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-9100h.ebuild,v 1.7 2009/08/09 12:35:26 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-9100h.ebuild,v 1.8 2009/09/17 16:32:12 matsuu Exp $
 
 inherit elisp-common eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="Anthy -- free and secure Japanese input system"
 HOMEPAGE="http://anthy.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/anthy/37536/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 SLOT="0"
 
diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
index 08a2b9187023..85cd1cffb07b 100644
--- a/app-i18n/anthy/metadata.xml
+++ b/app-i18n/anthy/metadata.xml
@@ -13,7 +13,4 @@
   <pkg>app-i18n/uim</pkg> (XIM, GTK+ immodule) and <pkg>virtual/emacs</pkg>
   (to enable Anthy support for emacs, build this package with emacs USE flag).
 </longdescription>
-<use>
-  <flag name='ucs4'>Enable ucs4 support</flag>
-</use>
 </pkgmetadata>