Version bump. Drop old. Per bug #292640.

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

6 files changed, 51 insertions, 202 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index c731a17fa799..7a33372fad50 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.78 2009/10/20 10:18:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.79 2009/11/10 21:14:27 scarabeus Exp $
+
+*boinc-6.10.18 (10 Nov 2009)
+
+  10 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/6.4.5-RSA_security.patch, -boinc-6.4.5-r2.ebuild,
+  -files/6.4.5-gcc44.patch, -files/6.4.5-nostrip.patch,
+  +boinc-6.10.18.ebuild:
+  Version bump. Drop old. Per bug #292640.
 
   20 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   boinc-6.6.40-r2.ebuild:
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 828998439f45..ba39cf306e8c 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,7 +1,4 @@
-AUX 6.4.5-RSA_security.patch 2413 RMD160 8bf2d0573fedbdbc54f0c479747a23f0ff840f22 SHA1 e5fcafdd0da06a8a59350ff85cf3725e9ff8cede SHA256 f21a6904459ffcfd40cc0804d4a7f46e5a9ef013c217f204e100a8adf8cd4f87
-AUX 6.4.5-gcc44.patch 1831 RMD160 82aaff8e51077c712b318a473a77a69ec1e1b615 SHA1 bdd2f4baa48d7949d37150e926dcd0a0625caaf8 SHA256 63d9005aab4e60522f32484694c42f70d291b492c76a839aff348be052845fc4
 AUX 6.4.5-glibc210.patch 300 RMD160 0ca2f52c4265cf5a5763a7c1e2ce27bdc929bde8 SHA1 5a5a51b299e52d8a9ceba8c454b35488260721ea SHA256 b39db0c5208fc3c0a89ae0b0d809e5f8f72e7494c98e1b0b23eadcc5c8243377
-AUX 6.4.5-nostrip.patch 1052 RMD160 9a23c9cd8f3a47fe53fe8cccfca6d0b94587f716 SHA1 bae0a9de0c0980fd1f64e8b60a74548554dbe382 SHA256 f301d68819c4d93b930d4179ff2bb604d23ca7e221d843c6ed6cf65f27a53da2
 AUX 6.6.40-as-needed.patch 739 RMD160 64a80b43dc019c86f58714ad267bd4ec7f14f23a SHA1 23e210510481504be4a2d67ce82fd3b09a305c20 SHA256 58e4b1ed66c5f2c3f55b97e1807e77a6b908257d0e0d35247883e6eeca0cbee9
 AUX 6.6.40-cuda.patch 3443 RMD160 7e3eac368615499140d4fa80c561203cf2783757 SHA1 963e7f30730e199e40a08c36795e01a247cf08ff SHA256 0288b704e9eebbf29a3c76533d30e86c9a00bad6a9c5b1773afdedc7ee5c5bc7
 AUX 6.6.40-fcgi.patch 1842 RMD160 5f7a7d7d19e5834a29838208a2d540ffaf00730f SHA1 2a79842b0955d8c019e2b60a29f057cc2282ab33 SHA256 07ee7a662e2b01b7d732211735073995f20e736dc486ed19f33bd6c400eeff15
@@ -10,9 +7,9 @@ AUX 6.6.40-locale.patch 616 RMD160 1986ca21be9ae6ddb7a88aaa69ada8dd6ff9a10e SHA1
 AUX 6.6.40-xfersigseg.patch 496 RMD160 36a620c7bb620def6afd4a6ebe9185c93af43e95 SHA1 e16e6f7d52a1913ede838d298d71f4bb482b692c SHA256 e46648e81d97cac093b485a601e9c253c7dec9a6aa9fbf5cf4e540026c051dd3
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
 AUX boinc.init 3227 RMD160 e0d4ef541c008835a7dc6dcb66ab48680eb4bef2 SHA1 07f5849399d6edce04f4f770afc3026dcd2324f4 SHA256 dfd1ad924ba7b1204cd7bc81100451e99f008cb6f6734f0a98c2d13fe4ab36a0
-DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc SHA1 24c63d11c8e9ebda17beac359928407ce3b8678d SHA256 f6f1d053f10873ed9b3b6ce8dc4444a49f6c804196a3eb080f574db36e58557a
+DIST boinc-6.10.18.tar.bz2 11392526 RMD160 5fe8fac83181833f8085bac455c6252adb7b4d62 SHA1 07d695ba80faa7761d74a0b6d5cfabd5bb045a00 SHA256 a2d02b9a996ce398d1f32dbc40f8dcb5a7866a54c4936f64350391f624e31ea3
 DIST boinc-6.6.40.tar.bz2 9440539 RMD160 6595c0ee0dcf8d204862541039d5f74a0347dbcc SHA1 50c5f88e538ea14193df71d1954d5cabd7b5345d SHA256 16130f3a95e703dd1604039a2e5ce8c8e3ffbfe124beb8a49806b318fee46b7d
-EBUILD boinc-6.4.5-r2.ebuild 4359 RMD160 83d148188fd43b08c1b8912c71fdb80e86066509 SHA1 e5ffaf2626113ca936397b74f8c957fe8d3412b6 SHA256 0b22de626ebeceaf99bb6775c604e868408206fd3624b40bd30ec8afbb9946e4
+EBUILD boinc-6.10.18.ebuild 3951 RMD160 eb975abefb0e2f877875f59cfdba14819b414c21 SHA1 7c46c5d0fcd6cb15a177125ca6e28770fa8db70d SHA256 02ae37ec90db10936a93f9c8c89b66de39d6cfbfa7a13c2278b82b67d8b54104
 EBUILD boinc-6.6.40-r2.ebuild 3978 RMD160 7f8c5e05b5546723f177c181616e7dd083a8c6f4 SHA1 fe14419321fe776d4a36a4722bf4cefc8a7f89e0 SHA256 b9681bd38aff4eaba3895ad0303a9c9fdb29fac6c1368add5d63afcc432baeb1
-MISC ChangeLog 14701 RMD160 eed5ab16061d5b28c0739ed605c2346aab9ed47b SHA1 e0d6bdafafa5845f41ed6aa42447d395e66b02e8 SHA256 b7ada3ea36b73e50defa2d03552187766b14a98a8dec93c62bda6aba13b6dc0a
+MISC ChangeLog 14970 RMD160 b7dda7a8fe5ec556115cbab502b8c9bc23731dcd SHA1 3f1a45504e2e93aa4a8f767d69594f61a538924a SHA256 e5dc468fbd598823aa43965b4ec381fa3640cb6f2a141576bec11d954d210570
 MISC metadata.xml 897 RMD160 8fbc078bbd2c887fa5f40908f23cebc97bf2427a SHA1 0dec3c60f214c346ca2c6073384d4c6411a2f6af SHA256 202c9489d999c43b25631e8259fea9711b668322b81bb3c359e018e8c445b086
diff --git a/sci-misc/boinc/boinc-6.4.5-r2.ebuild b/sci-misc/boinc/boinc-6.10.18.ebuild
index 275ed685aeb0..286fbe21b492 100644
--- a/sci-misc/boinc/boinc-6.4.5-r2.ebuild
+++ b/sci-misc/boinc/boinc-6.10.18.ebuild
@@ -1,14 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.4.5-r2.ebuild,v 1.4 2009/07/29 11:48:31 scarabeus Exp $
-
-#
-# Don't forget to keep things in sync with binary boinc package!
-#
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.18.ebuild,v 1.1 2009/11/10 21:14:27 scarabeus Exp $
 
 EAPI="2"
 
-inherit flag-o-matic depend.apache eutils wxwidgets
+inherit flag-o-matic depend.apache eutils wxwidgets autotools
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -17,7 +13,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda server"
+IUSE="X +client cuda server"
 
 RDEPEND="
 	!sci-misc/boinc-bin
@@ -46,26 +42,26 @@ DEPEND="${RDEPEND}
 	)
 "
 
