Version bump. Fix bug #328999, #327695 and hopefully #320747.

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

5 files changed, 29 insertions, 30 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 30bbc8e46371..cc5620a27fed 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.91 2010/07/19 20:34:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.92 2010/08/07 12:55:31 scarabeus Exp $
+
+*boinc-6.10.58-r1 (07 Aug 2010)
+
+  07 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/6.4.5-glibc210.patch, -boinc-6.10.58.ebuild,
+  +boinc-6.10.58-r1.ebuild, files/boinc.init:
+  Version bump. Fix bug #328999, #327695 and hopefully #320747.
 
   19 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> files/boinc.init:
   Whitespace.
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 04479fbb571a..dae7191a48ac 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,8 +1,7 @@
-AUX 6.4.5-glibc210.patch 300 RMD160 0ca2f52c4265cf5a5763a7c1e2ce27bdc929bde8 SHA1 5a5a51b299e52d8a9ceba8c454b35488260721ea SHA256 b39db0c5208fc3c0a89ae0b0d809e5f8f72e7494c98e1b0b23eadcc5c8243377
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
-AUX boinc.init 3358 RMD160 f895fa41fb8ff0c015df0d1f1ff0555ee4b0ec84 SHA1 558d9ca8cc61a3a92d797e6773d495ccb15a4f79 SHA256 3ba329c78988cd907107f9d9b8ef04c7fcb56fb6245eb649fde7f02ff20523ee
+AUX boinc.init 3358 RMD160 1bbc9ce8f902534113ba9bb328b98a65877329d8 SHA1 2c804a781ba2119dceae04b9cfc75a3456db9a0b SHA256 2825646d3f0d575f548fe6999e7014a1a6212abc64eae624705a66e072dde733
 AUX generate_tarball.sh 3416 RMD160 dbf729a669586beab2d79e6f4fb1c246ad778808 SHA1 b7c8aa1f08971d8e5cfa8e2543f4d8ffc83c69ba SHA256 e5ee6e3801bd5d699da6d8acb297b076d11dab61fb6e42263720bf1393bfcafc
 DIST boinc-6.10.58.tar.bz2 11599121 RMD160 f38eeaead419fdc56d406a2293d1d2c66deed61d SHA1 cba4cefffa1aaf562ef85d1b2555de4ba28255d1 SHA256 70199b0c820bf0a40d9ec54c1be2115a5cf447f4baacc7c3b67175bca7240f42
-EBUILD boinc-6.10.58.ebuild 3603 RMD160 1dafcc00888a6137af5c14669c6ef844827c7d56 SHA1 6eb99767a348c232cd82f04879a73a11ff7ce737 SHA256 1aab714232540c0da52f0fd772058fbb16734d15bdf3737a58ffd88d3c70c66b
-MISC ChangeLog 16861 RMD160 6ff4235b985b685c749fc67df93a9be03647d52f SHA1 aba4ee42cd6f7ba6f4ac523d6077665de6309323 SHA256 7af9c8e1dd200e4f83370a8094ef4d32ce3694cb10fa9dde772306d84df0ac1e
+EBUILD boinc-6.10.58-r1.ebuild 3743 RMD160 128f9bf9fd446459df826b549cfd8f37c4cb992c SHA1 e4ab5c9a18ad989f25d7b190a52d8ca53bb046f5 SHA256 29418d4cb212d54b4ac7e35938a01e27f38f49073447a6dc5219858ab63a478f
+MISC ChangeLog 17114 RMD160 68f139a71d92d61d698e5351b0b0e45bd6856eb7 SHA1 9348e8b14293bab17944a1ebe309c415e04f6d07 SHA256 f97a52b0637fc56cb9e544e605c09d6a581371a15636a2cb95793c92a7ed6103
 MISC metadata.xml 774 RMD160 a5a2ec0c50667b20da393a2a18e63fcdc94e2eb0 SHA1 16e144f257f88c1cb7ce996aec900709096ce048 SHA256 c9024478fda0e26c17e3f324090e33dd0954cc0397802dd9872a9bdf1f733e6b
diff --git a/sci-misc/boinc/boinc-6.10.58.ebuild b/sci-misc/boinc/boinc-6.10.58-r1.ebuild
index 5faf7451aaca..8d4422468208 100644
--- a/sci-misc/boinc/boinc-6.10.58.ebuild
+++ b/sci-misc/boinc/boinc-6.10.58-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.58.ebuild,v 1.1 2010/07/09 16:49:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.58-r1.ebuild,v 1.1 2010/08/07 12:55:31 scarabeus Exp $
 
 EAPI="2"
 
-inherit flag-o-matic depend.apache eutils wxwidgets autotools base
+inherit flag-o-matic depend.apache eutils wxwidgets autotools autotools-utils
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -42,6 +42,8 @@ PATCHES=(
 	"${FILESDIR}"/6.4.5-glibc210.patch
 )
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 src_prepare() {
 	# use system ssl certificates
 	mkdir "${S}"/curl
@@ -50,7 +52,7 @@ src_prepare() {
 	# prevent bad changes in compile flags, bug 286701
 	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
 
-	base_src_prepare
+	autotools-utils_src_prepare
 
 	eautoreconf
 }
@@ -76,17 +78,21 @@ src_configure() {
 	use client || conf+=" --disable-client"
 
 	# configure
-	econf \
-		--disable-dependency-tracking \
-		--enable-unicode \
-		--with-ssl \
-		$(use_with X x) \
-		${wxconf} \
+	myeconfargs=(
+		--disable-dependency-tracking
+		--disable-static
+		--enable-unicode
+		--with-ssl
+		$(use_with X x)
+		${wxconf}
 		${conf}
+	)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	base_src_install
+	autotools-utils_src_install
+	remove_libtool_files all
 
 	dodir /var/lib/${PN}/
 	keepdir /var/lib/${PN}/
diff --git a/sci-misc/boinc/files/6.4.5-glibc210.patch b/sci-misc/boinc/files/6.4.5-glibc210.patch
deleted file mode 100644
index c1f11f653fc9..000000000000
--- a/sci-misc/boinc/files/6.4.5-glibc210.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/str_util.h
-===================================================================
---- lib/str_util.h	(revision 18304)
-+++ lib/str_util.h	(working copy)
-@@ -18,6 +18,8 @@
- #ifndef STR_UTIL_H
- #define STR_UTIL_H
- 
-+#include "config.h"
-+
- #include <cstdlib>
- #include <ctime>
- #include <cctype>
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index c1dfb909a89c..975ee83d68a9 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -72,10 +72,10 @@ start() {
     if [ "${SCHED_PARAM}" = "" ]; then
         CHRT=""
     else
-    	CHRT="/usr/bin/chrt ${SCHED_PARAM}"
+    	CHRT="eval /usr/bin/chrt ${SCHED_PARAM}"
     fi
 
-	eval ${CHRT} start-stop-daemon \
+	${CHRT} start-stop-daemon \
 		--start --quiet --chdir "${RUNTIMEDIR}" \
 		--make-pidfile \
 		--pidfile "${PIDFILE}" \