Fix building with dev-libs/glib >= 2.32 wrt #413675. Fix building with sys-devel/automake >= 1.12 wrt #423081. Convert to the new CURL_SSL flags wrt #412437.

Package-Manager: portage-2.2.0_alpha111/cvs/Linux x86_64

3 files changed, 29 insertions, 26 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index fc96a65bf3a1..11db7c4db9be 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/boinc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.106 2011/11/04 19:22:44 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.107 2012/06/26 13:01:32 ssuominen Exp $
+
+  26 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> boinc-6.12.42.ebuild:
+  Fix building with dev-libs/glib >= 2.32 wrt #413675. Fix building with
+  sys-devel/automake >= 1.12 wrt #423081. Convert to the new CURL_SSL flags wrt
+  #412437.
 
   04 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/6.12.26-libnotify-0.7.patch, boinc-6.12.42.ebuild:
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index c837e731c0c6..ded8174a73cd 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -6,23 +6,17 @@ AUX boinc.conf 376 RMD160 af3ad95f091f00982c5e761e67f885d00a080634 SHA1 dc4054c5
 AUX boinc.init 2624 RMD160 70b356f65dc8e42fc4edf9c5b0c2604ab7421b64 SHA1 bcdd050f5288ad3fbe67e0558dfb048667f14d92 SHA256 b69aaaee4817ab285f2efff23e4137ed817b514a053ae85757fabcfc82dc420d
 AUX generate_tarball.sh 3414 RMD160 ac7a0611303e1ed9a84817f94403059bcad097ed SHA1 0b4912213e3cb0bd25f51d57f0f60b7a9bf542e8 SHA256 c0cd0631ffa19ed5937fdda32527e76f7495a2e5b740adb0fbe3c936fab03bb9
 DIST boinc-6.12.42.tar.xz 10750668 RMD160 91cc999aba01f4a2cea0f70b31941ece64e17c4d SHA1 72d271fdf4f87e8c8615298954ffbb5b4bd8fca1 SHA256 83908a34c300aedf43f76349d55be4aa4e690e7e14eadcdf2680fd4b0e4e0207
