From b098553f20afcdbf95a22cf2061076dbe144da78 Mon Sep 17 00:00:00 2001
From: Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Date: Sun, 12 Dec 2010 16:50:41 +0000
Subject: New prerelease. Allow custom LDFLAGS, bug #339869

(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)
---
 app-text/kiwix/ChangeLog                          |  9 ++++-
 app-text/kiwix/files/kiwix-0.9-custom-flags.patch | 14 ++++++++
 app-text/kiwix/kiwix-0.9_alpha6.ebuild            | 39 ----------------------
 app-text/kiwix/kiwix-0.9_alpha7.ebuild            | 40 +++++++++++++++++++++++
 4 files changed, 62 insertions(+), 40 deletions(-)
 create mode 100644 app-text/kiwix/files/kiwix-0.9-custom-flags.patch
 delete mode 100644 app-text/kiwix/kiwix-0.9_alpha6.ebuild
 create mode 100644 app-text/kiwix/kiwix-0.9_alpha7.ebuild

diff --git a/app-text/kiwix/ChangeLog b/app-text/kiwix/ChangeLog
index 9606e9ed1941..0347d93413cf 100644
--- a/app-text/kiwix/ChangeLog
+++ b/app-text/kiwix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/kiwix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/ChangeLog,v 1.2 2010/09/02 19:29:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/ChangeLog,v 1.3 2010/12/12 16:50:40 chithanh Exp $
+
+*kiwix-0.9_alpha7 (12 Dec 2010)
+
+  12 Dec 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -kiwix-0.9_alpha6.ebuild, +kiwix-0.9_alpha7.ebuild,
+  +files/kiwix-0.9-custom-flags.patch:
+  New prerelease. Allow custom LDFLAGS, bug #339869
 
 *kiwix-0.9_alpha6 (02 Sep 2010)
 
diff --git a/app-text/kiwix/files/kiwix-0.9-custom-flags.patch b/app-text/kiwix/files/kiwix-0.9-custom-flags.patch
new file mode 100644
index 000000000000..dc6e7b3472ed
--- /dev/null
+++ b/app-text/kiwix/files/kiwix-0.9-custom-flags.patch
@@ -0,0 +1,14 @@
+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/kiwix-0.9_alpha6.ebuild b/app-text/kiwix/kiwix-0.9_alpha6.ebuild
deleted file mode 100644
index ef2dad88507b..000000000000
--- a/app-text/kiwix/kiwix-0.9_alpha6.ebuild
+++ /dev/null
@@ -1,39 +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_alpha6.ebuild,v 1.1 2010/09/02 19:29:22 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
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CHANGELOG README || die
-}
diff --git a/app-text/kiwix/kiwix-0.9_alpha7.ebuild b/app-text/kiwix/kiwix-0.9_alpha7.ebuild
new file mode 100644
index 000000000000..bbb1198bda96
--- /dev/null
+++ b/app-text/kiwix/kiwix-0.9_alpha7.ebuild
@@ -0,0 +1,40 @@
+# 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
+}
-- 
cgit v1.2.3-65-gdbad