x11-misc/piedock: Fix build with gcc6, bug #594478

Gentoo-Bug: https://bugs.gentoo.org/594478

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4085

diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
index 8d8e4f769ad899a1a90510c21e1f52ef036f61ef..fdeded1499a92f6519ad7732af85d949a7adf195 100644 (file)
--- a/x11-misc/piedock/Manifest
+++ b/x11-misc/piedock/Manifest
@@ -1 +1,2 @@
+DIST piedock-1.6.6-gcc6.patch 134783 SHA256 6ab486f84283ffa825cb0313daddc5898381c56ee3981f1eefb14ea7d7c498ac SHA512 a9460400f4447fe8c38b2d994c083e7c564b32b9a2e77f0b3497ca0f704f6a650781c3e00b37d52bbc4e9c202b02dd6bb3dd442ab13ece173a7b18c0592379bc WHIRLPOOL 35ce0d0c9bc0779b9b64c989da9f2941e13dc7a0d19fe776d3c6dcb847a77b7f27da2fd9d08fd1f3148e3736113834ac2aafc439c9a785be70d0789d2c2a3b29
 DIST piedock-1.6.6.tar.bz2 254634 SHA256 1d0873b3b85d22edc1d28f6308ee70fd9054a6f34a8ae4fd9f6f161c18e32680 SHA512 4bad03387a21c75cf48b80ef2bf6ccc3553097fa41115a40689ec2c8e00ee9fadddbe43226f90012667eb8545e1209e5c9f6308f436bdf1d12d73de30764f1be WHIRLPOOL 1d605bb5c18f4e89f1dce3eb84b0f68bce80256f1ae125bb6753bd59d025e446b18b7889370e5477ba23399c8628c1f1bec1954160f4acfb90ddf750dd40fb84

diff --git a/x11-misc/piedock/piedock-1.6.6.ebuild b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
similarity index 69%
rename from x11-misc/piedock/piedock-1.6.6.ebuild
rename to x11-misc/piedock/piedock-1.6.6-r1.ebuild
index 5f1a094eca9c78fa2d1b1ce1d1ac095133f3760d..8c945ddda0e93c5965ddd02fabd22b48b5c40ee6 100644 (file)
--- a/x11-misc/piedock/piedock-1.6.6.ebuild
+++ b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu"
 HOMEPAGE="http://markusfisch.de/PieDock"
-SRC_URI="http://markusfisch.de/downloads/${P}.tar.bz2"
+SRC_URI="http://markusfisch.de/downloads/${P}.tar.bz2
+       https://github.com/markusfisch/PieDock/commit/a7fda1896f1cc6966ba0fa8912e9b404c1b0be97.patch -> ${P}-gcc6.patch"
 
 LICENSE="MIT"
 SLOT="0"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gtk kde"
 
 RDEPEND="
-       media-libs/libpng
+       media-libs/libpng:0=
        x11-libs/libX11
        x11-libs/libXft
        x11-libs/libXmu
@@ -36,9 +36,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
 
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.6.1-signals.patch
-}
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.6.1-signals.patch
+       "${DISTDIR}"/${P}-gcc6.patch
+)
 
 src_configure() {
        econf \