Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/piedock/
Date: Tue, 28 Feb 2017 19:11:07
Message-Id: 1488309042.a76400e3c9c4646d8f790362e1d2cc726488a450.soap@gentoo
1 commit: a76400e3c9c4646d8f790362e1d2cc726488a450
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Sun Feb 26 09:44:39 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 28 19:10:42 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76400e3
7
8 x11-misc/piedock: Fix build with gcc6, bug #594478
9
10 Gentoo-Bug: https://bugs.gentoo.org/594478
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13 Closes: https://github.com/gentoo/gentoo/pull/4085
14
15 x11-misc/piedock/Manifest | 1 +
16 .../{piedock-1.6.6.ebuild => piedock-1.6.6-r1.ebuild} | 17 +++++++++--------
17 2 files changed, 10 insertions(+), 8 deletions(-)
18
19 diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
20 index 8d8e4f769a..fdeded1499 100644
21 --- a/x11-misc/piedock/Manifest
22 +++ b/x11-misc/piedock/Manifest
23 @@ -1 +1,2 @@
24 +DIST piedock-1.6.6-gcc6.patch 134783 SHA256 6ab486f84283ffa825cb0313daddc5898381c56ee3981f1eefb14ea7d7c498ac SHA512 a9460400f4447fe8c38b2d994c083e7c564b32b9a2e77f0b3497ca0f704f6a650781c3e00b37d52bbc4e9c202b02dd6bb3dd442ab13ece173a7b18c0592379bc WHIRLPOOL 35ce0d0c9bc0779b9b64c989da9f2941e13dc7a0d19fe776d3c6dcb847a77b7f27da2fd9d08fd1f3148e3736113834ac2aafc439c9a785be70d0789d2c2a3b29
25 DIST piedock-1.6.6.tar.bz2 254634 SHA256 1d0873b3b85d22edc1d28f6308ee70fd9054a6f34a8ae4fd9f6f161c18e32680 SHA512 4bad03387a21c75cf48b80ef2bf6ccc3553097fa41115a40689ec2c8e00ee9fadddbe43226f90012667eb8545e1209e5c9f6308f436bdf1d12d73de30764f1be WHIRLPOOL 1d605bb5c18f4e89f1dce3eb84b0f68bce80256f1ae125bb6753bd59d025e446b18b7889370e5477ba23399c8628c1f1bec1954160f4acfb90ddf750dd40fb84
26
27 diff --git a/x11-misc/piedock/piedock-1.6.6.ebuild b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
28 similarity index 69%
29 rename from x11-misc/piedock/piedock-1.6.6.ebuild
30 rename to x11-misc/piedock/piedock-1.6.6-r1.ebuild
31 index 5f1a094eca..8c945ddda0 100644
32 --- a/x11-misc/piedock/piedock-1.6.6.ebuild
33 +++ b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
34 @@ -1,13 +1,13 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 +# Copyright 1999-2017 Gentoo Foundation
37 # Distributed under the terms of the GNU General Public License v2
38 # $Id$
39
40 -EAPI=5
41 -inherit eutils
42 +EAPI=6
43
44 DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu"
45 HOMEPAGE="http://markusfisch.de/PieDock"
46 -SRC_URI="http://markusfisch.de/downloads/${P}.tar.bz2"
47 +SRC_URI="http://markusfisch.de/downloads/${P}.tar.bz2
48 + https://github.com/markusfisch/PieDock/commit/a7fda1896f1cc6966ba0fa8912e9b404c1b0be97.patch -> ${P}-gcc6.patch"
49
50 LICENSE="MIT"
51 SLOT="0"
52 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
53 IUSE="gtk kde"
54
55 RDEPEND="
56 - media-libs/libpng
57 + media-libs/libpng:0=
58 x11-libs/libX11
59 x11-libs/libXft
60 x11-libs/libXmu
61 @@ -36,9 +36,10 @@ DEPEND="${RDEPEND}"
62
63 DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
64
65 -src_prepare() {
66 - epatch "${FILESDIR}"/${PN}-1.6.1-signals.patch
67 -}
68 +PATCHES=(
69 + "${FILESDIR}"/${PN}-1.6.1-signals.patch
70 + "${DISTDIR}"/${P}-gcc6.patch
71 +)
72
73 src_configure() {
74 econf \