5 files changed, 9 insertions, 67 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/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