Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sci-misc
diff options
context:
space:
mode:
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/boinc/ChangeLog9
-rw-r--r--sci-misc/boinc/boinc-6.6.40-r2.ebuild153
-rw-r--r--sci-misc/boinc/files/6.6.40-as-needed.patch21
-rw-r--r--sci-misc/boinc/files/6.6.40-cuda.patch80
-rw-r--r--sci-misc/boinc/files/6.6.40-fcgi.patch60
-rw-r--r--sci-misc/boinc/files/6.6.40-gui01.patch11
-rw-r--r--sci-misc/boinc/files/6.6.40-locale.patch14
-rw-r--r--sci-misc/boinc/files/6.6.40-xfersigseg.patch11
8 files changed, 8 insertions, 351 deletions
diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 9a21b7e8b471..cbae43028e85 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,13 @@
# 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.83 2009/12/03 20:04:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.84 2009/12/09 19:03:44 scarabeus Exp $
+
+ 09 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/6.6.40-as-needed.patch, -files/6.6.40-cuda.patch,
+ -files/6.6.40-fcgi.patch, -files/6.6.40-gui01.patch,
+ -files/6.6.40-locale.patch, -boinc-6.6.40-r2.ebuild,
+ -files/6.6.40-xfersigseg.patch:
+ rm
03 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> boinc-6.10.18.ebuild:
Use correct function for users install.
diff --git a/sci-misc/boinc/boinc-6.6.40-r2.ebuild b/sci-misc/boinc/boinc-6.6.40-r2.ebuild
deleted file mode 100644
index 610cd8a1f537..000000000000
--- a/sci-misc/boinc/boinc-6.6.40-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.6.40-r2.ebuild,v 1.3 2009/10/20 10:18:09 scarabeus Exp $
-
-EAPI="2"
-
-inherit flag-o-matic depend.apache eutils wxwidgets autotools
-
-DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-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 +client cuda server"
-
-RDEPEND="
- !sci-misc/boinc-bin
- !app-admin/quickswitch
- >=app-misc/ca-certificates-20080809
- dev-libs/openssl
- net-misc/curl
- sys-apps/util-linux
- sys-libs/zlib
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-2.1
- >=x11-drivers/nvidia-drivers-180.22
- )
- server? (
- >=virtual/mysql-5.0
- dev-python/mysql-python
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- server? ( virtual/imap-c-client )
- X? (
- media-libs/freeglut
- media-libs/jpeg
- x11-libs/wxGTK:2.8[X,opengl]
- )
-"
-
-# 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
-
- # prevent bad changes in compile flags, bug 286701
- sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
- epatch \
- "${FILESDIR}"/6.4.5-glibc210.patch \
- "${FILESDIR}"/${PV}-*
-
- eautoreconf
-}
-
-src_configure() {
- local wxconf=""
- local conf=""
-
- # define preferable CFLAGS (recommended by upstream)
- append-flags -O3 -funroll-loops -fforce-addr -ffast-math
-
- # look for wxGTK
- if use X; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- wxconf+=" --with-wx-config=${WX_CONFIG}"
- else
- wxconf+=" --without-wxdir"
- fi
-
- # 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
- use server || conf+=" --disable-server"
- use X || conf+=" --disable-manager"
- use client || conf+=" --disable-client"
-
- # configure
- econf \
- --disable-dependency-tracking \
- --enable-unicode \
- --with-ssl \
- $(use_with X x) \
- ${wxconf} \
- ${conf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- dodir /var/lib/${PN}/
- keepdir /var/lib/${PN}/
-
- if use X; then
- 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 -rf "${D}"/etc/
-
- newinitd "${FILESDIR}"/${PN}.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-}
-
-pkg_setup() {
- enewgroup ${PN}
- # note this works only for first install so we have to
- # elog user about the need of being in video group
- if use cuda; then
- enewuser ${PN} -1 -1 /var/lib/${PN} "${PN},video"
- else
- enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
- fi
-}
-
-pkg_postinst() {
- echo
- 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"
- elog "The howto for configuration is located at:"
- elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
- elog
- # Add warning about the new password for the client, bug 121896.
- 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:"
- elog "gpasswd -a boinc video"
- fi
-}
diff --git a/sci-misc/boinc/files/6.6.40-as-needed.patch b/sci-misc/boinc/files/6.6.40-as-needed.patch
deleted file mode 100644
index 24ccc5a75f4c..000000000000
--- a/sci-misc/boinc/files/6.6.40-as-needed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Make boinc compile with LDFLAGS="-Wl,--as-needed"
-
-2009-09-28 Martin von Gagern
-
-References:
-http://bugs.gentoo.org/286771
-http://www.gentoo.org/proj/en/qa/asneeded.xml
-
-Index: boinc-6.6.40/lib/Makefile.am
-===================================================================
---- boinc-6.6.40.orig/lib/Makefile.am
-+++ boinc-6.6.40/lib/Makefile.am
-@@ -103,7 +103,7 @@ libboinc_la_SOURCES = $(generic_sources)
- libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
--libboinc_la_LIBADD =
-+libboinc_la_LIBADD = $(SSL_LIBS)
-
- if ENABLE_FCGI
- lib_LTLIBRARIES += libboinc_fcgi.la
diff --git a/sci-misc/boinc/files/6.6.40-cuda.patch b/sci-misc/boinc/files/6.6.40-cuda.patch
deleted file mode 100644
index 30b4bba8d880..000000000000
--- a/sci-misc/boinc/files/6.6.40-cuda.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- boinc-6.6.40.orig/sched/handle_request.cpp 2009-01-14 00:06:02.000000000 +0100
-+++ boinc-6.6.40/sched/handle_request.cpp 2009-09-30 12:22:12.230008604 +0200
-@@ -1172,7 +1172,7 @@
- static inline bool requesting_work() {
- if (g_request->work_req_seconds > 0) return true;
- if (g_request->cpu_req_secs > 0) return true;
-- if (coproc_cuda && coproc_cuda->req_secs) return true;
-+ if (g_request->coproc_cuda && g_request->coproc_cuda->req_secs) return true;
- return false;
- }
-
---- boinc-6.6.40.orig/sched/sched_send.cpp 2009-01-15 21:23:20.000000000 +0100
-+++ boinc-6.6.40/sched/sched_send.cpp 2009-09-30 12:23:19.165922065 +0200
-@@ -1443,9 +1443,9 @@
- g_wreq->seconds_to_fill = clamp_req_sec(g_request->work_req_seconds);
- g_wreq->cpu_req_secs = clamp_req_sec(g_request->cpu_req_secs);
- g_wreq->cpu_req_instances = g_request->cpu_req_instances;
-- if (coproc_cuda) {
-- g_wreq->cuda_req_secs = clamp_req_sec(coproc_cuda->req_secs);
-- g_wreq->cuda_req_instances = coproc_cuda->req_instances;
-+ if (g_request->coproc_cuda) {
-+ g_wreq->cuda_req_secs = clamp_req_sec(g_request->coproc_cuda->req_secs);
-+ g_wreq->cuda_req_instances = g_request->coproc_cuda->req_instances;
- }
- if (g_wreq->cpu_req_secs || g_wreq->cuda_req_secs) {
- g_wreq->rsc_spec_request = true;
---- boinc-6.6.40.orig/sched/server_types.cpp 2009-01-13 00:05:49.000000000 +0100
-+++ boinc-6.6.40/sched/server_types.cpp 2009-09-30 12:23:57.220083086 +0200
-@@ -168,6 +168,7 @@
- have_time_stats_log = false;
- client_cap_plan_class = false;
- sandbox = -1;
-+ coproc_cuda = 0;
-
- fgets(buf, sizeof(buf), fin);
- if (!match_tag(buf, "<scheduler_request>")) return "no start tag";
-@@ -327,6 +328,7 @@
- }
- if (match_tag(buf, "coprocs")) {
- coprocs.parse(fin);
-+ coproc_cuda = (COPROC_CUDA*)coprocs.lookup("CUDA");
- continue;
- }
- if (parse_bool(buf, "client_cap_plan_class", client_cap_plan_class)) continue;
---- boinc-6.6.40.orig/sched/sched_plan.h 2008-08-06 20:36:30.000000000 +0200
-+++ boinc-6.6.40/sched/sched_plan.h 2009-09-30 12:28:05.856453380 +0200
-@@ -18,4 +18,13 @@
- #include "boinc_db.h"
- #include "server_types.h"
-
--extern bool app_plan(SCHEDULER_REQUEST&, char* plan_class, HOST_USAGE&);
-+// reasons for the planning function to reject a host
-+
-+#define PLAN_REJECT_PREFS 1
-+#define PLAN_REJECT_NO_COPROC 2
-+#define PLAN_REJECT_COPROC_VERSION 3
-+#define PLAN_REJECT_COPROC_MEM 4
-+#define PLAN_REJECT_COPROC_SPEED 5
-+#define PLAN_REJECT_UNKNOWN 6
-+
-+extern int app_plan(SCHEDULER_REQUEST&, char* plan_class, HOST_USAGE&);
---- boinc-6.6.40.orig/sched/server_types.h 2009-01-13 00:47:52.000000000 +0100
-+++ boinc-6.6.40/sched/server_types.h 2009-09-30 12:26:01.010255672 +0200
-@@ -103,6 +103,8 @@
- // Note: this is zeroed out in SCHEDULER_REPLY constructor
- //
- struct WORK_REQ {
-+ bool anonymous_platform;
-+
- // Flags used by old-style scheduling,
- // while making multiple passes through the work array
- bool infeasible_only;
-@@ -320,6 +322,7 @@
- HOST host; // request message is parsed into here.
- // does NOT contain the full host record.
- COPROCS coprocs;
-+ COPROC_CUDA* coproc_cuda;
- std::vector<RESULT> results;
- // completed results being reported
- std::vector<MSG_FROM_HOST_DESC> msgs_from_host;
diff --git a/sci-misc/boinc/files/6.6.40-fcgi.patch b/sci-misc/boinc/files/6.6.40-fcgi.patch
deleted file mode 100644
index 98c540519117..000000000000
--- a/sci-misc/boinc/files/6.6.40-fcgi.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- boinc-6.6.40.orig/client/file_names.h 2008-10-07 14:45:06.000000000 +0200
-+++ boinc-6.6.40/client/file_names.h 2009-09-30 14:57:03.147882778 +0200
-@@ -73,7 +73,6 @@
- #define REMOTEHOST_FILE_NAME "remote_hosts.cfg"
- #define ACCT_MGR_REQUEST_FILENAME "acct_mgr_request.xml"
- #define ACCT_MGR_REPLY_FILENAME "acct_mgr_reply.xml"
--#define GUI_RPC_PASSWD_FILE "gui_rpc_auth.cfg"
- #define PROJECT_INIT_FILENAME "project_init.xml"
- #define ACCT_MGR_URL_FILENAME "acct_mgr_url.xml"
- #define ACCT_MGR_LOGIN_FILENAME "acct_mgr_login.xml"
---- boinc-6.6.40.orig/lib/Makefile.am 2009-09-30 14:55:04.717196558 +0200
-+++ boinc-6.6.40/lib/Makefile.am 2009-09-30 15:01:23.272107407 +0200
-@@ -16,10 +16,25 @@
-
- if ENABLE_LIBRARIES
-
-+libfcgi_sources = \
-+ boinc_fcgi.cpp \
-+ coproc.cpp \
-+ crypt.cpp \
-+ filesys.cpp \
-+ hostinfo.cpp \
-+ md5.c \
-+ md5_file.cpp \
-+ miofile.cpp \
-+ msg_log.cpp \
-+ parse.cpp \
-+ shmem.cpp \
-+ str_util.cpp \
-+ synch.cpp \
-+ util.cpp
-+
- generic_sources = \
- app_ipc.cpp \
- base64.cpp \
-- boinc_fcgi.cpp \
- cert_sig.cpp \
- coproc.cpp \
- crypt.cpp \
-@@ -43,9 +58,9 @@
- proxy_info.cpp \
- shmem.cpp \
- str_util.cpp \
-- util.cpp \
- unix_util.cpp \
-- synch.cpp
-+ synch.cpp \
-+ util.cpp
-
- if OS_DARWIN
- mac_sources = \
-@@ -107,7 +122,7 @@
-
- if ENABLE_FCGI
- lib_LTLIBRARIES += libboinc_fcgi.la
--libboinc_fcgi_la_SOURCES = $(generic_sources) $(mac_sources)
-+libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources)
- libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
diff --git a/sci-misc/boinc/files/6.6.40-gui01.patch b/sci-misc/boinc/files/6.6.40-gui01.patch
deleted file mode 100644
index 1396851e9960..000000000000
--- a/sci-misc/boinc/files/6.6.40-gui01.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../boinc-6.6.40/clientgui/BOINCGUIApp.h 2009-09-21 21:41:28.000000000 +0200
-+++ clientgui/BOINCGUIApp.h 2009-09-24 01:28:44.510420617 +0200
-@@ -88,6 +88,8 @@
- wxString m_strBOINCMGRDataDirectory;
- wxString m_strBOINCArguments;
-
-+ bool m_bAccessibilityEnabled;
-+
- bool m_bBOINCMGRAutoStarted;
- int m_iBOINCMGRDisableAutoStart;
- int m_iShutdownCoreClient;
diff --git a/sci-misc/boinc/files/6.6.40-locale.patch b/sci-misc/boinc/files/6.6.40-locale.patch
deleted file mode 100644
index f7fa7970162d..000000000000
--- a/sci-misc/boinc/files/6.6.40-locale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN boinc-6.6.40.old/locale/Makefile.am boinc-6.6.40/locale/Makefile.am
---- boinc-6.6.40.old/locale/Makefile.am 2009-01-01 02:07:26.000000000 +0100
-+++ boinc-6.6.40/locale/Makefile.am 2009-09-26 14:30:36.000000000 +0200
-@@ -46,8 +46,8 @@
- mydir=$(DESTDIR)$(datadir) ;\
- for ldir in $(locale_dirs) ; do \
- $(INSTALL) -d $$mydir/$$ldir ; \
-- if [ -f $$ldir/BOINC-Manager.po ] ; then \
-- $(INSTALL) $$ldir/BOINC-Manager.po $$mydir/$$ldir/BOINC-Manager.po ; \
-+ if [ -f $$ldir/BOINC-Manager.mo ] ; then \
-+ $(INSTALL) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \
- fi ;\
- done
-
diff --git a/sci-misc/boinc/files/6.6.40-xfersigseg.patch b/sci-misc/boinc/files/6.6.40-xfersigseg.patch
deleted file mode 100644
index 5a96a19538ec..000000000000
--- a/sci-misc/boinc/files/6.6.40-xfersigseg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- boinc-6.6.40/client/pers_file_xfer.cpp.orig 2009-10-02 20:55:03.419212277 -0400
-+++ boinc-6.6.40/client/pers_file_xfer.cpp 2009-10-02 20:55:43.626712540 -0400
-@@ -270,7 +270,7 @@
- // so that we'll query file size on next retry.
- // Otherwise leave it as is, avoiding unnecessary size query.
- //
-- if (fxp->bytes_xferred || (fip->urls.size() > 1)) {
-+ if (last_bytes_xferred || (fip->urls.size() > 1)) {
- fip->upload_offset = -1;
- }
-