Version bump. Fixes bug 155671 and 234360. Cryos blessed this one :]

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64

5 files changed, 279 insertions, 12 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index ee35dc5da910..2c72194d9e95 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-misc/boinc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.41 2008/08/06 18:23:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.42 2008/11/24 19:03:49 scarabeus Exp $
+
+*boinc-6.2.15 (24 Nov 2008)
+
+  24 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/boinc-6.2.15-mute-warnings.patch,
+  +files/boinc-6.2.15-project-list-size.patch, +boinc-6.2.15.ebuild:
+  Version bump. Mostly rewrite from scratch.
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 127e751e383f..69782e227191 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,10 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 08_all_Makefile.patch 792 RMD160 b2126e243dc1c7b49e44740e67fe9b3b2aa9e6c3 SHA1 581132deec4ec3b305f8343aa4a12132e59d8e97 SHA256 bbbd219ac38491e0afb3d58d4a29eda79a30fdf4eed3f46cf18b66ce25f0b6df
 AUX boinc-4.72.20050813-gcc4-fix.patch 315 RMD160 5dab42ab983a65f604379129778ceb998709d35c SHA1 a0962070649c9de2b03f422cb94fcc4f29161f64 SHA256 33a51d973482e8f912ce702e95e074c864b45ca5e8a0224f5c591e3d06e39fe6
 AUX boinc-5.10.45-gcc4.3.patch 1765 RMD160 369ad23dab9790ba2c4e3304df1df5957f75a0a9 SHA1 f351a5da162d786b02175a2e7310aa73b3e8f884 SHA256 157c7a1235b3af86d5b65801caf26c82a92a71a51435a18b5a048906488e2db2
 AUX boinc-5.2.14-gcc-4.1.patch 433 RMD160 8ba92e4c8220fe3fd3bce8bb1bdbb6005b341b26 SHA1 3563ffd4227e32a9944b4dd785615cb47a6f1638 SHA256 44b584967c066def876976950366a9e26bb4763f1a48fb165df2aa9f27d4ae0e
+AUX boinc-6.2.15-mute-warnings.patch 1155 RMD160 a3673a3eed683bc30911e9a803e2b0a596a04a0e SHA1 3e7f6f9a701da2fc182673be91877a8ae529131c SHA256 f8dd1593e27d61bd292ad5551040d8fad87f7c5ef0efa5e72cb808c8122512c7
+AUX boinc-6.2.15-project-list-size.patch 508 RMD160 b63342aece3a93e519ee1c97c3eae1db4988856e SHA1 4290cdb78f47321503c7a0310ded0aab90cd5c21 SHA256 9bfa67c54901af934dbc321d23af3f63790d6aa9f70355061a251efc2c362357
 AUX boinc.conf 440 RMD160 eb56e84e0bb56d033fb1b8ff692343eb22fd6877 SHA1 7560db67952b01152f69f3caa5511d267533cc33 SHA256 bf989320e14597fc24d54a24881dafec8a141075a7da71138ca32771d66c6713
 AUX boinc.init 1823 RMD160 946cd1f150fc0878dd3523142085147955709416 SHA1 60fad8a5cddec744f170be49d7254fff1f30ee2b SHA256 2eeb0a668dbe62905097e7a93acae854520ae0d939061543013a663c3ddf812a
 DIST boinc-5.10.28.tar.bz2 17176403 RMD160 9165a68836384f13e29f82c120fb43eaafd5825e SHA1 b96c0be56c608f7db0ddba14f9f6b35b6575636a SHA256 7a9c1d02b7216e7c031e88bf4feec4fc399909cfb965be2de170489b232ace42
@@ -14,6 +13,9 @@ DIST boinc-5.2.14.tar.bz2 6493301 RMD160 e5a87514c9a1062d5b777c2ab008b3d253ccfe8
 DIST boinc-5.4.11.tar.bz2 9604328 RMD160 5dc29d9720ca3bff6015991fbabe97929b4b1fb0 SHA1 3cca64c425f0ed6c4f511bb3537a59e0594db090 SHA256 cd67228ca08794714177e101f8a3b611a1f5e7d24506aaf3cf4edfa548c04a85
 DIST boinc-5.5.6.tar.bz2 9211643 RMD160 f1fc9405184146bce972002332b6271ab6940849 SHA1 ca51c621306d42a9a09e5949f9e86a2af1102267 SHA256 a23b01016c3c6664ad1ec21b8731a4a2648b47a8ceac8bcc13f09f86af017194
 DIST boinc-5.8.15.tar.bz2 3544744 RMD160 cdeb0a544be911db3f1d505f6cd9eb7c8a4971cb SHA1 924af911f22ca175c78614a9da9177e430a9a61e SHA256 0e428af6a76dd41786f15c9de0a31a403613b2e366c0f5b950e2be266f82b902
