Version bump. Fix up missing dependency on sqlite per bug #302100.

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

4 files changed, 177 insertions, 13 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index cbae43028e85..b10313217c40 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.84 2009/12/09 19:03:44 scarabeus Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.85 2010/03/05 14:56:17 scarabeus Exp $
+
+*boinc-6.10.36 (05 Mar 2010)
+
+  05 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org> boinc-6.10.18.ebuild,
+  +boinc-6.10.36.ebuild:
+  Version bump. Fix up missing dependency on sqlite per bug #302100.
 
   09 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/6.6.40-as-needed.patch, -files/6.6.40-cuda.patch,
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 00777e8744e0..f78a8fb9e263 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 3225 RMD160 fbb2ffc29f38ce26a422bff0791bfb74b3a257df SHA1 c97b93ac32a212a5c2c1951e06237efc08540930 SHA256 726d6d96e0c81b235f3a8a4c6f27bbe115bedd9df5eb36c89c2d8169c9173296
 DIST boinc-6.10.18.tar.bz2 11392526 RMD160 5fe8fac83181833f8085bac455c6252adb7b4d62 SHA1 07d695ba80faa7761d74a0b6d5cfabd5bb045a00 SHA256 a2d02b9a996ce398d1f32dbc40f8dcb5a7866a54c4936f64350391f624e31ea3
-EBUILD boinc-6.10.18.ebuild 3581 RMD160 76cd925ee4fcc6ba79946a5d3f10f0fc25f6f966 SHA1 31aee1c90ea28fcdb10259b05c91179fda3fb183 SHA256 3d58c107fa3d6c5d9d2ed7b0a5a42862c1cfccc50da591bd5b86868519948eae
-MISC ChangeLog 15742 RMD160 f90a21c98a1811c784550027ebd9c99a0747290a SHA1 a67682e3772c770d7d1bb5f8771a45ac2622c76f SHA256 17681562f3ba3446a6a9beb15bca757bf4f421560cab010f0ae20509929212ca
+DIST boinc-6.10.36.tar.bz2 11540181 RMD160 9679724c87fa0f6f6674f791b2f09173aebd6458 SHA1 260e9bfc83a0e1982efddd3760eb81973b26bbd7 SHA256 9772b5c43bf73fbd227687b6be1df32123b79a9276ac7704e755f2efa415d966
+EBUILD boinc-6.10.18.ebuild 3583 RMD160 55065ad87cc7d331a1a1d516618085fdbe0839c9 SHA1 f590e25d695af53d8be6f104a0e8b99357ff7be5 SHA256 1f2ed350247e17f7b0f826d57338c72696064218ed25ba368f886dc882bfb273
+EBUILD boinc-6.10.36.ebuild 3583 RMD160 9a924bb774943276774b8141f769b01c06ee5bd6 SHA1 c6f87faebc2b159b96883148b5a78af9f876ed5c SHA256 18ef1a130b4dca91cb35a5ccb51bd7e16b08a7188ed4701953f5284f1ce60c68
+MISC ChangeLog 15944 RMD160 6d76683e37b337ab5077b24d149c8881c45ef65d SHA1 37a90cb5d3f569fcb1485bd00d2b2c455b7f21f6 SHA256 16e1de9d6f1376a6e37d3922b4c7f7fce3246174cfa54932e582786b633d0d03
 MISC metadata.xml 839 RMD160 e3e81da25c310a2097ce9be1195b408ac8745f69 SHA1 aff0ce126eb1ce24c4d4a076355aaf805b445866 SHA256 a64aec7e5a0df4e08d91e5a4f69040d2e7bd94663eabdcd171923c8d47904a45
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuRG2wACgkQHB6c3gNBRYfA4QCfe5ZX9vpvNm1WzsT0Y43GqKGF
+XmAAn0zlINYOCoSUsSEn6lapzlzp/lfb
+=OfNG
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-6.10.18.ebuild b/sci-misc/boinc/boinc-6.10.18.ebuild
index 951ee514e8f8..ec788587eebc 100644
--- a/sci-misc/boinc/boinc-6.10.18.ebuild
+++ b/sci-misc/boinc/boinc-6.10.18.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.18.ebuild,v 1.3 2009/12/03 20:04:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.10.18.ebuild,v 1.4 2010/03/05 14:56:17 scarabeus Exp $
 
 EAPI="2"
 
-inherit flag-o-matic depend.apache eutils wxwidgets autotools
+inherit flag-o-matic depend.apache eutils wxwidgets autotools base
 
 DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
 HOMEPAGE="http://boinc.ssl.berkeley.edu/"
@@ -27,15 +27,20 @@ RDEPEND="
 		>=dev-util/nvidia-cuda-toolkit-2.1
 		>=x11-drivers/nvidia-drivers-180.22
 	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
 	X? (
+		dev-db/sqlite:3
 		media-libs/freeglut
 		media-libs/jpeg
 		x11-libs/wxGTK:2.8[X,opengl]
 	)
 "
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/6.4.5-glibc210.patch
+)
 
 src_prepare() {
 	# use system ssl certificates
@@ -45,8 +50,7 @@ src_prepare() {
 	# 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
+	base_src_prepare
 
 	eautoreconf
 }
@@ -82,7 +86,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	base_src_install
 
 	dodir /var/lib/${PN}/
 	keepdir /var/lib/${PN}/
diff --git a/sci-misc/boinc/boinc-6.10.36.ebuild b/sci-misc/boinc/boinc-6.10.36.ebuild
new file mode 100644
index 000000000000..169d2a23f982
--- /dev/null
+++ b/sci-misc/boinc/boinc-6.10.36.ebuild
@@ -0,0 +1,142 @@
+# 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.36.ebuild,v 1.1 2010/03/05 14:56:17 scarabeus Exp $
+
+EAPI="2"
+
+inherit flag-o-matic depend.apache eutils wxwidgets autotools base
+
+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"
+
+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
+	)
+	X? (
+		dev-db/sqlite:3
+		media-libs/freeglut
+		media-libs/jpeg
+		x11-libs/wxGTK:2.8[X,opengl]
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/6.4.5-glibc210.patch
+)
+
+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"
+
+	base_src_prepare
+
+	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
+
+	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() {
+	base_src_install
+
+	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_preinst() {
+	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
+}