commit: 9b44cf4c542d8d7ad55794641d3f74e51be8161f Author: Sven Eden <yamakuzure <AT> gmx <DOT> net> AuthorDate: Sat Nov 12 15:23:45 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Nov 12 15:39:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b44cf4c
sci-misc/boinc: Add new icons to all ebuilds with revbump Gentoo-Bug: 593362 Currently BOINC manager uses the 48x48 icon from /usr/share/pixmaps/boinc.png, which looks quite ugly. There are better icons from http://boinc.berkeley.edu/logo.php. If USE="X" is set, the ebuilds now use convert (from either imagemagick or graphicsmagick) to produce png icons from http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif. Produced sizes are: 16, 22, 24, 32, 36, 48, 64, 72, 96, 128, 192 and 256. Package-Manager: portage-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/2768 Signed-off-by: David Seifert <soap <AT> gentoo.org> sci-misc/boinc/Manifest | 1 + ...inc-7.6.33-r1.ebuild => boinc-7.2.44-r1.ebuild} | 36 +++++++++++++-------- ...inc-7.6.33-r1.ebuild => boinc-7.4.52-r1.ebuild} | 37 +++++++++++++++------- sci-misc/boinc/boinc-7.6.33-r1.ebuild | 37 +++++++++++++++------- 4 files changed, 76 insertions(+), 35 deletions(-) diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest index c31dcd0..93aca18 100644 --- a/sci-misc/boinc/Manifest +++ b/sci-misc/boinc/Manifest @@ -1,3 +1,4 @@ DIST boinc-7.2.44.tar.gz 46626134 SHA256 bae214f238b8b3d1826a44e3a9e5d91cbad165e7df6daf8a7f208f36c51c5425 SHA512 60f58eecbe1f8d1a272b338d0c2b2fcbfb95538c448cbfdab25d3e860129b519a2c3b2608a909e285bdf4378c23a71107a6d3c2d3aa519ec906480d81be19ca9 WHIRLPOOL f071fce088769ca35bacc9466e3a863bc619d025e14aa26b96a5a736027e4438a2d660df804d95cc635c4bd83e636c0c79e2712f2953bbc2fd905091ec1a1589 DIST boinc-7.4.52.tar.gz 44146174 SHA256 ac27154ad28d9d0a63ba7153ebb7bcbbd0586744c763c91deeb0325d56530192 SHA512 32623552e091bf388e85e5f118a8cd035b677091620d2b171513299428e4b53b94f7bfd75e8d4e9f46de3a7cadd8b498434acc3b9aeffbd3667aa18d65c0bc78 WHIRLPOOL e1035ba513a3adced4d5576e856fc43213cca923f3d016aa86c19784a4efcbaa7e599a2728568e14121a63aa89365b1ae00b99af588824f17371836f9494266e DIST boinc-7.6.33.tar.gz 43569544 SHA256 c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d SHA512 c1a98d1a489835abdac72b300c0c8ce82eec9a677ff891c57da4df9875a9bbdd4b45dd9d5ae6ddc2926a0e47ae281fb94ff87815b8aeab0786e15062465e2c20 WHIRLPOOL 118578c4058b3f19fab61982a2f2007379790f37cd077f80f7e4c6a7bed30016142c3236af6274553c19ac1a662b4022ddf6323e22c7dc697ea30ca0bccfbaeb +DIST boinc.tif 288208 SHA256 5c14c65a7531e1dc3f7f7c18ef86eb0e27726527cb835967aed8b0d003eb564a SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046 WHIRLPOOL 6a6cace44c8483000cda787da39006db521fd9408539f8abca2c2ab913371405b97719af0518acd2f5239451a9605d0f6d67a40fdb14cb49a03a42a7a44a4c86 diff --git a/sci-misc/boinc/boinc-7.6.33-r1.ebuild b/sci-misc/boinc/boinc-7.2.44-r1.ebuild similarity index 85% copy from sci-misc/boinc/boinc-7.6.33-r1.ebuild copy to sci-misc/boinc/boinc-7.2.44-r1.ebuild index 7d8033c..bc0952d 100644 --- a/sci-misc/boinc/boinc-7.6.33-r1.ebuild +++ b/sci-misc/boinc/boinc-7.2.44-r1.ebuild @@ -2,17 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -WX_GTK_VER=3.0 +WX_GTK_VER=2.8 -inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets +inherit autotools eutils linux-info systemd user versionator wxwidgets MY_PV=$(get_version_component_range 1-2) DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" HOMEPAGE="http://boinc.ssl.berkeley.edu/"; -SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz + X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )" RESTRICT="mirror" LICENSE="LGPL-2.1" @@ -42,13 +43,18 @@ RDEPEND=" virtual/jpeg:0= x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit] + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) " DEPEND="${RDEPEND} sys-devel/gettext app-text/docbook-xml-dtd:4.4 app-text/docbook2X + X? ( + || ( media-gfx/imagemagick[png,tiff] + media-gfx/graphicsmagick[imagemagick,png,tiff] + ) + ) " S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}" @@ -60,7 +66,7 @@ pkg_setup() { if ! linux_config_exists; then ewarn "Can't check the linux kernel configuration." ewarn "You might be missing vsyscall support." - elif kernel_is -ge 4 4 \ + elif kernel_is -ge 4 4 \ && linux_chkconfig_present LEGACY_VSYSCALL_NONE; then ewarn "You do not have vsyscall emulation enabled." ewarn "This will prevent some boinc projects from running." @@ -77,12 +83,11 @@ pkg_setup() { } src_prepare() { + default + # prevent bad changes in compile flags, bug 286701 sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed" - # >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462 - epatch "${FILESDIR}"/fix_webview.patch - eautoreconf use X && need-wxwidgets unicode @@ -106,12 +111,17 @@ src_install() { keepdir /var/lib/${PN} if use X; then - newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png + # Create new icons. bug 593362 + local s SIZES=(16 22 24 32 36 48 64 72 96 128 192 256) + for s in "${SIZES[@]}"; do + convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png || die + newicon -s $s "${WORKDIR}"/boinc_${s}.png boinc.png + done make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}" fi # cleanup cruft - rm -rf "${ED}"/etc || die "rm failed" + rm -rf "${ED%/}"/etc || die "rm failed" newinitd "${FILESDIR}"/${PN}.init ${PN} newconfd "${FILESDIR}"/${PN}.conf ${PN} @@ -124,13 +134,13 @@ pkg_preinst() { # elog user about the need of being in video group local groups="${PN}" if use cuda; then - group+=",video" + groups+=",video" fi enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}" } pkg_postinst() { - echo + elog elog "You are using the source compiled version of boinc." use X && elog "The graphical manager can be found at /usr/bin/boincmgr" elog diff --git a/sci-misc/boinc/boinc-7.6.33-r1.ebuild b/sci-misc/boinc/boinc-7.4.52-r1.ebuild similarity index 85% copy from sci-misc/boinc/boinc-7.6.33-r1.ebuild copy to sci-misc/boinc/boinc-7.4.52-r1.ebuild index 7d8033c..0a508d3 100644 --- a/sci-misc/boinc/boinc-7.6.33-r1.ebuild +++ b/sci-misc/boinc/boinc-7.4.52-r1.ebuild @@ -2,17 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 WX_GTK_VER=3.0 -inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets +inherit autotools eutils linux-info systemd user versionator wxwidgets MY_PV=$(get_version_component_range 1-2) DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" HOMEPAGE="http://boinc.ssl.berkeley.edu/"; -SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz + X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )" RESTRICT="mirror" LICENSE="LGPL-2.1" @@ -49,8 +50,18 @@ DEPEND="${RDEPEND} sys-devel/gettext app-text/docbook-xml-dtd:4.4 app-text/docbook2X + X? ( + || ( media-gfx/imagemagick[png,tiff] + media-gfx/graphicsmagick[imagemagick,png,tiff] + ) + ) " +PATCHES=( + # >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462 + "${FILESDIR}"/fix_webview.patch +) + S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}" pkg_setup() { @@ -60,7 +71,7 @@ pkg_setup() { if ! linux_config_exists; then ewarn "Can't check the linux kernel configuration." ewarn "You might be missing vsyscall support." - elif kernel_is -ge 4 4 \ + elif kernel_is -ge 4 4 \ && linux_chkconfig_present LEGACY_VSYSCALL_NONE; then ewarn "You do not have vsyscall emulation enabled." ewarn "This will prevent some boinc projects from running." @@ -77,12 +88,11 @@ pkg_setup() { } src_prepare() { + default + # prevent bad changes in compile flags, bug 286701 sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed" - # >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462 - epatch "${FILESDIR}"/fix_webview.patch - eautoreconf use X && need-wxwidgets unicode @@ -106,12 +116,17 @@ src_install() { keepdir /var/lib/${PN} if use X; then - newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png + # Create new icons. bug 593362 + local s SIZES=(16 22 24 32 36 48 64 72 96 128 192 256) + for s in "${SIZES[@]}"; do + convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png || die + newicon -s $s "${WORKDIR}"/boinc_${s}.png boinc.png + done make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}" fi # cleanup cruft - rm -rf "${ED}"/etc || die "rm failed" + rm -rf "${ED%/}"/etc || die "rm failed" newinitd "${FILESDIR}"/${PN}.init ${PN} newconfd "${FILESDIR}"/${PN}.conf ${PN} @@ -124,13 +139,13 @@ pkg_preinst() { # elog user about the need of being in video group local groups="${PN}" if use cuda; then - group+=",video" + groups+=",video" fi enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}" } pkg_postinst() { - echo + elog elog "You are using the source compiled version of boinc." use X && elog "The graphical manager can be found at /usr/bin/boincmgr" elog diff --git a/sci-misc/boinc/boinc-7.6.33-r1.ebuild b/sci-misc/boinc/boinc-7.6.33-r1.ebuild index 7d8033c..0a508d3 100644 --- a/sci-misc/boinc/boinc-7.6.33-r1.ebuild +++ b/sci-misc/boinc/boinc-7.6.33-r1.ebuild @@ -2,17 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 WX_GTK_VER=3.0 -inherit autotools flag-o-matic linux-info systemd user versionator wxwidgets +inherit autotools eutils linux-info systemd user versionator wxwidgets MY_PV=$(get_version_component_range 1-2) DESCRIPTION="The Berkeley Open Infrastructure for Network Computing" HOMEPAGE="http://boinc.ssl.berkeley.edu/"; -SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz + X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> ${PN}.tif )" RESTRICT="mirror" LICENSE="LGPL-2.1" @@ -49,8 +50,18 @@ DEPEND="${RDEPEND} sys-devel/gettext app-text/docbook-xml-dtd:4.4 app-text/docbook2X + X? ( + || ( media-gfx/imagemagick[png,tiff] + media-gfx/graphicsmagick[imagemagick,png,tiff] + ) + ) " +PATCHES=( + # >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462 + "${FILESDIR}"/fix_webview.patch +) + S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}" pkg_setup() { @@ -60,7 +71,7 @@ pkg_setup() { if ! linux_config_exists; then ewarn "Can't check the linux kernel configuration." ewarn "You might be missing vsyscall support." - elif kernel_is -ge 4 4 \ + elif kernel_is -ge 4 4 \ && linux_chkconfig_present LEGACY_VSYSCALL_NONE; then ewarn "You do not have vsyscall emulation enabled." ewarn "This will prevent some boinc projects from running." @@ -77,12 +88,11 @@ pkg_setup() { } src_prepare() { + default + # prevent bad changes in compile flags, bug 286701 sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed" - # >=x11-libs/wxGTK-3.0.2.0-r3 has webview removed, bug 587462 - epatch "${FILESDIR}"/fix_webview.patch - eautoreconf use X && need-wxwidgets unicode @@ -106,12 +116,17 @@ src_install() { keepdir /var/lib/${PN} if use X; then - newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png + # Create new icons. bug 593362 + local s SIZES=(16 22 24 32 36 48 64 72 96 128 192 256) + for s in "${SIZES[@]}"; do + convert "${DISTDIR}"/${PN}.tif -resize ${s}x${s} "${WORKDIR}"/boinc_${s}.png || die + newicon -s $s "${WORKDIR}"/boinc_${s}.png boinc.png + done make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}" fi # cleanup cruft - rm -rf "${ED}"/etc || die "rm failed" + rm -rf "${ED%/}"/etc || die "rm failed" newinitd "${FILESDIR}"/${PN}.init ${PN} newconfd "${FILESDIR}"/${PN}.conf ${PN} @@ -124,13 +139,13 @@ pkg_preinst() { # elog user about the need of being in video group local groups="${PN}" if use cuda; then - group+=",video" + groups+=",video" fi enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}" } pkg_postinst() { - echo + elog elog "You are using the source compiled version of boinc." use X && elog "The graphical manager can be found at /usr/bin/boincmgr" elog
