Version bump.

svn path=/; revision=29

8 files changed, 81 insertions, 68 deletions

diff --git a/trunk/app-text/sukija/ChangeLog b/trunk/app-text/sukija/ChangeLog
index da2f7e7..bb28051 100644
--- a/trunk/app-text/sukija/ChangeLog
+++ b/trunk/app-text/sukija/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/sukija
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+*sukija-0.9.3 (05 Oct 2007)
+
+  05 Oct 2007; Flammie Pirinen <flammie@gentoo.org>
+  sukija-0.9.6.ebuild:
+  Cleanup and go.
+
+  22 Aug 2007; Flammie Pirinen <flammie@gentoo.org>
+  +sukija-0.9.6.ebuild, -sukija-0.9.3.ebuild, -sukija-0.9.1.ebuild:
+  Version bump. Updated some deps. Still some build problems.
 
 *sukija-0.9.3 (15 May 2007)
 
diff --git a/trunk/app-text/sukija/Manifest b/trunk/app-text/sukija/Manifest
index cb0abac..a82fadf 100644
--- a/trunk/app-text/sukija/Manifest
+++ b/trunk/app-text/sukija/Manifest
@@ -1,24 +1,16 @@
-DIST sukija-0.9.1.tar.bz2 477416 RMD160 a51ec42483cbf79e196d29d07d0912ce2b146314 SHA1 bda4a92b87d7ccc4fed886d1a26f613e3577461b SHA256 e2e75f2ddbb959b28e3757df54cc131b7397c087621b11ea3c1b4087266474ef
-DIST sukija-0.9.3.tar.bz2 345232 RMD160 3c432d0cf972e118704b2559d0ea9daeb5c46129 SHA1 804c70ac61153ff6c35623d10a9d0bfa2d16db2d SHA256 b0e383de18ffd9abeb8194b62a51dbdc6e3b046499fc0d719ebec331fe308813
-EBUILD sukija-0.9.1.ebuild 547 RMD160 896df32f4e9c2f8db4db3eaffb4dce1a562988de SHA1 024af61338584a7c3f6ee105e90767cee5db578c SHA256 4659570f11329eae474a74e9de6c38c636308d98e74c45470537449789dfdb3a
-MD5 061291b9f9e14760a0ab2d345e060f5c sukija-0.9.1.ebuild 547
-RMD160 896df32f4e9c2f8db4db3eaffb4dce1a562988de sukija-0.9.1.ebuild 547
-SHA256 4659570f11329eae474a74e9de6c38c636308d98e74c45470537449789dfdb3a sukija-0.9.1.ebuild 547
-EBUILD sukija-0.9.3.ebuild 547 RMD160 896df32f4e9c2f8db4db3eaffb4dce1a562988de SHA1 024af61338584a7c3f6ee105e90767cee5db578c SHA256 4659570f11329eae474a74e9de6c38c636308d98e74c45470537449789dfdb3a
-MD5 061291b9f9e14760a0ab2d345e060f5c sukija-0.9.3.ebuild 547
-RMD160 896df32f4e9c2f8db4db3eaffb4dce1a562988de sukija-0.9.3.ebuild 547
-SHA256 4659570f11329eae474a74e9de6c38c636308d98e74c45470537449789dfdb3a sukija-0.9.3.ebuild 547
-MISC ChangeLog 276 RMD160 5bc1c94bbfb1762335221e25f1a82a9e0f73824c SHA1 49e7e05a4cf893a0c9d6c96608111b5b5ddea918 SHA256 779c84dcbeaf198bacc9b18a1b526475a6137a42c33d598a671ba2c95205cc9b
-MD5 741c62b62b72dd04609b94a3c721c50a ChangeLog 276
-RMD160 5bc1c94bbfb1762335221e25f1a82a9e0f73824c ChangeLog 276
-SHA256 779c84dcbeaf198bacc9b18a1b526475a6137a42c33d598a671ba2c95205cc9b ChangeLog 276
+DIST sukija-0.9.6.tar.bz2 353144 RMD160 4c912ee1dea450815d3cf50f67750a2c2ecda0d7 SHA1 c1c627bd6e7a2576ab073c4561d5380ac0d249dd SHA256 bdb7f1547120fbc286ef86a12292fc0a2ff9f0d9eb3774a0cc265859e902a1be
+EBUILD sukija-0.9.6.ebuild 1427 RMD160 485c7ecc9937a6b241e08de3b271eaa6c190991d SHA1 a9f6baeec336a53310e31e2a4ad8f7a6375d55a1 SHA256 3a62caf2cdeca4d31fa78c9ba889269d34fe3b9e47c835586c67c9f0b2f9e030
+MD5 173c9970e7fd27534603cb2eb782ee9a sukija-0.9.6.ebuild 1427
+RMD160 485c7ecc9937a6b241e08de3b271eaa6c190991d sukija-0.9.6.ebuild 1427
+SHA256 3a62caf2cdeca4d31fa78c9ba889269d34fe3b9e47c835586c67c9f0b2f9e030 sukija-0.9.6.ebuild 1427
+MISC ChangeLog 581 RMD160 26fdcf6d7642e15e025964e00332a68c72f3dffd SHA1 d5b718f935c1ead8a07acfaaa39b1420ed0643ac SHA256 054051551c3d16ec7d3ff4aa572fa80b326ae5014c6c5a566be2cdfa35121361
+MD5 1f9d53e11d642e10e3b0a30bd446a450 ChangeLog 581
+RMD160 26fdcf6d7642e15e025964e00332a68c72f3dffd ChangeLog 581
+SHA256 054051551c3d16ec7d3ff4aa572fa80b326ae5014c6c5a566be2cdfa35121361 ChangeLog 581
 MISC metadata.xml 390 RMD160 3845a7620c4622ce7e424f7fcadb001baaf6535e SHA1 a63560015b9ca404532f896adb446ffb534bc624 SHA256 391ae708826392041e5cd6f8f10ecc0db3df91f1bb20cd2dbd49e290eae5007c
 MD5 e3db85c27150ed8da78767161c57030d metadata.xml 390
 RMD160 3845a7620c4622ce7e424f7fcadb001baaf6535e metadata.xml 390
 SHA256 391ae708826392041e5cd6f8f10ecc0db3df91f1bb20cd2dbd49e290eae5007c metadata.xml 390
