Add new as-needed patch per bug #286771. Also fix elog informations per bug #286905.

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

5 files changed, 44 insertions, 160 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index c739c9072a16..5f2590b1b305 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.72 2009/09/28 19:28:40 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.73 2009/09/29 17:45:00 scarabeus Exp $
+
+  29 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/6.6.40-as-needed.patch, -boinc-6.6.40.ebuild,
+  boinc-6.6.40-r1.ebuild:
+  Add new as-needed patch per bug #286771. Also fix elog informations per
+  bug #286905.
 
 *boinc-6.6.40-r1 (28 Sep 2009)
 
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 12cc3fcd2854..ce00a63d1d16 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -2,6 +2,7 @@ AUX 6.4.5-RSA_security.patch 2413 RMD160 8bf2d0573fedbdbc54f0c479747a23f0ff840f2
 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-gui01.patch 466 RMD160 dfd2811e72ec98590e68c9ff368b3d8af2160d4c SHA1 53e37e9f75bcb9b4637becc640e7d6bce6cddcac SHA256 842e792c9b6061b5dd5fb9fe0de6a7ff1534277d22d4833b3f757c5ed249bb90
 AUX 6.6.40-locale.patch 616 RMD160 1986ca21be9ae6ddb7a88aaa69ada8dd6ff9a10e SHA1 90e3f7382a4b00658976cc8b6e2eb4a43706f478 SHA256 a6b6be0c60c29c2ac40bb26b99adc4de458819c197bfd376b28c487bdfcb8843
 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
@@ -9,7 +10,6 @@ AUX boinc.init 3227 RMD160 e0d4ef541c008835a7dc6dcb66ab48680eb4bef2 SHA1 07f5849
 DIST boinc-6.4.5.tar.bz2 7639286 RMD160 8f7232a3e7d273076f6b2ae50b565550c03485cc SHA1 24c63d11c8e9ebda17beac359928407ce3b8678d SHA256 f6f1d053f10873ed9b3b6ce8dc4444a49f6c804196a3eb080f574db36e58557a
 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.6.40-r1.ebuild 3866 RMD160 ae4df4324eaeae37154c9ecb95ebafd87df62ced SHA1 8a810294cf2a52388e0951e907d3dc82816ac432 SHA256 9eb598b81d56b31003b3a4b91619aa3adc8e346da82fc9e345e5753c68bb812a
-EBUILD boinc-6.6.40.ebuild 3760 RMD160 ae576593b6f2296732a3ea2eae353f5ccc654307 SHA1 da5795f9a0a529bd7118891970815c87ac3e3141 SHA256 39f60f7793b6b60a5989c170e11aee027694349edc3546512fef421e11fd2daf
-MISC ChangeLog 13622 RMD160 67ff022032bef978bfc901e22156b95e9dfb54b6 SHA1 48e38f42541a8be0c54393b277d81a5fcc94b995 SHA256 6a6588cd8124c0b77ad9036921ebda69b9c2dd2b27db8a982d8769bb760fb301
+EBUILD boinc-6.6.40-r1.ebuild 3954 RMD160 c5ac872d5a4d8b9d7a18bdb90671cdd348776741 SHA1 1e29a7882c9b9a7aa30e12fe9b7edcabff175dcb SHA256 48b9b1d5e43071964f4e247a0bde00fa79c77d8f53e2dfac2efdd27412e496e7
+MISC ChangeLog 13850 RMD160 d821619bf23b88543dba45e4821a8bbe085c79c1 SHA1 c2f2f79f1567b3a1eb9d7e67360c70c49a9cf460 SHA256 862f766956b4c42a8b169e655c464bc629d0f7b6d8fc8fbc52b9fd5f8abba2b2
 MISC metadata.xml 897 RMD160 8fbc078bbd2c887fa5f40908f23cebc97bf2427a SHA1 0dec3c60f214c346ca2c6073384d4c6411a2f6af SHA256 202c9489d999c43b25631e8259fea9711b668322b81bb3c359e018e8c445b086
diff --git a/sci-misc/boinc/boinc-6.6.40-r1.ebuild b/sci-misc/boinc/boinc-6.6.40-r1.ebuild
index 76cfdfb5d33d..ce5b98d7a24a 100644
--- a/sci-misc/boinc/boinc-6.6.40-r1.ebuild
+++ b/sci-misc/boinc/boinc-6.6.40-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2009/09/28 19:28:40 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.6.40-r1.ebuild,v 1.2 2009/09/29 17:45:00 scarabeus Exp $
 
 EAPI="2"
 
@@ -88,6 +88,7 @@ src_configure() {
 		--disable-dependency-tracking \
 		--enable-unicode \
 		--with-ssl \
+		--enable-optimize \
 		$(use_with X x) \
 		${wxconf} \
 		${conf}
@@ -124,8 +125,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"
@@ -133,13 +134,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/boinc-6.6.40.ebuild b/sci-misc/boinc/boinc-6.6.40.ebuild
deleted file mode 100644
index 919d15642102..000000000000
--- a/sci-misc/boinc/boinc-6.6.40.ebuild
+++ /dev/null
@@ -1,146 +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.ebuild,v 1.3 2009/09/28 10:26:55 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]
-	)
-"
-
-src_prepare() {
-	# use system ssl certificates
-	mkdir "${S}"/curl
-	cp /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
-
-	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 \
-		--enable-optimize \
-		$(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."
-	elog "The manager can be found at /usr/bin/${PN}_gui"
-	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.
-	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 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
new file mode 100644
index 000000000000..24ccc5a75f4c
--- /dev/null
+++ b/sci-misc/boinc/files/6.6.40-as-needed.patch
@@ -0,0 +1,21 @@
+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