summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-12-12 16:50:41 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-12-12 16:50:41 +0000
commitb098553f20afcdbf95a22cf2061076dbe144da78 (patch)
treecf577a9efb5b3c2ea58aa7006a6f73eb717033d1 /app-text
parentsparc stable (diff)
downloadgentoo-2-b098553f20afcdbf95a22cf2061076dbe144da78.tar.gz
gentoo-2-b098553f20afcdbf95a22cf2061076dbe144da78.tar.bz2
gentoo-2-b098553f20afcdbf95a22cf2061076dbe144da78.zip
New prerelease. Allow custom LDFLAGS, bug #339869
(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/kiwix/ChangeLog9
-rw-r--r--app-text/kiwix/files/kiwix-0.9-custom-flags.patch14
-rw-r--r--app-text/kiwix/kiwix-0.9_alpha7.ebuild (renamed from app-text/kiwix/kiwix-0.9_alpha6.ebuild)3
3 files changed, 24 insertions, 2 deletions
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_alpha7.ebuild
index ef2dad88507b..bbb1198bda96 100644
--- a/app-text/kiwix/kiwix-0.9_alpha6.ebuild
+++ b/app-text/kiwix/kiwix-0.9_alpha7.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $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
@@ -30,6 +30,7 @@ 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
}