-MD5 a04faf6f85a3ddf7491567094f99c8f8 files/digest-sukija-0.9.1 241
-RMD160 612f266198017c888279fa165c1c2f3f2f29569c files/digest-sukija-0.9.1 241
-SHA256 c00b1a8d9783e5db917c0f0da1ebc5fac9beec0e0348c509da61dca1694c0bd8 files/digest-sukija-0.9.1 241
-MD5 c6b606f0ca30398f2330e50e0f17e56b files/digest-sukija-0.9.3 241
-RMD160 513a28b38097c9fdf8061bda9e58ddc34bd96bf2 files/digest-sukija-0.9.3 241
-SHA256 3d8037039c2034bb79180963bda7facfc705c797d9bb3a171db6264ca519e106 files/digest-sukija-0.9.3 241
+MD5 05027ca95af66f5c948cbb0a3e7c5286 files/digest-sukija-0.9.6 241
+RMD160 edb26d2f2474824bc17416263064041468af7371 files/digest-sukija-0.9.6 241
+SHA256 f921b63ba163275582cb66753513f97ee7f1e55a65416ca6756dac2419f73bb5 files/digest-sukija-0.9.6 241
diff --git a/trunk/app-text/sukija/files/digest-sukija-0.9.1 b/trunk/app-text/sukija/files/digest-sukija-0.9.1
deleted file mode 100644
index ed480df..0000000
--- a/trunk/app-text/sukija/files/digest-sukija-0.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7ca65cd9fbfca2a9068a680b29433d43 sukija-0.9.1.tar.bz2 477416
-RMD160 a51ec42483cbf79e196d29d07d0912ce2b146314 sukija-0.9.1.tar.bz2 477416
-SHA256 e2e75f2ddbb959b28e3757df54cc131b7397c087621b11ea3c1b4087266474ef sukija-0.9.1.tar.bz2 477416
diff --git a/trunk/app-text/sukija/files/digest-sukija-0.9.3 b/trunk/app-text/sukija/files/digest-sukija-0.9.3
deleted file mode 100644
index 7daa660..0000000
--- a/trunk/app-text/sukija/files/digest-sukija-0.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 afc62bd88ef2135b0c045d4ea3f07811 sukija-0.9.3.tar.bz2 345232
-RMD160 3c432d0cf972e118704b2559d0ea9daeb5c46129 sukija-0.9.3.tar.bz2 345232
-SHA256 b0e383de18ffd9abeb8194b62a51dbdc6e3b046499fc0d719ebec331fe308813 sukija-0.9.3.tar.bz2 345232
diff --git a/trunk/app-text/sukija/files/digest-sukija-0.9.6 b/trunk/app-text/sukija/files/digest-sukija-0.9.6
new file mode 100644
index 0000000..d87fcc0
--- /dev/null
+++ b/trunk/app-text/sukija/files/digest-sukija-0.9.6
@@ -0,0 +1,3 @@
+MD5 3542ed51805cb53dcefb0af441e9c873 sukija-0.9.6.tar.bz2 353144
+RMD160 4c912ee1dea450815d3cf50f67750a2c2ecda0d7 sukija-0.9.6.tar.bz2 353144
+SHA256 bdb7f1547120fbc286ef86a12292fc0a2ff9f0d9eb3774a0cc265859e902a1be sukija-0.9.6.tar.bz2 353144
diff --git a/trunk/app-text/sukija/sukija-0.9.1.ebuild b/trunk/app-text/sukija/sukija-0.9.1.ebuild
deleted file mode 100644
index 83035a7..0000000
--- a/trunk/app-text/sukija/sukija-0.9.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Finnish text indexing tool"
-HOMEPAGE="http://joyds1.joensuu.fi/sukija/sukija.html"
-SRC_URI="http://joyds1.joensuu.fi/sukija/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-x86" # flex borkage
-IUSE=""
-
-DEPEND="=sci-misc/suomi-malaga-0.9*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ILMOITUS INSTALL LUE.MINUT NEWS README
-	dohtml sukija.html
-}
diff --git a/trunk/app-text/sukija/sukija-0.9.3.ebuild b/trunk/app-text/sukija/sukija-0.9.3.ebuild
deleted file mode 100644
index 83035a7..0000000
--- a/trunk/app-text/sukija/sukija-0.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Finnish text indexing tool"
-HOMEPAGE="http://joyds1.joensuu.fi/sukija/sukija.html"
-SRC_URI="http://joyds1.joensuu.fi/sukija/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-x86" # flex borkage
-IUSE=""
-
-DEPEND="=sci-misc/suomi-malaga-0.9*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ILMOITUS INSTALL LUE.MINUT NEWS README
-	dohtml sukija.html
-}
diff --git a/trunk/app-text/sukija/sukija-0.9.6.ebuild b/trunk/app-text/sukija/sukija-0.9.6.ebuild
new file mode 100644
index 0000000..c068b3f
--- /dev/null
+++ b/trunk/app-text/sukija/sukija-0.9.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Finnish text indexing tool"
+HOMEPAGE="http://joyds1.joensuu.fi/sukija/sukija.html"
+SRC_URI="http://joyds1.joensuu.fi/sukija/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-x86" # flex borkage, CXX?
+IUSE="qt doc boost"
+
+DEPEND="=sci-misc/suomi-malaga-0.9*
+	|| ( sys-devel/bison dev-util/yacc )
+	boost? ( >=dev-libs/boost-1.34 )
+	sys-libs/db
+	x11-libs/qt
+	doc? ( app-doc/doxygen )"
+RDEPEND="=sci-misc/suomi-malaga-0.9*
+	boost? ( >=dev-libs/boost-1.34 )
+	sys-libs/db
+	x11-libs/qt"
+
+pkg_setup() {
+	if built_with_use sys-libs/db nocxx; then
+		die "sys-libs/db must be built with USE=-nocxx for sukija to work"
+	fi
+}
+
+src_compile() {
+	econf $(use_with boost ) $(use_with qt x ) || die "configure failed"
+	emake || die "make failed"
+	if use doc ; then
+		doxygen doc/Doxyfile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ILMOITUS INSTALL LUE.MINUT NEWS README || die "docs missing"
+	dohtml sukija.html || die "docs missing"
+	insinto /usr/share/doc/${PF}
+	doins kuva1.png malaga{1,2}.png || die "docs missing"
+	if use doc ; then
+		doins -r doc
+	fi
+	insinto /usr/share/${PN}
+	doins init/rc.*
+}
+
+pkg_postinst() {
+	elog "sample configurations are in ${ROOT}/usr/share/${PN},"
+	elog "you should copy one in to ~/.sukija/ before use"
+}