6 files changed, 12 insertions, 74 deletions
diff --git a/app-text/kiwix/ChangeLog b/app-text/kiwix/ChangeLog
index 7361fa4331fe..a9e7f1e4f253 100644
--- a/app-text/kiwix/ChangeLog
+++ b/app-text/kiwix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/kiwix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/ChangeLog,v 1.4 2011/07/23 17:29:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/ChangeLog,v 1.5 2011/08/13 03:51:42 chithanh Exp $
+
+*kiwix-0.9_beta2 (13 Aug 2011)
+
+  13 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -kiwix-0.9_alpha7.ebuild, -kiwix-0.9_beta1.ebuild, +kiwix-0.9_beta2.ebuild,
+  -files/kiwix-0.9-custom-flags.patch, -files/kiwix-0.9-find-xulrunner.patch:
+  Version bump. Remove old.
 
 *kiwix-0.9_beta1 (23 Jul 2011)
 
diff --git a/app-text/kiwix/Manifest b/app-text/kiwix/Manifest
index b4f438f622bd..891410dfda65 100644
--- a/app-text/kiwix/Manifest
+++ b/app-text/kiwix/Manifest
@@ -1,8 +1,4 @@
-AUX kiwix-0.9-custom-flags.patch 392 RMD160 a1ffab21d45380702f904da660d1e3798fcdcb96 SHA1 c09e8678701ae6e097b4c12d2cd693b2f86ad6f2 SHA256 8f60546dea63e0a441b566d673ca019376de51f8abb96412cd364fd9fbd77a89
-AUX kiwix-0.9-find-xulrunner.patch 301 RMD160 c116ab1b52632003a85fc43defe4982c51198ff1 SHA1 0cbc6e7b47232eb3c8e2f86e6405f3ca41ea95e0 SHA256 9eea81269b4ab994da26917271390a3bbeee09698935348608f8d6bccb9c8205
-DIST kiwix-0.9-alpha7-src.tar.bz2 561193 RMD160 8c70f2f1d3b29ce625b769c3e99cd57c367c42f8 SHA1 dfb705e8dde3dce2b041d5b79214c9929292a2bd SHA256 2e4d765f9be6b06facfd238a34f4adf0e8e7c636214696cb9eb53e748762302c
-DIST kiwix-0.9-beta1-src.tar.bz2 957503 RMD160 89814a41028f3e06077f99001c42a4cac4c4811c SHA1 8ac43d47f79c64415bbfa80ce98d22be4daed246 SHA256 c24c7343fff71b6743fad586e4f5d5d3bb1886ea8c227c865229917ec07713ac
-EBUILD kiwix-0.9_alpha7.ebuild 1002 RMD160 4a3b1f1751be4e15d2d53cba47375b6db58d01bc SHA1 4ecd0f1fe10c01f62da8ff032c481004b3f08130 SHA256 65f53dc95301c25d21f968dc8e494f3e5ab0bf6721e81f785ea084efcc61d9d9
-EBUILD kiwix-0.9_beta1.ebuild 1045 RMD160 85bc40540bb6412e151fcfcf7dd8688015e9301f SHA1 b1d3b381d08649500598e867f603e95e5a88104d SHA256 712bd2a48538cb06d51689b2f90a76425cea1e175db621c95cf85a5eca67e3d7
-MISC ChangeLog 1066 RMD160 45cf06127755f97af085064a1a4f477cdfaaa18a SHA1 8e0ea1df1f8994edaa2a3a86bad9c24b92eea0ea SHA256 634a5d5d5c66c777b8bbc8501fd958c87219272d8aede9ae726b16bcb90c9438
+DIST kiwix-0.9-beta2-src.tar.bz2 3004882 RMD160 16e229195a19923a7f5a368f0f6387e819d35fbf SHA1 151d36c1a718c7dba3cc544e622c36a75320f65c SHA256 53572766d7c77404a99c7311a1f41be4899228b6c26f60bbd3fe00b06b785946
+EBUILD kiwix-0.9_beta2.ebuild 1045 RMD160 e0aef0050973c6b664be315a5b48cbcf55b866ca SHA1 b2126760d91b7e1f12bb9e58262d53dced510f2e SHA256 190da3207e3844e879d6127d44f9fe501e487a042f989dfbd6c41123791cf120
+MISC ChangeLog 1352 RMD160 9752bc19c3f059eea79e9b9e2e2988acd3a4f2a6 SHA1 904560ca651d4487b08f7d54994c3df777a329d0 SHA256 08d3bca0a9a8c730eeb54d0f99fd2fdfe2ce3faa226d354886b395c65245d2a4
 MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
