summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-09-02 19:29:23 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-09-02 19:29:23 +0000
commit1588f22733dbe3956dbcbdd7872889c068d1bd2d (patch)
tree86088592cbf6899ec6b35446d94ebb6cde030598 /app-text/kiwix
parentVersion bump. Thanks to Ultrabug for testing. Drop old. (diff)
downloadgentoo-2-1588f22733dbe3956dbcbdd7872889c068d1bd2d.tar.gz
gentoo-2-1588f22733dbe3956dbcbdd7872889c068d1bd2d.tar.bz2
gentoo-2-1588f22733dbe3956dbcbdd7872889c068d1bd2d.zip
New prerelease.
(Portage version: 2.2_rc73/cvs/Linux x86_64)
Diffstat (limited to 'app-text/kiwix')
-rw-r--r--app-text/kiwix/ChangeLog9
-rw-r--r--app-text/kiwix/files/kiwix-0.9-custom-build-flags.patch21
-rw-r--r--app-text/kiwix/kiwix-0.9_alpha6.ebuild (renamed from app-text/kiwix/kiwix-0.9_alpha5.ebuild)10
3 files changed, 9 insertions, 31 deletions
diff --git a/app-text/kiwix/ChangeLog b/app-text/kiwix/ChangeLog
index e49b483d7fee..9606e9ed1941 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.1 2010/08/14 14:31:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kiwix/ChangeLog,v 1.2 2010/09/02 19:29:22 chithanh Exp $
+
+*kiwix-0.9_alpha6 (02 Sep 2010)
+
+ 02 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ -kiwix-0.9_alpha5.ebuild, +kiwix-0.9_alpha6.ebuild,
+ -files/kiwix-0.9-custom-build-flags.patch:
+ New prerelease.
*kiwix-0.9_alpha5 (14 Aug 2010)
diff --git a/app-text/kiwix/files/kiwix-0.9-custom-build-flags.patch b/app-text/kiwix/files/kiwix-0.9-custom-build-flags.patch
deleted file mode 100644
index cb0d4ed2754c..000000000000
--- a/app-text/kiwix/files/kiwix-0.9-custom-build-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2010-08-14 15:37:39.864000026 +0200
-+++ b/configure.ac 2010-08-14 15:45:49.650000027 +0200
-@@ -45,8 +45,8 @@
-
- # default $CPPFLAGS and $LDFLAGS
- CPPFLAGS=""
-- CFLAGS="-O6"
-- LDFLAGS=""
-+ CFLAGS="${CFLAGS}"
-+ LDFLAGS="${LDFLAGS}"
- LIBS=""
- LD_PATH=""
- LD_LIBRARY_PATH=""
-@@ -376,4 +376,4 @@
- # Save the install prefix in the default application preferences
- sed -i "s/\"kiwix.install.prefix\"\,\ \"[[^\"]]*\"/\"kiwix.install.prefix\"\,\ \"$(echo $prefix | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g' -e 's/&/\\\&/g')\"/" ./kiwix/defaults/preferences/preferences.js
-
--fi
-\ Kein Zeilenumbruch am Dateiende.
-+fi
diff --git a/app-text/kiwix/kiwix-0.9_alpha5.ebuild b/app-text/kiwix/kiwix-0.9_alpha6.ebuild
index a7d197c84541..ef2dad88507b 100644
--- a/app-text/kiwix/kiwix-0.9_alpha5.ebuild
+++ b/app-text/kiwix/kiwix-0.9_alpha6.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_alpha5.ebuild,v 1.1 2010/08/14 14:31:14 chithanh Exp $
+# $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
@@ -30,18 +30,10 @@ 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-build-flags.patch
eautoreconf
}
src_install() {
- # installation fails without these directories
- dodir /usr/bin/
- dodir /usr/$(get_libdir)/
- dodir /usr/share/
- ln -s $(get_libdir) "${D}"/usr/lib
emake DESTDIR="${D}" install || die
- # remove that symlink after install, or bad things happen on unmerge
- rm "${D}"/usr/lib
dodoc AUTHORS CHANGELOG README || die
}