Prevent bad changes in compile flags.

Fix bug 286701.
Package-Manager: portage-14420-svn/cvs/Linux ppc

3 files changed, 156 insertions, 2 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 0a61136c56b9..c739c9072a16 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2009/09/28 10:26:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.72 2009/09/28 19:28:40 volkmar Exp $
+
+*boinc-6.6.40-r1 (28 Sep 2009)
+
+  28 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> +boinc-6.6.40-r1.ebuild:
+  Prevent bad changes in compile flags, fix bug 286701
 
   28 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> boinc-6.6.40.ebuild:
   Enable optimalizations by default.
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 0eae0618b23c..12cc3fcd2854 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -9,6 +9,7 @@ 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 13460 RMD160 620454547f6d25e3145c75f51bed12c24d2dbfaf SHA1 ea30ad73a4a78831e4baab43901f4fd77a606ed2 SHA256 954795e386cdf287795d7f6bfd0c7dc05702275e37c3404023a447331efac52f
+MISC ChangeLog 13622 RMD160 67ff022032bef978bfc901e22156b95e9dfb54b6 SHA1 48e38f42541a8be0c54393b277d81a5fcc94b995 SHA256 6a6588cd8124c0b77ad9036921ebda69b9c2dd2b27db8a982d8769bb760fb301
 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
new file mode 100644
index 000000000000..76cfdfb5d33d
--- /dev/null
+++ b/sci-misc/boinc/boinc-6.6.40-r1.ebuild
@@ -0,0 +1,148 @@
+# 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 $
+
+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
+
+	# 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."
+	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
+}