New prerelease.

Package-Manager: portage-2.2_rc73/cvs/Linux x86_64

4 files changed, 12 insertions, 35 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/Manifest b/app-text/kiwix/Manifest
index 508d4be4b4c8..fc919debf545 100644
--- a/app-text/kiwix/Manifest
+++ b/app-text/kiwix/Manifest
@@ -1,6 +1,5 @@
-AUX kiwix-0.9-custom-build-flags.patch 680 RMD160 fcd4cbce8f0c3d95b7c9afec93d9bfea464982e3 SHA1 db83e540c399e785e02db5ec43c6d2410efd8d1f SHA256 43b38e250298cd45747ee30eefeeb4a8de0173212111ddf4d32c194c4d253cc0
 AUX kiwix-0.9-find-xulrunner.patch 301 RMD160 c116ab1b52632003a85fc43defe4982c51198ff1 SHA1 0cbc6e7b47232eb3c8e2f86e6405f3ca41ea95e0 SHA256 9eea81269b4ab994da26917271390a3bbeee09698935348608f8d6bccb9c8205
-DIST kiwix-0.9-alpha5-src.tar.bz2 469065 RMD160 4ed0aaaa512edc144924e2397d040547e01dd53a SHA1 db952a8a914300a30589f1f2c1a561c1ca33bd05 SHA256 3ebcceadcd54f88ac6f54fdf3badaed1f405984c17e0bacf8b5d2556b5b06f17
-EBUILD kiwix-0.9_alpha5.ebuild 1244 RMD160 0d991192b2ead49865e5d07b3dcced5fa18247b9 SHA1 4d87da253d8cf3b88591b9e61812b1ac4927c5c8 SHA256 cf2e2c8e21b3478168f8e7411c0ed524ba0562f3f50dee2c87e9fcd273d7b813
-MISC ChangeLog 453 RMD160 0d682d07bc95b88d3f5d5e93e97f23fb12582e25 SHA1 b66c6a8c80afd640fa62e8e58c67bcfb4c7d5f9e SHA256 8b1a1edfca68a504bbbb05ef932f9c49832b1348905f6c6982834cdaf6aff58f
+DIST kiwix-0.9-alpha6-src.tar.bz2 485160 RMD160 395d7f06e7413cfe7fb518648ac845279a749884 SHA1 568a9b7f779149b4bb8df1926d96ebe9d8f66501 SHA256 72e283051f3fcce42fb5a5751de94a3b09dcea035da301509adf50c0a9a3ae5b
+EBUILD kiwix-0.9_alpha6.ebuild 951 RMD160 a860f15f3f68ff13208270e343dc34f876411a4a SHA1 b874378bb252886c1473d9b12f113e4ff59d14e8 SHA256 a6fa4b317b678d92a15192dde77cdd7c2ab1dd603f4177db45a75d0a9a6230f3
+MISC ChangeLog 673 RMD160 e54c81d0f9efcc24399aba7f3516282817453661 SHA1 340a3a4660b547d0b85f54ca8744d51843cfca7a SHA256 82618896f4592b4bd7cd7636e2af4ba4089a45ad346077bba11b59c16dfd1f6a
 MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
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
 }