From a76400e3c9c4646d8f790362e1d2cc726488a450 Mon Sep 17 00:00:00 2001
From: Harri Nieminen <moikkis@gmail.com>
Date: Sun, 26 Feb 2017 11:44:39 +0200
Subject: 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
---
 x11-misc/piedock/Manifest                |  1 +
 x11-misc/piedock/piedock-1.6.6-r1.ebuild | 52 ++++++++++++++++++++++++++++++++
 x11-misc/piedock/piedock-1.6.6.ebuild    | 51 -------------------------------
 3 files changed, 53 insertions(+), 51 deletions(-)
 create mode 100644 x11-misc/piedock/piedock-1.6.6-r1.ebuild
 delete mode 100644 x11-misc/piedock/piedock-1.6.6.ebuild

diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
index 8d8e4f769ad8..fdeded1499a9 100644
--- 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-r1.ebuild b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..8c945ddda0e9
--- /dev/null
+++ b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	https://github.com/markusfisch/PieDock/commit/a7fda1896f1cc6966ba0fa8912e9b404c1b0be97.patch -> ${P}-gcc6.patch"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk kde"
+
+RDEPEND="
+	media-libs/libpng:0=
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXrender
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+	)
+	kde? (
+		kde-frameworks/kdelibs:4
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-signals.patch
+	"${DISTDIR}"/${P}-gcc6.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable gtk) \
+		$(use_enable kde) \
+		--bindir="${EPREFIX}"/usr/bin \
+		--enable-xft \
+		--enable-xmu \
+		--enable-xrender
+}
diff --git a/x11-misc/piedock/piedock-1.6.6.ebuild b/x11-misc/piedock/piedock-1.6.6.ebuild
deleted file mode 100644
index 5f1a094eca9c..000000000000
--- a/x11-misc/piedock/piedock-1.6.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk kde"
-
-RDEPEND="
-	media-libs/libpng
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXrender
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-	)
-	kde? (
-		kde-frameworks/kdelibs:4
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.6.1-signals.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk) \
-		$(use_enable kde) \
-		--bindir="${EPREFIX}"/usr/bin \
-		--enable-xft \
-		--enable-xmu \
-		--enable-xrender
-}
-- 
cgit v1.2.3-65-gdbad