+DIST boinc-6.2.15.tar.bz2 9190009 RMD160 37cbcd520a309f1e8cfb8805558be4490c13703c SHA1 386e0c009973e0da903a5a0a92f1dac92ccd9789 SHA256 7d0a8ff05d85e4739a0aa3a4d905bf6c3ec25275d73b35f7e497154996cf0bac
+DIST boinc_6.2.15_i686-pc-linux-gnu.sh 4354474 RMD160 c9d51d0de3690e100fe6ff593b007fd32a4b867b SHA1 ecaede21b8167773077b82f578646485032ff7bc SHA256 0c7512800a49e09f27b3d086c06bc6472253ac2c39de07b091279df3ad68b9cb
+DIST boinc_6.2.15_x86_64-pc-linux-gnu.sh 4545778 RMD160 039e88eeaa001f7dd394aaa959b9d6adc134bf3d SHA1 19e0d13549489c249c1bcdb629ef199c584c94d2 SHA256 33764c50d6761ffdfd4f9876cad595c3f0e0959bc16b6104aa6ed103e51d4b5b
 DIST boinc_public-cvs-2005-08-13.tar.gz 6054534 RMD160 2585effd13c1b6e093141dbc34bebd770c6041be SHA1 3c76cb8b00ad7e26fe05cfacfe135fd2fbaeb99d SHA256 3a8b7f3d462a0fa5f1d0ad14c77f790a3cf12b1237a09636cd82b9bfefc2afb7
 EBUILD boinc-4.72.20050813-r3.ebuild 2406 RMD160 61c3f6b68d11274809b28be2884e1193628df5bd SHA1 2ccc849dc4c126927b604e6f0c423ad1f09ec7ac SHA256 b3654c9661ed7665ebd979ec06a598c9bca8a4b92c0d20f11a2692b752d3b9aa
 EBUILD boinc-5.10.28.ebuild 3265 RMD160 2f7c28dd5ea8f0b43c81340664250fb4a6675078 SHA1 c66861288e679b8f534982b19446964a714851ce SHA256 abb9585c34343ced9c37afbea92b98f9517bb6a7357eaab07c1aaeb87da082bc
@@ -22,12 +24,6 @@ EBUILD boinc-5.2.14.ebuild 2865 RMD160 5c487bd33698548f7b7bcce640ed6aff19af2d19
 EBUILD boinc-5.4.11.ebuild 2852 RMD160 352a4461cb1eecab7fd58075487e605bd25e020b SHA1 ce232ac48c604fd2b0507c8f4c3c251b6f540d82 SHA256 40ca209c770d950614226a34041d9fe10d7c5c37f772a51f5012072c013ed281
 EBUILD boinc-5.5.6.ebuild 3084 RMD160 2a012f47be92b9de7504f576d7397cd2c770b66c SHA1 64cbfcf31c3b441c311d31090cc658d35083cad6 SHA256 8971eaf9a31c3265b8c61f49fd42f1fb79130891fd72af19956b60fd6b472643
 EBUILD boinc-5.8.15.ebuild 3260 RMD160 882057492e1ed36a3d89cafd0d1edf45a8efa18e SHA1 c7761c2e45d5ac503033a2b8fa56c9bcdbc8a9df SHA256 1224a7110ccbec86801b69a02d2aeff7655ee4efe3a0d99ab0908c6615524bea
-MISC ChangeLog 8289 RMD160 3936fe090350b9bae43f9ebd6f8f2a1abe87e684 SHA1 6463c189f42c738ec2be4f552eb56f436ce40ca6 SHA256 a6326e47eecfdcccf47d537aff91cc339685b277907e61894cc94914b32f9555
+EBUILD boinc-6.2.15.ebuild 6593 RMD160 485e29024f4ddd7ad52b9b0129fa4b7086b0b48f SHA1 0189ef095df281bd634e8e34728ed431994de948 SHA256 35c97606798b58481353056160b52370e267af7d357eff3fd0ce30b0ae087e52
+MISC ChangeLog 8534 RMD160 221f2bc7244e06efa4d1ae43468d9e868b3faa2d SHA1 ddf745bcd66467944c25e87a911b408ea977b2c4 SHA256 7d60a2107301a907bc92cda888a060909be5033207970e031e8d6eab19a00b51
 MISC metadata.xml 475 RMD160 2af23090b07df03f6c9606c9abf20f6eaf75c857 SHA1 cc12576d9321ca75174d9d183093c526807e835c SHA256 be29254b1f37bd801bc54757cc3b77af0baad45f349de6bf3e2f03076f7bf494
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiZ7EsACgkQOeoy/oIi7uwL3wCdHyLqLccMRXy8EEDN/t9c9XUK
-tc8An2XkswGwVDbIWLHWeqRsvftCup55
-=VFZz
------END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-6.2.15.ebuild b/sci-misc/boinc/boinc-6.2.15.ebuild
new file mode 100644
index 000000000000..ec4195d0f8dd
--- /dev/null
+++ b/sci-misc/boinc/boinc-6.2.15.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.2.15.ebuild,v 1.1 2008/11/24 19:03:49 scarabeus Exp $
+
+EAPI="1"
+
+inherit depend.apache flag-o-matic wxwidgets autotools
+
+MY_PV="${PV//./_}"
+DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
+HOMEPAGE="http://boinc.ssl.berkeley.edu/"
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2
+		bindist? ( amd64? ( http://${PN}dl.ssl.berkeley.edu/dl/${P/-/_}_x86_64-pc-linux-gnu.sh )
+					x86? ( http://${PN}dl.ssl.berkeley.edu/dl/${P/-/_}_i686-pc-linux-gnu.sh )
+				)"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="X bindist server unicode"
+# bindist is only for x86 and amd64 for rest package.use.mask
+
+RDEPEND="sys-libs/zlib
+	>=net-misc/curl-7.15.5
+	>=dev-libs/openssl-0.9.7
+	X? ( =x11-libs/wxGTK-2.8* )
+	server? (
+		!bindist? (
+			>=virtual/mysql-4.0
+			virtual/php
+			>=dev-lang/python-2.2.3
+			>=dev-python/mysql-python-0.9.2
+		)
+	)"
+DEPEND="!bindist? (
+		>=sys-devel/gcc-3.0.4
+		>=sys-devel/autoconf-2.58
+		>=sys-devel/automake-1.8
+		>=dev-util/pkgconfig-0.15
+		>=sys-devel/m4-1.4
+	)
+	X? ( x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-proto/xproto
+		media-libs/freeglut
+		virtual/glu
+		media-libs/jpeg )
+	server? ( !bindist? ( virtual/imap-c-client ) )
+	${RDEPEND}"
+# subversion is not needed only if user choose binary for amd64 or x86
+want_apache server
+
+LANGS="ar be bg ca cs da de el en_US es eu fi fr hr hu it ja lt lv nb nl pl pt pt_BR ro ru sk sl sv_SE tr uk zh_CN zh_TW"
+for LNG in ${LANGS}; do
+	IUSE="${IUSE} linguas_${LNG}"
+done
+
+src_unpack() {
+	local target
+
+	if ! use bindist; then
+		unpack ${P}.tar.bz2
+		cd "${S}"
+		# replace CXXFLAGS, those added are suggested by upstream
+		sed -i \
+			-e "s:-O3 -fomit-frame-pointer -fforce-addr -ffast-math \$(AM_CPPFLAGS):\$(AM_CPPFLAGS) -O3 -funroll-loops -fforce-addr	-ffast-math:" \
+			client/Makefile.am || die "sed client/Makefile.am failed"
+		# silence warnings
+		epatch "${FILESDIR}"/"${P}"-project-list-size.patch
+		epatch "${FILESDIR}"/"${P}"-mute-warnings.patch
+		# do autoreconf
+		rm "${S}"/m4/libtool.m4
+		AT_M4DIR="m4" eautoreconf
+	else
+		use server && elog "Server feature is working only for source build, please disable bindist if you really intend to use server."
+		use x86 && target="i686" || target="x86_64"
+		cp "${DISTDIR}"/${P/-/_}_${target}-pc-linux-gnu.sh "${WORKDIR}"
+		cd "${WORKDIR}"
+		sh ${P/-/_}_${target}-pc-linux-gnu.sh
+	fi
+}
+
+src_compile() {
+	if ! use bindist; then
+		if use X; then
+			WX_GTK_VER=2.8
+			use unicode && need-wxwidgets unicode || need-wxwidgets gtk2
+			wxconf="--with-wx-config=${WX_CONFIG}"
+		fi
+
+		econf \
+			--enable-client \
+			--with-ssl \
+			${wxconf} \
+			$(use_enable unicode) \
+			$(use_enable server) \
+			$(use_with X x) || die "econf failed"
+
+		# Make it link to the compiled libs, not the installed ones
+		# remove precompiled binaries from svn
+		sed -i \
+			-e "s:LDFLAGS = :LDFLAGS = -L../lib :g" \
+			*/Makefile || die "sed failed"
+		emake || die "emake failed"
+	fi
+}
+
+src_install() {
+	mkdir -p "${D}"/var/lib/${PN}/
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	if ! use bindist; then
+		cp "${S}"/ca-bundle.crt "${D}"/var/lib/${PN}
+		make install DESTDIR="${D}" || die "make install failed"
+		# icon
+		newicon "${S}"/sea/${PN}mgr.48x48.png ${PN}.png
+		# wrapper to allow gui to load gui_rpc_auth.cfg because ${PN} devs assume curdir to be datadir for ${PN}_gui
+		mv "${D}"/usr/bin/${PN}_gui "${D}"/usr/bin/${PN}mgr
+		echo "cd \"/var/lib/${PN}\" && exec /usr/bin/${PN}mgr \$@" > "${D}"/usr/bin/${PN}_gui
+		chmod 755 "${D}"/usr/bin/${PN}_gui
+		# desktop
+		if use X; then
+			make_desktop_entry ${PN}_gui ${PN} ${PN} "Education;Science" /var/lib/${PN}
+		fi
+		# required headers by seti@home
+		insopts -m0644
+		insinto /usr/include/${PN}
+		doins "${S}"/api/{reduce.h,graphics_api.h,graphics_data.h,${PN}_gl.h}
+		# symlink locale so it actualy work for source dist.
+		insinto /usr/share/locale/
+		cd "${S}"/locale/client
+		for LNG in ${LINGUAS}; do
+			doins -r ${LNG}
+		done
+		dosym /usr/share/locale /var/lib/${PN}/locale
+		cd "${S}"
+	else
+		local S_BIN="${WORKDIR}"/BOINC
+		cd "${S_BIN}"
+		cp "${S_BIN}"/ca-bundle.crt "${D}"/var/lib/${PN}
+		# fix ${PN}.conf file for binary package
+		sed -i -e "s:/usr/bin/${PN}_client:/opt/${PN}/${PN}:g" "${D}"/etc/conf.d/${PN}
+		if use X; then
+			# icon
+			newicon "${S_BIN}"/${PN}mgr.48x48.png ${PN}.png
+			# desktop
+			make_desktop_entry /opt/${PN}/run_manager "${PN}" ${PN} "Education;Science"	/var/lib/${PN}
+		fi
+		# use correct path in scripts
+		sed -i \
+			-e "s:${S_BIN}:/var/lib/${PN}:g" \
+			-e "s:./${PN}:/opt/${PN}/${PN}:g" \
+			run_client || die "sed run_client failed"
+		sed -i \
+			-e "s:${S_BIN}:/var/lib/${PN}:g" \
+			-e "s:./${PN}mgr:/opt/${PN}/${PN}mgr:g" \
+			run_manager || die "sed run_manager failed"
+		# install binaries
+		exeopts -m0755
+		exeinto /opt/${PN}
+		doexe "${S_BIN}"//{${PN},${PN}_cmd,${PN}cmd,${PN}mgr,run_client,run_manager}
+		fowners 0:${PN} /opt/${PN}/{${PN},${PN}_cmd,${PN}cmd,${PN}mgr,run_client,run_manager}
+		# locale
+		mkdir -p "${D}"/opt/${PN}/locale
+		insopts -m0644
+		insinto /opt/${PN}/
+		cd "${S_BIN}"/locale/
+		for LNG in ${LINGUAS}; do
+			doins -r "${LNG}"
+		done
+		dosym /opt/${PN}/locale /var/lib/${PN}/locale
+		cd "${S}"
+	fi
+	fowners ${PN}:${PN} /var/lib/${PN}/ca-bundle.crt
+	chown ${PN}:${PN} "${D}"/var/lib/${PN}
+}
+
+pkg_preinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+pkg_postinst() {
+	echo
+	if use bindist; then
+		elog "You are using the binary distributed version."
+		elog "The manager can be found at /opt/${PN}/run_manager"
+	fi
+	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"
+	elog "${PN} The howto for configuration is located at:"
+	elog "http://${PN}.berkeley.edu/anonymous_platform.php"
+	if use server && ! use bindist ; then
+		echo
+		elog "You have chosen to enable server mode. this ebuild has installed"
+		elog "the necessary packages to be a server. You will need to have a"
+		elog "project. Contact ${PN} directly for further information."
+	fi
+	echo
+	# 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 which is randomly generated "
+	elog "by ${PN} upon successfully running the gui for the first time."
+	elog "You can change this to something more memorable."
+	echo
+}
diff --git a/sci-misc/boinc/files/boinc-6.2.15-mute-warnings.patch b/sci-misc/boinc/files/boinc-6.2.15-mute-warnings.patch
new file mode 100644
index 000000000000..a2a9ba32f9e9
--- /dev/null
+++ b/sci-misc/boinc/files/boinc-6.2.15-mute-warnings.patch
@@ -0,0 +1,47 @@
+--- lib/parse.h.orig	2008-09-15 16:37:16.000000000 -0700
++++ lib/parse.h	2008-09-15 16:44:37.000000000 -0700
+@@ -23,9 +23,10 @@
+ #ifdef _WIN32
+ #include "boinc_win.h"
+ #else
+-#include "config.h"
++//#include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
+--- api/boinc_gl.h.orig	2008-09-15 16:42:22.000000000 -0700
++++ api/boinc_gl.h	2008-09-15 16:42:42.000000000 -0700
+@@ -37,7 +37,7 @@
+ 
+ 
+ #else // !_WIN32, !__APPLE_CC__
+-#include "config.h"
++//#include "config.h"
+ 
+ #  if defined(HAVE_GL_H)
+ #    include <gl.h>
+--- ./api/texfont.C.orig	2008-09-15 18:28:54.000000000 -0700
++++ ./api/texfont.C	2008-09-15 18:31:56.000000000 -0700
+@@ -7,6 +7,8 @@
+ #pragma warning (disable:4244)          // disable bogus conversion warnings
+ #endif
+ 
++#include "config.h"
++
+ #include <assert.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+--- api/txf_util.C.orig	2008-09-15 18:32:24.000000000 -0700
++++ api/txf_util.C	2008-09-15 18:32:40.000000000 -0700
+@@ -24,6 +24,8 @@
+ #include "boinc_win.h"
+ #endif
+ 
++#include "config.h"
++
+ #include <cstring>
+ #include "filesys.h"
+ #include "boinc_api.h"
diff --git a/sci-misc/boinc/files/boinc-6.2.15-project-list-size.patch b/sci-misc/boinc/files/boinc-6.2.15-project-list-size.patch
new file mode 100644
index 000000000000..2f28f3bc018b
--- /dev/null
+++ b/sci-misc/boinc/files/boinc-6.2.15-project-list-size.patch
@@ -0,0 +1,10 @@
+--- clientgui/ProjectInfoPage.cpp.orig	2008-09-16 17:17:02.000000000 -0700
++++ clientgui/ProjectInfoPage.cpp	2008-09-16 17:57:51.000000000 -0700
+@@ -132,6 +132,7 @@
+     m_pProjectListCtrl = new CProjectListCtrl;
+     m_pProjectListCtrl->Create( itemWizardPage23 );
+     itemFlexGridSizer3->Add(m_pProjectListCtrl, 0, wxGROW|wxRIGHT, 10);
++    itemFlexGridSizer3->SetMinSize(-1,200);
+ 
+     wxFlexGridSizer* itemFlexGridSizer11 = new wxFlexGridSizer(2, 1, 0, 0);
+     itemFlexGridSizer11->AddGrowableRow(0);