-EBUILD boinc-6.12.42.ebuild 3656 RMD160 77081dd43bdac7bce92fae31c1b05ade283d0d80 SHA1 3645f4963dd8390d1f2bffe105186fded39b4aa2 SHA256 ede56e9ca52cd7cff725dd7587a73429f13e702e0c3c302b2e0aa75bce51e0e6
-MISC ChangeLog 19453 RMD160 0f78e570af05b7d393a2716c4b44c30ff350988c SHA1 3eeee00e019a0b8fc776303aa1a487146efa9284 SHA256 9369c638c14cc4eeae9f74d604fec48f23320456042db6944d179ea82b4b7313
+EBUILD boinc-6.12.42.ebuild 3775 RMD160 2b502b87f7978cb52739ff7ddc3ea2fa45146099 SHA1 1920bae4b3fd0979968d8eb5825d8f47b276f3ec SHA256 461d1116cce2e0adfe9ad83c9b204fe54efdaa59e0cbf0e6540db679c73cb267
+MISC ChangeLog 19694 RMD160 5f04381b2c60f13baa205a50e819e04e602984f1 SHA1 3f17d326f65b123d28c4b4f4c1753821267fc186 SHA256 9ead3375158bddfac5ac640e19248f2619fb6c7ddbcbeab5c0ad7a4a838735b4
 MISC metadata.xml 574 RMD160 97ce5bcbca5607c119a2d0484fc228a870594ac7 SHA1 ddf921ef095def89299edfcd0350082de356366a SHA256 76e1da0a34c62e7a78db5b796b64af9da51bf31c159498c147c8d0546be79571
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOtDt4AAoJEOSiRoyO7jvoOzkP/2sKf7/zByxfh7EagzrpH6L7
-cb6KKChCL7Dsoq7D14V1Akh3n/N6ngc0AixsFnitOZYAOLBXgVZ+mZ4ebpvvr7/q
-HtwX2u4rdCn4wE2UsRqJgdU7uGcO+RN0orxCiwVQhUw90QhzLLBymY7hPYgaTabv
-Qp7LCd/a+isRZXZoO7rv6EASkWFfN0Y2NuvkGoyj3NDs8aaCPMfCxSXlyA9gnqmi
-oWq+WyaAZXx4q7aVA/q2Oo+9gvOSKVI2HIWbG8i9DtO8xD0t+9g8eE89Dis2gOBH
-iTUYL3C5+WHbofF0WBNnWhiqD5lxWP7fkaGgFFsCBPkoEPSQHjVEIgSHwTLNJNbG
-D75K93TZepVJtyaYoybW6CfqYa0TqLUP4GzjImIPQFOzZTqBW6NecaHlQ8actALn
-fQ3X+7FzuxxHBXPNFyQM8r8Z8c16+Vem4eAqk6RLZmjHzwM4gVsEWe8S0ncc+8Qt
-nbzkY6URHsd8XuQTcAS7GdXsvSJX8c4uFs4sXL6sOWw6v4w+1XtX1tHTaHK7c+V2
-GDWnAF3/6saA+UKlIJZKtCR9fdrl9MUNHiOtQZwv7TijJsamk4Ay92zL3kWg2QfW
-Uv/Bp6bg+5/fRaRMhftUQ2q06wy3x+YUHAXoVo6bIPmBOEG/R33d7ZcfxVFhKxvw
-MN2B+S5dxXcwJT7pnfck
-=FhY0
+iQEcBAEBAgAGBQJP6bF6AAoJEEdUh39IaPFNKSUH/RcnlOL5kZ1DyJ3h497RQgxQ
+MSFntbqjQ7/ooiIQT9gqQA+sRJzCpZss9smZm5oiQ6dgk8etX/qE2x+Ey09vEZ/H
+2cTzdneF6lPK24Mwgda9gZwsFx57kcvim9CsxXuru8O7gIha/KStTmoLap74gdQH
+Z6HNvhNDSXF6dtrK9MC1gWGnLkupuaDxsCqXtjw5+f01b86/UbPLk42Bk0EqUWA4
+rMBzaOZbPiqjwINGB5nInQaB9UmJex23XdexivXo7QsGpeBzKXDV9Qw9gtuDpRB/
+3fTzQfYYBYSWs9v/mERvgA7sglJa4bUAJJhTozgQj57rCigJZWAY1jNt76bBjJI=
+=d0kB
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/boinc-6.12.42.ebuild b/sci-misc/boinc/boinc-6.12.42.ebuild
index 5c1ea2907520..382f2404045a 100644
--- a/sci-misc/boinc/boinc-6.12.42.ebuild
+++ b/sci-misc/boinc/boinc-6.12.42.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild,v 1.2 2011/11/04 19:22:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild,v 1.3 2012/06/26 13:01:32 ssuominen Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ RDEPEND="
 	!app-admin/quickswitch
 	>=app-misc/ca-certificates-20080809
 	dev-libs/openssl
-	net-misc/curl[ssl,-gnutls]
+	net-misc/curl[ssl,curl_ssl_openssl]
 	sys-apps/util-linux
 	sys-libs/zlib
 	cuda? (
@@ -51,11 +51,15 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_prepare() {
 	# use system ssl certificates
-	mkdir "${S}"/curl
-	ln -s /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt
+	mkdir curl
+	ln -s /etc/ssl/certs/ca-certificates.crt 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"
+	sed -i -e 's:BOINC_SET_COMPILE_FLAGS::' configure.ac || die
+
+	sed -i -e 's:AC_PROG_CC:&\nAC_PROG_OBJCXX:' configure.ac || die #423081
+
+	sed -i -e 's:glib/gtypes.h:glib.h:' clientgui/gtk/taskbarex.cpp || die #413675
 
 	base_src_prepare
 
@@ -91,13 +95,13 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 
 	dodir /var/lib/${PN}/
 	keepdir /var/lib/${PN}/
 
 	if use X; then
-		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png || die
+		newicon -s 48 "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png
 		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
 	fi