diff --git a/app-text/kiwix/files/kiwix-0.9-custom-flags.patch b/app-text/kiwix/files/kiwix-0.9-custom-flags.patch
deleted file mode 100644
index dc6e7b3472ed..000000000000
--- a/app-text/kiwix/files/kiwix-0.9-custom-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2010-12-12 17:32:04.768000030 +0100
-+++ b/configure.ac	2010-12-12 17:43:43.434000030 +0100
-@@ -45,9 +45,7 @@
- 
-   # default $CPPFLAGS and $LDFLAGS
-   # CLucene has headers in /usr/lib
--  CPPFLAGS="-I/usr/lib"
--  CFLAGS="-O6"
--  LDFLAGS=""
-+  CPPFLAGS="${CPPFLAGS} -I/usr/lib"
-   CFLAGS="${CFLAGS}"
-   LDFLAGS="${LDFLAGS}" 
-   LIBS=""
diff --git a/app-text/kiwix/files/kiwix-0.9-find-xulrunner.patch b/app-text/kiwix/files/kiwix-0.9-find-xulrunner.patch
deleted file mode 100644
index 0037b912fbb0..000000000000
--- a/app-text/kiwix/files/kiwix-0.9-find-xulrunner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/kiwix/kiwix.sh b/kiwix/kiwix.sh
---- a/kiwix/kiwix.sh	2010-07-07 21:22:12.000000000 +0200
-+++ b/kiwix/kiwix.sh	2010-08-14 15:29:20.552000026 +0200
-@@ -1,5 +1,7 @@
- #!/bin/bash
- 
-+XULRUNNER=$(echo /usr/bin/xulrunner-1.9*)
-+
- # Original binary
- BINARY_ORG=$0
- if [ ! ${BINARY_ORG:0:1} = "/" ]
diff --git a/app-text/kiwix/kiwix-0.9_alpha7.ebuild b/app-text/kiwix/kiwix-0.9_alpha7.ebuild
deleted file mode 100644
index bbb1198bda96..000000000000
--- a/app-text/kiwix/kiwix-0.9_alpha7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/kiwix-0.9_alpha7.ebuild,v 1.1 2010/12/12 16:50:40 chithanh Exp $
-
-EAPI=3
-
-inherit autotools multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 2 -)-src"
-
-DESCRIPTION="A ZIM reader, especially for offline web content retrieved from Wikipedia"
-HOMEPAGE="http://www.kiwix.org/"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/xz-utils
-	dev-lang/perl
-	dev-libs/icu
-	dev-libs/xapian
-	net-libs/libmicrohttpd
-	net-libs/xulrunner:1.9"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9-find-xulrunner.patch
-	epatch "${FILESDIR}"/${PN}-0.9-custom-flags.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CHANGELOG README || die
-}
diff --git a/app-text/kiwix/kiwix-0.9_beta1.ebuild b/app-text/kiwix/kiwix-0.9_beta2.ebuild
index e62fe951d1de..4dcb29f469cd 100644
--- a/app-text/kiwix/kiwix-0.9_beta1.ebuild
+++ b/app-text/kiwix/kiwix-0.9_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/kiwix-0.9_beta1.ebuild,v 1.2 2011/07/24 01:00:56 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/kiwix-0.9_beta2.ebuild,v 1.1 2011/08/13 03:51:42 chithanh Exp $
 
 EAPI=3