+# Upstream sucks in autotools
+#MAKEOPTS="-j1"
+
 src_prepare() {
 	# use system ssl certificates
 	mkdir "${S}"/curl
 	cp /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
-	# copy icons to correct location
-	cp "${S}"/sea/*.png "${S}"/clientgui/res/
-	# RSA Security bug fix. Per bug #258011
-	# GCC 4.4 Compilation issue. Per bug #269618
-	# Fix stripping. Per bug #257297
-	# Fix glibc 2.10 compilation issues. Per bug #276868
+
+	# prevent bad changes in compile flags, bug 286701
+	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
+
 	epatch \
-		"${FILESDIR}"/${PV}-RSA_security.patch \
-		"${FILESDIR}"/${PV}-gcc44.patch \
-		"${FILESDIR}"/${PV}-nostrip.patch \
-		"${FILESDIR}"/${PV}-glibc210.patch
+		"${FILESDIR}"/6.4.5-glibc210.patch
+
+	eautoreconf
 }
 
 src_configure() {
 	local wxconf=""
-	local config=""
+	local conf=""
 
 	# define preferable CFLAGS (recommended by upstream)
 	append-flags -O3 -funroll-loops -fforce-addr -ffast-math
@@ -74,41 +70,29 @@ src_configure() {
 	if use X; then
 		WX_GTK_VER="2.8"
 		need-wxwidgets unicode
-		wxconf="${wxconf} --with-wx-config=${WX_CONFIG}"
+		wxconf+=" --with-wx-config=${WX_CONFIG}"
 	else
-		wxconf="${wxconf} --without-wxdir"
+		wxconf+=" --without-wxdir"
 	fi
 
-	# nonstandard enable
-	use server || config="--disable-server"
-
 	# Bug #248769: don't use strlcat and friends from kerberos or similar
-	local func
-	for func in strlcat strlcpy; do
-		eval "export ac_cv_func_${func}=no"
-		append-cppflags -D${func}=boinc_${func}
-	done
+	#local func
+	#for func in strlcat strlcpy; do
+	#	eval "export ac_cv_func_${func}=no"
+	#	append-cppflags -D${func}=boinc_${func}
+	#done
+	use server || conf+=" --disable-server"
+	use X || conf+=" --disable-manager"
+	use client || conf+=" --disable-client"
 
 	# configure
 	econf \
 		--disable-dependency-tracking \
-		--with-gnu-ld \
 		--enable-unicode \
-		--enable-client \
 		--with-ssl \
+		$(use_with X x) \
 		${wxconf} \
-		${config} \
-		$(use_with X x)
-
-	# Fix LDFLAGS. Link to compiled stuff and not to installed one
-	sed -i \
-		-e "s|LDFLAGS = |LDFLAGS = -L../lib |g" \
-		*/Makefile || die "sed failed"
-}
-
-src_compile() {
-	# disable parallel build.
-	emake -j1 || die "emake failed"
+		${conf}
 }
 
 src_install() {
@@ -118,12 +102,11 @@ src_install() {
 	keepdir /var/lib/${PN}/
 
 	if use X; then
-		newicon "${S}"/sea/${PN}mgr.48x48.png ${PN}.png
-		make_desktop_entry boinc_gui "${PN}" "${PN}" "Math;Science" /var/lib/${PN}
+		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png || die
+		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" /var/lib/${PN}
 	fi
 
 	# cleanup cruft
-	rm "${D}"/usr/bin/ca-bundle.crt
 	rm -rf "${D}"/etc/
 
 	newinitd "${FILESDIR}"/${PN}.init ${PN}
@@ -143,8 +126,8 @@ pkg_setup() {
 
 pkg_postinst() {
 	echo
-	elog "You are using the source compiled version."
-	elog "The manager can be found at /usr/bin/${PN}_gui"
+	elog "You are using the source compiled version of ${PN}."
+	use X && elog "The graphical manager can be found at /usr/bin/${PN}mgr"
 	elog
 	elog "You need to attach to a project to do anything useful with ${PN}."
 	elog "You can do this by running /etc/init.d/${PN} attach"
@@ -152,13 +135,15 @@ pkg_postinst() {
 	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
 	elog
 	# Add warning about the new password for the client, bug 121896.
-	elog "If you need to use the graphical client the password is in:"
-	elog "/var/lib/${PN}/gui_rpc_auth.cfg"
-	elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
-	elog "/etc/conf.d/${PN}"
-	elog "You should change this to something more memorable (can be even blank)."
-	elog
-	elog "Remember to launch init script before using manager. Or changing the password."
+	if use X; then
+		elog "If you need to use the graphical manager the password is in:"
+		elog "/var/lib/${PN}/gui_rpc_auth.cfg"
+		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
+		elog "/etc/conf.d/${PN}"
+		elog "You should change this password to something more memorable (can be even blank)."
+		elog "Remember to launch init script before using manager. Or changing the password."
+		elog
+	fi
 	if use cuda; then
 		elog "To be able to use CUDA you should add boinc user to video group."
 		elog "To do so run as root:"
diff --git a/sci-misc/boinc/files/6.4.5-RSA_security.patch b/sci-misc/boinc/files/6.4.5-RSA_security.patch
deleted file mode 100644
index 0098444ed5e7..000000000000
--- a/sci-misc/boinc/files/6.4.5-RSA_security.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -urN boinc-6.4.5.old/lib/crypt.cpp boinc-6.4.5/lib/crypt.cpp
---- boinc-6.4.5.old/lib/crypt.cpp	2008-09-26 20:20:24.000000000 +0200
-+++ boinc-6.4.5/lib/crypt.cpp	2009-02-17 17:33:10.000000000 +0100
-@@ -243,7 +243,7 @@
- // The output block must be decrypted in its entirety.
- //
- int encrypt_private(R_RSA_PRIVATE_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
--    int n, modulus_len;
-+    int n, modulus_len, retval;
- 
-     modulus_len = (key.bits+7)/8;
-     n = in.len;
-@@ -252,17 +252,27 @@
-     }
-     RSA* rp = RSA_new();
-     private_to_openssl(key, rp);
--    RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
-+    retval = RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
-+	if (retval < 0) {
-+		RSA_free(rp);
-+		return ERR_CRYPTO;
-+	}
-     out.len = RSA_size(rp);
-     RSA_free(rp);
-     return 0;
- }
- 
- int decrypt_public(R_RSA_PUBLIC_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
-+	int retval;
-     RSA* rp = RSA_new();
-     public_to_openssl(key, rp);
--    RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
-+    retval = RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
-+	if (retval < 0) {
-+		RSA_free(rp);
-+		return ERR_CRYPTO;
-+	}
-     out.len = RSA_size(rp);
-+	RSA_free(rp);
-     return 0;
- }
- 
-diff -urN boinc-6.4.5.old/lib/error_numbers.h boinc-6.4.5/lib/error_numbers.h
---- boinc-6.4.5.old/lib/error_numbers.h	2008-08-06 20:36:30.000000000 +0200
-+++ boinc-6.4.5/lib/error_numbers.h	2009-02-17 17:34:17.000000000 +0100
-@@ -185,6 +185,7 @@
- #define ERR_RMDIR           -227
- #define ERR_SYMLINK         -229
- #define ERR_DB_CONN_LOST    -230
-+#define ERR_CRYPTO          -231
- 
- // PLEASE: add a text description of your error to 
- // the text description function boincerror() in str_util.C.
-diff -urN boinc-6.4.5.old/lib/str_util.cpp boinc-6.4.5/lib/str_util.cpp
---- boinc-6.4.5.old/lib/str_util.cpp	2008-09-26 20:20:24.000000000 +0200
-+++ boinc-6.4.5/lib/str_util.cpp	2009-02-17 17:33:50.000000000 +0100
-@@ -735,6 +735,7 @@
-         case ERR_RMDIR: return "rmdir() failed";
-         case ERR_SYMLINK: return "symlink() failed";
-         case ERR_DB_CONN_LOST: return "DB connection lost during enumeration";
-+		case ERR_CRYPTO: return "encryption error";
-         case 404: return "HTTP file not found";
-         case 407: return "HTTP proxy authentication failure";
-         case 416: return "HTTP range request error";
diff --git a/sci-misc/boinc/files/6.4.5-gcc44.patch b/sci-misc/boinc/files/6.4.5-gcc44.patch
deleted file mode 100644
index de491d926957..000000000000
--- a/sci-misc/boinc/files/6.4.5-gcc44.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -NrU5 boinc-6.4.5.orig/clientgui/common/wxFlatNotebook.cpp boinc-6.4.5/clientgui/common/wxFlatNotebook.cpp
---- boinc-6.4.5.orig/clientgui/common/wxFlatNotebook.cpp	2009-05-12 15:56:03.000000000 -0600
-+++ boinc-6.4.5/clientgui/common/wxFlatNotebook.cpp	2009-05-12 17:19:57.000000000 -0600
-@@ -605,11 +605,11 @@
- // 

- //	wxPageContainerBase

- //

- ///////////////////////////////////////////////////////////////////////////////////////////

- 

--BEGIN_EVENT_TABLE(wxPageContainerBase, wxControl)

-+BEGIN_EVENT_TABLE(wxPageContainerBase, wxPanel)

- EVT_PAINT(wxPageContainerBase::OnPaint)

- EVT_SIZE(wxPageContainerBase::OnSize)

- EVT_LEFT_DOWN(wxPageContainerBase::OnLeftDown)

- EVT_LEFT_UP(wxPageContainerBase::OnLeftUp)

- EVT_RIGHT_DOWN(wxPageContainerBase::OnRightDown)

-diff -NrU5 boinc-6.4.5.orig/sched/sched_driver.cpp boinc-6.4.5/sched/sched_driver.cpp
---- boinc-6.4.5.orig/sched/sched_driver.cpp	2009-05-12 15:56:03.000000000 -0600
-+++ boinc-6.4.5/sched/sched_driver.cpp	2009-05-12 16:01:00.000000000 -0600
-@@ -38,10 +38,11 @@
- #define AUTHENTICATOR    "49bcae97f1788385b0f41123acdf5694"
-     // authenticator of a user record
- #define HOSTID "7"
-     // ID of a host belonging to that user
- 
-+#include <cstdio>
- #include <vector>
- #include "util.h"
- 
- using std::vector;
- 
-diff -NrU5 boinc-6.4.5.orig/sched/sched_util.cpp boinc-6.4.5/sched/sched_util.cpp
---- boinc-6.4.5.orig/sched/sched_util.cpp	2009-05-12 15:56:03.000000000 -0600
-+++ boinc-6.4.5/sched/sched_util.cpp	2009-05-12 17:58:59.000000000 -0600
-@@ -102,11 +102,11 @@
- #ifndef _USING_FCGI_
- int try_fopen(const char* path, FILE*& f, const char* mode) {
- #else
- int try_fopen(const char* path, FCGI_FILE*& f, const char *mode) {
- #endif
--    char* p;
-+    const char* p;
-     DIR* d;
-     char dirpath[256];
- 
- #ifndef _USING_FCGI_
-     f = fopen(path, mode);
diff --git a/sci-misc/boinc/files/6.4.5-nostrip.patch b/sci-misc/boinc/files/6.4.5-nostrip.patch
deleted file mode 100644
index cc9da4cef949..000000000000
--- a/sci-misc/boinc/files/6.4.5-nostrip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -NrU5 boinc-6.4.5.orig/client/Makefile.in boinc-6.4.5/client/Makefile.in
---- boinc-6.4.5.orig/client/Makefile.in	2009-05-14 00:59:41.000000000 -0600
-+++ boinc-6.4.5/client/Makefile.in	2009-05-14 01:01:10.000000000 -0600
-@@ -1330,11 +1330,10 @@
- @CLIENT_BIN_FILENAME@: boinc_client
- 	rm -f $@
- 	rm -f $@.unmodified
- 	cp $? $@.unmodified
- 	@LN@ $? $@
--	@STRIP@ $@
- 
- clean-local:
- 	rm -f @CLIENT_BIN_FILENAME@
- 	rm -f @CLIENT_BIN_FILENAME@.unmodified
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -NrU5 boinc-6.4.5.orig/lib/Makefile.in boinc-6.4.5/lib/Makefile.in
---- boinc-6.4.5.orig/lib/Makefile.in	2009-05-14 00:59:41.000000000 -0600
-+++ boinc-6.4.5/lib/Makefile.in	2009-05-14 01:00:31.000000000 -0600
-@@ -950,11 +950,10 @@
- @CLIENT_CMD_BIN_FILENAME@: boinc_cmd$(EXEEXT)
- 	rm -f $@
- 	rm -f $@.unmodified
- 	cp $? $@.unmodified
- 	@LN@ $? $@
--	@STRIP@ $@
- 
- clean-local:
- 	rm -f @CLIENT_CMD_BIN_FILENAME@
- 	rm -f @CLIENT_CMD_BIN_FILENAME@.unmodified
- # Tell versions [3.59,3.63) of GNU make to not export all variables.