Version bumped.

13 files changed, 18 insertions, 251 deletions

diff --git a/app-text/estraier/ChangeLog b/app-text/estraier/ChangeLog
index 192b6cd262ff..cedefb9e54e1 100644
--- a/app-text/estraier/ChangeLog
+++ b/app-text/estraier/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/estraier
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/estraier/ChangeLog,v 1.18 2005/01/01 16:13:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/estraier/ChangeLog,v 1.19 2005/01/03 05:45:23 matsuu Exp $
+
+*estraier-1.2.25 (03 Jan 2005)
+
+  03 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> -estraier-1.2.16.ebuild,
+  -estraier-1.2.18.ebuild, -estraier-1.2.20.ebuild, -estraier-1.2.21.ebuild,
+  -estraier-1.2.23.ebuild, +estraier-1.2.25.ebuild:
+  Version bumped.
+  Removed old versions.
 
   05 Dec 2004; Jason Wever <weeve@gentoo.org> estraier-1.2.24.ebuild:
   Added ~sparc keyword.
diff --git a/app-text/estraier/Manifest b/app-text/estraier/Manifest
index c1b157d267da..0f28c5f0c6d6 100644
--- a/app-text/estraier/Manifest
+++ b/app-text/estraier/Manifest
@@ -1,14 +1,6 @@
+MD5 424b21afe3b9b8c00b2bf634b5fd37fb estraier-1.2.25.ebuild 1206
+MD5 a1281c9865e06329bf6717681f891475 estraier-1.2.24.ebuild 1204
 MD5 721b4d009bec462813fedadb9c89f390 ChangeLog 2289
-MD5 e72a1a421275239cd10598deaeac9704 estraier-1.2.16.ebuild 1062
 MD5 382a25f7a6abf0020285f37f74158690 metadata.xml 226
-MD5 fa2c1d723fe01651901efcad1bfd7970 estraier-1.2.18.ebuild 1071
-MD5 b1191772d9e6cf480da53eec2e1c793c estraier-1.2.20.ebuild 1159
-MD5 4d39248e8eeae257ea68e787047a0f64 estraier-1.2.21.ebuild 1159
-MD5 640a6cd22603bde20f589d5ea3af274a estraier-1.2.23.ebuild 1164
-MD5 a1281c9865e06329bf6717681f891475 estraier-1.2.24.ebuild 1204
-MD5 0bd8cfe284bd0a150aabe1fa4320cfd5 files/digest-estraier-1.2.16 67
-MD5 3866538b4ff8c4a194260bdf5f17d111 files/digest-estraier-1.2.18 67
-MD5 3db1503d7faab044429c6ebb7b596d9a files/digest-estraier-1.2.20 67
-MD5 60510ca6b90ffb7fca02137ad2260e94 files/digest-estraier-1.2.21 67
-MD5 b2bc877aca7b5cd7d073e42c9128ceab files/digest-estraier-1.2.23 67
 MD5 d51f92ddeebe49417615d4288a39ad95 files/digest-estraier-1.2.24 67
+MD5 bdc6b57b44fc352b7ad5a2f2f01d1194 files/digest-estraier-1.2.25 67
diff --git a/app-text/estraier/estraier-1.2.16.ebuild b/app-text/estraier/estraier-1.2.16.ebuild
deleted file mode 100644
index b79745d81b1e..000000000000
--- a/app-text/estraier/estraier-1.2.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/estraier/estraier-1.2.16.ebuild,v 1.6 2005/01/01 16:13:38 eradicator Exp $
-
-IUSE="debug chasen kakasi zlib"
-
-DESCRIPTION="a personal full-text search system"
-HOMEPAGE="http://estraier.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-
-DEPEND="dev-db/qdbm
-	zlib? ( sys-libs/zlib )
-	|| (
-		chasen? ( app-text/chasen )
-		kakasi? ( app-i18n/kakasi )
-	)"
-
-src_compile() {
-
-	local myconf=
-
-	if use chasen; then
-		myconf="`use_enable chasen`"
-
-	elif use kakasi; then
-		myconf="`use_enable kakasi`"
-
-	fi
-
-	econf \
-		`use_enable zlib` \
-		`use_enable debug` \
-		--enable-dlfilter \
-		--enable-regex \
-		--with-sysqdbm \
-		$myconf \
-		|| die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	dodoc [A-Z][A-Z]* ChangeLog
-	dohtml *.html
-
-	rm ${D}/usr/share/${PN}/{COPYING,ChangeLog}
-	rm ${D}/usr/share/${PN}/*.html
-
-}
diff --git a/app-text/estraier/estraier-1.2.18.ebuild b/app-text/estraier/estraier-1.2.18.ebuild
deleted file mode 100644
index 0e8bddf72a4e..000000000000
--- a/app-text/estraier/estraier-1.2.18.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/estraier/estraier-1.2.18.ebuild,v 1.5 2005/01/01 16:13:38 eradicator Exp $
-
-IUSE="debug chasen kakasi zlib"
-
-DESCRIPTION="a personal full-text search system"
-HOMEPAGE="http://estraier.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-
-DEPEND=">=dev-db/qdbm-1.8.14
-	zlib? ( sys-libs/zlib )
-	|| (
-		chasen? ( app-text/chasen )
-		kakasi? ( app-i18n/kakasi )
-	)"
-
-src_compile() {
-
-	local myconf=
-
-	if use chasen; then
-		myconf="`use_enable chasen`"
-
-	elif use kakasi; then
-		myconf="`use_enable kakasi`"
-
-	fi
-
-	econf \
-		`use_enable zlib` \
-		`use_enable debug` \
-		--enable-dlfilter \
-		--enable-regex \
-		--with-sysqdbm \
-		$myconf \
-		|| die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	dodoc [A-Z][A-Z]* ChangeLog
-	dohtml *.html
-
-	rm ${D}/usr/share/${PN}/{COPYING,ChangeLog}
-	rm ${D}/usr/share/${PN}/*.html
-
-}
diff --git a/app-text/estraier/estraier-1.2.20.ebuild b/app-text/estraier/estraier-1.2.20.ebuild
deleted file mode 100644
index 36bce1c82859..000000000000
--- a/app-text/estraier/estraier-1.2.20.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/estraier/estraier-1.2.20.ebuild,v 1.3 2005/01/01 16:13:38 eradicator Exp $
-
-IUSE="debug chasen kakasi mecab zlib"
-
-DESCRIPTION="a personal full-text search system"
-HOMEPAGE="http://estraier.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-
-DEPEND=">=dev-db/qdbm-1.8.15
-	zlib? ( sys-libs/zlib )
-	|| (
-		chasen? ( app-text/chasen )
-		mecab?  ( app-text/mecab )
-		kakasi? ( app-i18n/kakasi )
-	)"
-
-src_compile() {
-
-	local myconf=
-
-	if use chasen; then
-		myconf="`use_enable chasen`"
-
-	elif use mecab; then
-		myconf="`use_enable mecab`"
-
-	elif use kakasi; then
-		myconf="`use_enable kakasi`"
-
-	fi
-
-	econf \
-		`use_enable zlib` \
-		`use_enable debug` \
-		--enable-dlfilter \
-		--enable-regex \
-		--with-sysqdbm \
-		$myconf \
-		|| die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	dodoc [A-Z][A-Z]* ChangeLog
-	dohtml *.html
-
-	rm ${D}/usr/share/${PN}/{COPYING,ChangeLog}
-	rm ${D}/usr/share/${PN}/*.html
-
-}
diff --git a/app-text/estraier/estraier-1.2.21.ebuild b/app-text/estraier/estraier-1.2.21.ebuild
deleted file mode 100644
index 7670b99d7602..000000000000
--- a/app-text/estraier/estraier-1.2.21.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/estraier/estraier-1.2.21.ebuild,v 1.3 2005/01/01 16:13:38 eradicator Exp $
-
-IUSE="debug chasen kakasi mecab zlib"
-
-DESCRIPTION="a personal full-text search system"
-HOMEPAGE="http://estraier.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-
-DEPEND=">=dev-db/qdbm-1.8.16
-	zlib? ( sys-libs/zlib )
-	|| (
-		chasen? ( app-text/chasen )
-		mecab?  ( app-text/mecab )
-		kakasi? ( app-i18n/kakasi )
-	)"
-
-src_compile() {
-
-	local myconf=
-
-	if use chasen; then
-		myconf="`use_enable chasen`"
-
-	elif use mecab; then
-		myconf="`use_enable mecab`"
-
-	elif use kakasi; then
-		myconf="`use_enable kakasi`"
-
-	fi
-
-	econf \
-		`use_enable zlib` \
-		`use_enable debug` \
-		--enable-dlfilter \
-		--enable-regex \
-		--with-sysqdbm \
-		$myconf \
-		|| die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	dodoc [A-Z][A-Z]* ChangeLog
-	dohtml *.html
-
-	rm ${D}/usr/share/${PN}/{COPYING,ChangeLog}
-	rm ${D}/usr/share/${PN}/*.html
-
-}
diff --git a/app-text/estraier/estraier-1.2.23.ebuild b/app-text/estraier/estraier-1.2.25.ebuild
index ffffc2f51d97..3baf41c70843 100644
--- a/app-text/estraier/estraier-1.2.23.ebuild
+++ b/app-text/estraier/estraier-1.2.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/estraier/estraier-1.2.23.ebuild,v 1.4 2005/01/01 16:13:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/estraier/estraier-1.2.25.ebuild,v 1.1 2005/01/03 05:45:23 matsuu Exp $
 
 IUSE="debug chasen kakasi mecab zlib"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 RESTRICT="nomirror"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 SLOT="0"
 
 DEPEND=">=dev-db/qdbm-1.8.16
@@ -34,6 +34,9 @@ src_compile() {
 	elif use kakasi; then
 		myconf="`use_enable kakasi`"
 
+	else
+		myconf="--enable-cjkuni"
+
 	fi
 
 	econf \
diff --git a/app-text/estraier/files/digest-estraier-1.2.16 b/app-text/estraier/files/digest-estraier-1.2.16
deleted file mode 100644
index 8ae961d78efa..000000000000
--- a/app-text/estraier/files/digest-estraier-1.2.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8fe3d1f1a4afbe23b88e0e835e734662 estraier-1.2.16.tar.gz 369648
diff --git a/app-text/estraier/files/digest-estraier-1.2.18 b/app-text/estraier/files/digest-estraier-1.2.18
deleted file mode 100644
index b8afb332ec0a..000000000000
--- a/app-text/estraier/files/digest-estraier-1.2.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b525a70d4791a4d70d3980a77f818d2 estraier-1.2.18.tar.gz 374450
diff --git a/app-text/estraier/files/digest-estraier-1.2.20 b/app-text/estraier/files/digest-estraier-1.2.20
deleted file mode 100644
index 1ae8d9d5a007..000000000000
--- a/app-text/estraier/files/digest-estraier-1.2.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a58041656f42e2d88d7715328058f418 estraier-1.2.20.tar.gz 383217
diff --git a/app-text/estraier/files/digest-estraier-1.2.21 b/app-text/estraier/files/digest-estraier-1.2.21
deleted file mode 100644
index 8a52b9d7a1d2..000000000000
--- a/app-text/estraier/files/digest-estraier-1.2.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 551ca23b4065327c81b16c17fe13edb8 estraier-1.2.21.tar.gz 386917
diff --git a/app-text/estraier/files/digest-estraier-1.2.23 b/app-text/estraier/files/digest-estraier-1.2.23
deleted file mode 100644
index e9737d5d3e62..000000000000
--- a/app-text/estraier/files/digest-estraier-1.2.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 533260da1d7b86b79eb1908af4fc86c7 estraier-1.2.23.tar.gz 389430
diff --git a/app-text/estraier/files/digest-estraier-1.2.25 b/app-text/estraier/files/digest-estraier-1.2.25
new file mode 100644
index 000000000000..a7e11269ce59
--- /dev/null
+++ b/app-text/estraier/files/digest-estraier-1.2.25
@@ -0,0 +1 @@
+MD5 a86ca474d72b6d29e1f7c01390055534 estraier-1.2.25.tar.gz 391534