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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

9 files changed, 15 insertions, 312 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/Manifest b/app-i18n/anthy/Manifest
index a673d8877dc5..d29b2cee7703 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -2,17 +2,9 @@ AUX 50anthy-gentoo.el 99 RMD160 dd4efb9d69ff9c136361dcfbed91d1bb60f13f20 SHA1 f6
 AUX anthy-7500b-asneeded.patch 439 RMD160 cb89c1f113bf805be9dbed530bfbd79c97ec46a7 SHA1 528bf194fc127cd3a538dd2033865aae6130d036 SHA256 712a18949d16d04b8eb8e1882539297725c9cb33e8c57b7b5035daaec8afcdae
 AUX anthy-7900-asneeded.diff 474 RMD160 0a07440f7671f013d4504c246bae10afc1406837 SHA1 88239c0a6f1b7feb29c960043bce4fc4f3d786b6 SHA256 9b52240946192af3a02577d8bd87a6d10e5d0690c405ecddd4cf8f5fa3e9e963
 AUX anthy-mkdic-gcc34.patch 790 RMD160 031eb29fafd8cf9f1306cc9e9de5c32c92dffa7e SHA1 9ab2e986fc5c7ca5d4d35899ae8d86e3ac73cdff SHA256 a4185fd2ef10844ed4217cd40b77a9cf194321363e78a7fad2847465ea7b3fda
-DIST anthy-7500b.tar.gz 3385857 RMD160 7b20cd09232bea69e2620dca8d30f358ef73bf9b SHA1 2226f1824cc22efa774cbf7fa479d86ef8038e14 SHA256 fb874e2f97767e0d3a39e3ac60ccf7ccc16a747a35b7d63848a41a1db4d1268d
-DIST anthy-7900.tar.gz 3604440 RMD160 fd28f5925fa981fe173f115f5e1919899fa92037 SHA1 9b3ae54ebf81e7aedb095f7c4a3b97027557c258 SHA256 23a6020efdd3b2f4d99ed53af68f53e80be835da9ffe03d9e650939c1a923931
 DIST anthy-9100d.tar.gz 4184988 RMD160 ddd9daee35a0a2ab3b309aec54b8d1fce01ef92e SHA1 02ed5e64051462fc7e46fe006097dece24fa058f SHA256 78ab5d9a23e254484121f06ad41ce630ea34f06e2ee7adf90253febea12af4f5
-DIST anthy-9100e.tar.gz 4235687 RMD160 71297e7a930cbfd42175886fd5aa84e2177eeb7e SHA1 dc2ef7a157041cad20ce8502488f9af3510ac270 SHA256 369fd18d406783acc92e6ced2b3536999aa0d33940398af2b4fb11dba46cbfa3
-DIST anthy-9100g.tar.gz 4446301 RMD160 8710f87ea06afa3f48726bc14f67e82eee244036 SHA1 b56d23b0dca5933363ceae4c48ae752f10feea05 SHA256 0a1934e6958b4e337417554b26b2407ba14243a354156f672bf78f53f38c2a8d
 DIST anthy-9100h.tar.gz 4446148 RMD160 6ddb26c0a47daf2f765b2973817cfbe84fa85606 SHA1 bfea9e74e208c4b976b6bd7ac6784cd290c636fd SHA256 d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547
-EBUILD anthy-7500b.ebuild 1371 RMD160 9cff88c8bbd9409fa0a570b363fcc5bcf2d1bdb3 SHA1 d363be8900765c4311bd3d8e4dbc603a50d5b2ba SHA256 71b5dd6fdc86536c76720e62d9dd03999b375cb5e31bdf2277151a6f2c2c670b
-EBUILD anthy-7900.ebuild 1388 RMD160 d0ffe89c2ed56c45eac6efeecb6b1511749428a3 SHA1 29c0bc5934ec6444c57d7950c05131cb590e1ab1 SHA256 a80251ae0cb480db60f2b01e96b5011f541231ed424c83cc582710d90bceadc0
-EBUILD anthy-9100d.ebuild 1255 RMD160 81fbf752fc8ed0fd7cb0a2ee108cbffab5a97301 SHA1 f2e911d08303ac13c3b5d09505aafa3ef28ffdc3 SHA256 c06646d1e7cf3bf3accc8ffe1f15333a03ca75e7b324ad7a7a2f1ac2d577a659
-EBUILD anthy-9100e.ebuild 1258 RMD160 eb8b9d238ec34eaf4e4fcb59328977c3dcd0d14c SHA1 9792b645f69f0871f1a2630bc1d7d05c3e177bb2 SHA256 c271949920e2158ab4c06f54bf1cdf1af393c53eee70b4d1e8c1441083d6ec88
-EBUILD anthy-9100g.ebuild 1301 RMD160 930075e396a07b8007ea63bfec6167622f50f6a0 SHA1 6ba5b2034d2393f1e69be36309b6d78a96bbfd04 SHA256 c05e293cb5602fb96fb59b527feb060742b8c8b901fbb5bbf2f3762e555a8f7a
-EBUILD anthy-9100h.ebuild 1314 RMD160 4a70cf9ecf292d910302c108b2262856076e0e63 SHA1 0438e4fd3c098bebc36215551a2aa4411673a35b SHA256 eaf47a808af443bea8c13f466ddedfc1a82960314a1dcf977c2f594e53162331
-MISC ChangeLog 14868 RMD160 a2ceb986433be03a9b044e475366413368002f36 SHA1 6bbff64ba87f0b1d59b3265ab361c820916ab935 SHA256 59409f264b9eb1bd109bd6cd4a7362b30642d72e99a70b72d6cce5daedf4cc1b
-MISC metadata.xml 696 RMD160 a111ac40881111c9501d82bd43c5a17eda2b7c4d SHA1 502a8601202ea5ba27c6c70d1e0870e3da316799 SHA256 c32cbfb9227a9cd01f41a91f194a2644a3212e65e409ae8713acb46ec6a0c25c
+EBUILD anthy-9100d.ebuild 1263 RMD160 370c95c07b5dac17da627ed4af7b69ccb88e7e2b SHA1 03da48c8eef59951b2d8cd2687cfe7a44785dcf3 SHA256 fcd02ed9f59c0314dfcf0722e02863665e63d45b0ae97216822767958ed30430
+EBUILD anthy-9100h.ebuild 1323 RMD160 e1a8e420b5912decc82059c09b31ad1331dfc22a SHA1 c50ab0dddccbde5c327bbe3718b51075fae5a723 SHA256 7ea61142240e9cb9ba6391eae501ca92e16d58d8080636186765836aba28c126
+MISC ChangeLog 15084 RMD160 e34fbd5a60bd31bda1e7e779b39bf60af6522c50 SHA1 5dc344324ed6663707bec7a7f4eeecd206f8c5f9 SHA256 8832db23d2f19ad5c74bdb7cecf58441e548fcf80a255872c7efa9f63d30e9f7
+MISC metadata.xml 636 RMD160 84efab034f1c35c1f5d263de1f6b62b0b4e52b77 SHA1 6197cd4a51bbe72053d9b15f8fbe6d943450c587 SHA256 cd28d4cac0d06c7ec50f32a9c35081c1ffff6d9dacd6afd085db6852694cd1ea
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>