1 |
ssuominen 12/06/26 13:01:32 |
2 |
|
3 |
Modified: ChangeLog boinc-6.12.42.ebuild |
4 |
Log: |
5 |
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. |
6 |
|
7 |
(Portage version: 2.2.0_alpha111/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.107 sci-misc/boinc/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/ChangeLog?rev=1.107&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/ChangeLog?rev=1.107&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/ChangeLog?r1=1.106&r2=1.107 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v |
19 |
retrieving revision 1.106 |
20 |
retrieving revision 1.107 |
21 |
diff -u -r1.106 -r1.107 |
22 |
--- ChangeLog 4 Nov 2011 19:22:44 -0000 1.106 |
23 |
+++ ChangeLog 26 Jun 2012 13:01:32 -0000 1.107 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for sci-misc/boinc |
26 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.106 2011/11/04 19:22:44 scarabeus Exp $ |
28 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.107 2012/06/26 13:01:32 ssuominen Exp $ |
30 |
+ |
31 |
+ 26 Jun 2012; Samuli Suominen <ssuominen@g.o> boinc-6.12.42.ebuild: |
32 |
+ Fix building with dev-libs/glib >= 2.32 wrt #413675. Fix building with |
33 |
+ sys-devel/automake >= 1.12 wrt #423081. Convert to the new CURL_SSL flags wrt |
34 |
+ #412437. |
35 |
|
36 |
04 Nov 2011; Tomáš Chvátal <scarabeus@g.o> |
37 |
-files/6.12.26-libnotify-0.7.patch, boinc-6.12.42.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.3 sci-misc/boinc/boinc-6.12.42.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild?rev=1.3&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild?rev=1.3&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild?r1=1.2&r2=1.3 |
46 |
|
47 |
Index: boinc-6.12.42.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild,v |
50 |
retrieving revision 1.2 |
51 |
retrieving revision 1.3 |
52 |
diff -u -r1.2 -r1.3 |
53 |
--- boinc-6.12.42.ebuild 4 Nov 2011 19:22:44 -0000 1.2 |
54 |
+++ boinc-6.12.42.ebuild 26 Jun 2012 13:01:32 -0000 1.3 |
55 |
@@ -1,6 +1,6 @@ |
56 |
-# Copyright 1999-2011 Gentoo Foundation |
57 |
+# Copyright 1999-2012 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild,v 1.2 2011/11/04 19:22:44 scarabeus Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/boinc-6.12.42.ebuild,v 1.3 2012/06/26 13:01:32 ssuominen Exp $ |
61 |
|
62 |
EAPI=4 |
63 |
|
64 |
@@ -20,7 +20,7 @@ |
65 |
!app-admin/quickswitch |
66 |
>=app-misc/ca-certificates-20080809 |
67 |
dev-libs/openssl |
68 |
- net-misc/curl[ssl,-gnutls] |
69 |
+ net-misc/curl[ssl,curl_ssl_openssl] |
70 |
sys-apps/util-linux |
71 |
sys-libs/zlib |
72 |
cuda? ( |
73 |
@@ -51,11 +51,15 @@ |
74 |
|
75 |
src_prepare() { |
76 |
# use system ssl certificates |
77 |
- mkdir "${S}"/curl |
78 |
- ln -s /etc/ssl/certs/ca-certificates.crt "${S}"/curl/ca-bundle.crt |
79 |
+ mkdir curl |
80 |
+ ln -s /etc/ssl/certs/ca-certificates.crt curl/ca-bundle.crt |
81 |
|
82 |
# prevent bad changes in compile flags, bug 286701 |
83 |
- sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed" |
84 |
+ sed -i -e 's:BOINC_SET_COMPILE_FLAGS::' configure.ac || die |
85 |
+ |
86 |
+ sed -i -e 's:AC_PROG_CC:&\nAC_PROG_OBJCXX:' configure.ac || die #423081 |
87 |
+ |
88 |
+ sed -i -e 's:glib/gtypes.h:glib.h:' clientgui/gtk/taskbarex.cpp || die #413675 |
89 |
|
90 |
base_src_prepare |
91 |
|
92 |
@@ -91,13 +95,13 @@ |
93 |
|
94 |
src_install() { |
95 |
default |
96 |
- find "${ED}" -name '*.la' -exec rm -f {} + |
97 |
+ prune_libtool_files --all |
98 |
|
99 |
dodir /var/lib/${PN}/ |
100 |
keepdir /var/lib/${PN}/ |
101 |
|
102 |
if use X; then |
103 |
- newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png || die |
104 |
+ newicon -s 48 "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png |
105 |
make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}" |
106 |
fi |