diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-06-26 13:01:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-26 13:01:32 +0000 |
| commit | af1275f0c9dfce6351cf0982c654be365a1c96fb (patch) | |
| tree | 5052216581001993d4ea52b6b876e8a2dc6fbcac /sci-misc | |
| parent | Use MKDIR_P instead of mkdir_p for sys-devel/automake >= 1.12 compability wrt... (diff) | |
| download | gentoo-2-af1275f0c9dfce6351cf0982c654be365a1c96fb.tar.gz gentoo-2-af1275f0c9dfce6351cf0982c654be365a1c96fb.tar.bz2 gentoo-2-af1275f0c9dfce6351cf0982c654be365a1c96fb.zip | |
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.
(Portage version: 2.2.0_alpha111/cvs/Linux x86_64)
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/boinc/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-misc/boinc/boinc-6.12.42.ebuild | 20 |
2 files changed, 19 insertions, 10 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/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 |