public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/
Date: Sat, 12 Nov 2016 15:39:57 +0000 (UTC)	[thread overview]
Message-ID: <1478965168.9b44cf4c542d8d7ad55794641d3f74e51be8161f.soap@gentoo> (raw)

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


             reply	other threads:[~2016-11-12 15:40 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-12 15:39 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-22 19:14 [gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/ Pacho Ramos
2024-04-12 13:08 Joonas Niilola
2024-04-11 21:34 Sam James
2024-04-11 16:46 Sam James
2024-04-11 16:37 Arthur Zamarin
2023-11-25  5:46 Sam James
2023-10-17  7:29 Andrew Ammerlaan
2023-10-17  7:29 Andrew Ammerlaan
2023-09-25  8:06 Andrew Ammerlaan
2023-06-09 15:45 Arthur Zamarin
2023-06-09 14:29 Sam James
2023-06-09 14:10 Arthur Zamarin
2023-06-03 11:15 Arthur Zamarin
2023-05-06  9:51 Arthur Zamarin
2023-04-14 19:45 Sam James
2023-04-14 19:45 Sam James
2023-04-14 19:33 Sam James
2023-04-14 19:33 Sam James
2023-04-14 19:09 Florian Schmaus
2023-04-14  8:58 Arthur Zamarin
2022-12-30 23:39 Conrad Kostecki
2022-08-09 13:12 Craig Andrews
2022-08-01  8:35 Florian Schmaus
2022-08-01  8:35 Florian Schmaus
2022-08-01  8:35 Florian Schmaus
2022-08-01  8:35 Florian Schmaus
2022-08-01  8:35 Florian Schmaus
2022-04-25  6:37 Florian Schmaus
2022-04-23 10:33 Joonas Niilola
2022-04-23 10:24 Florian Schmaus
2022-04-23 10:24 Florian Schmaus
2022-04-23 10:24 Florian Schmaus
2021-10-06  8:33 Jakov Smolić
2021-07-08  9:38 Joonas Niilola
2021-07-08  9:38 Joonas Niilola
2021-07-08  9:38 Joonas Niilola
2021-05-01 18:07 Sam James
2021-04-24 12:52 David Seifert
2021-04-24 12:52 David Seifert
2021-04-24 12:52 David Seifert
2021-04-04 20:21 David Seifert
2021-01-30 10:26 Sam James
2021-01-18 13:38 Joonas Niilola
2021-01-18 13:38 Joonas Niilola
2021-01-18 13:38 Joonas Niilola
2020-08-24 17:45 Jonas Stein
2018-12-06 21:20 Craig Andrews
2018-12-06 21:20 Craig Andrews
2018-04-24 21:57 Andreas Sturmlechner
2018-02-11 11:12 Michał Górny
2017-12-27 11:56 Mart Raudsepp
2017-12-27 11:56 Mart Raudsepp
2017-12-21 10:47 Mart Raudsepp
2017-12-21 10:47 Mart Raudsepp
2017-12-20 20:13 Craig Andrews
2017-11-02 11:39 Mart Raudsepp
2017-09-22 13:48 Michael Palimaka
2017-08-19 19:01 Michał Górny
2017-08-19 19:01 Michał Górny
2017-06-09 15:57 Anthony G. Basile
2017-06-04 17:03 Michał Górny
2017-02-17 11:28 Michael Palimaka
2017-01-04 13:42 David Seifert
2017-01-04 13:42 David Seifert
2016-11-12 15:39 David Seifert
2016-11-12 15:39 David Seifert
2016-06-14 19:10 David Seifert
2016-06-14 19:10 David Seifert
2016-06-14 19:10 David Seifert
2016-05-07 22:32 David Seifert
2016-05-07 22:32 David Seifert
2016-05-07 22:32 David Seifert
2016-05-04 22:01 David Seifert
2016-05-04 22:01 David Seifert
2016-05-04 22:01 David Seifert
2016-05-04 22:01 David Seifert
2016-05-04 22:01 David Seifert
2016-05-04 22:01 David Seifert
2016-05-04 22:01 David Seifert
2016-03-20 20:08 David Seifert
2015-09-09 18:53 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1478965168.9b44cf4c542d8d7ad55794641d3f74e51be8161f.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox