gentoo resync : 20.03.2021

4 files changed, 9 insertions, 61 deletions

diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
index b556b711d1f2..0637cf0d3ed1 100644
--- a/x11-misc/piedock/Manifest
+++ b/x11-misc/piedock/Manifest
@@ -1,8 +1,5 @@
 AUX piedock-1.6.1-signals.patch 173 BLAKE2B 396549f932aa01f54e6c72fa653a5758351118858fda7ca28de7e354e5430c402f93497e30267cf44c4cda059af489d097b6ce44f7f747f09ec873b3528ef31f SHA512 c98aa7e22ce78fc60d778861e5bef12545553723c28bfa599b6a2d8b30c572b8d480f167b8730d84dad9c06c16cfb45f9e69665187f3e5c66053a0d4b35684fe
 AUX piedock-1.6.9-freetype_pkgconfig.patch 1233 BLAKE2B 41b39f3014e0e6adf8ab8d95ef2d01ef296660859576b5e7563be33f438fb469ec4e5b32f51e2f03cf58e034eea210987dc4374b55f5e936039f8c7dfd8fe301 SHA512 63ccd116bfae7ebb1456b304ce1258850e4669a9a71f55a83625f7867e22e92892f8deb9ce81204137dc98326c6ff3faf252e126596eab2ec16c44c3b202ce31
-DIST piedock-1.6.6-gcc6.patch 134783 BLAKE2B 74774aae06a865f03405b5a4939089a2521ec6c41387a90517135e82d2efa80cc18ec081640c1277bd4e8218fec267b64731de9633a514923b80d34312927d3b SHA512 a9460400f4447fe8c38b2d994c083e7c564b32b9a2e77f0b3497ca0f704f6a650781c3e00b37d52bbc4e9c202b02dd6bb3dd442ab13ece173a7b18c0592379bc
-DIST piedock-1.6.6.tar.bz2 254634 BLAKE2B 51c347edaa3cfb556f233fcc62e11e030d3fd2a25ada4ddec5bee6fe16def9605ca80cc254f72aed4c9353502ffa4fab1461af3e6b067f51e6057e7d63c81507 SHA512 4bad03387a21c75cf48b80ef2bf6ccc3553097fa41115a40689ec2c8e00ee9fadddbe43226f90012667eb8545e1209e5c9f6308f436bdf1d12d73de30764f1be
 DIST piedock-1.6.9.tar.gz 290491 BLAKE2B 492c56d106616323a7f661e3c5d016755bdb421668bfe5251811df62ab1243838380395888c3e874c211069c30fdc7ea9141c245e907fa4c2eeea6d0a583329e SHA512 1244cc26d47c39c27c583f24aedf3dcdf0d879003f96a7cb1b512255384f0d81bf7c07dafa1b21ae1e6762bb7b41158cd20740b12b83f2d49daf7f24fbc96b69
-EBUILD piedock-1.6.6-r1.ebuild 965 BLAKE2B 33ce8551e3868b64400a9677c0585ed58a13f822d3a4d67bbbc8d31a237d743446e8f423e3e705aa23f63619faf4e719efdc136aa4f1b86fe9915d29253207a5 SHA512 31188dec19bf29ada3048da86d71f7c54e4c3ebe9a1c2842aa9ca90315cc552835a6f2937ff5490bbab3e2d87adc30525b627d2c631dca8832d4eae8b1b044c7
-EBUILD piedock-1.6.9.ebuild 1091 BLAKE2B a191644c77021300fd9b3da558cb48b832c35c976c28445a7ac4968a15e3db2f73e76e8657b4cfa69c6474198fb3bd6dddbb50f9691fc1204e89e65d300b8b81 SHA512 4161fee6d1d92c88cf32e56482fe992bd157ee378ac16439394d6dc82b9ad1016a68a64bdd029ffdf8ad7dfc01966a33e4e65d53e2e3aa526de23e06e675532d
-MISC metadata.xml 370 BLAKE2B ca778052b35bf0b0d759da4e12fdd53bfa475cd10fc77aad1e67b691ef45e9812e3bbe5286e59126db0664a0c67bb2a2ac9dd8687a39f77e9bf38e516af03a8c SHA512 553d2223b932228026bd4d239de39ad2b27a68cd0a940b0522f1cee28f0d146358c9422baabf15f8948b1783b7559e217a0e90acf068775832c51c5caa48515c
+EBUILD piedock-1.6.9.ebuild 1093 BLAKE2B f6698110529ebdcbc14d8c5c934269981058da8a52222a14d8b76f06b4e06c37093ba3c2c6239bf742e24a7c762d6ed90e2c2a358b4d923aa28563828e4c161f SHA512 7d8f656c9c25eb31663bc27556fa7dfaf5d0f8757a21699b9bc5be9d3b98131a925e0254efca4d3bff3bdd19ac779988e088dbaae8a4eda60c1503c9faf7bf72
+MISC metadata.xml 370 BLAKE2B 1604cdf13cafb3477688c56749c56b3db3b55ca55b790f1e8d43058a102bac5d224ac744e266d6be8dc8f8d000707cad9b3da7e665a00094d93216792041a758 SHA512 7eb681c89b86e32793e7097fd1e2283314aa17f1445d68eb3e53ad6965fd8f38f5aa95e7c572de9e2ff7f27641325e2e2495fdf4dc0f532cd008e35b92571903
diff --git a/x11-misc/piedock/metadata.xml b/x11-misc/piedock/metadata.xml
index 8d6384de1b01..25c19c65f950 100644
--- a/x11-misc/piedock/metadata.xml
+++ b/x11-misc/piedock/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/x11-misc/piedock/piedock-1.6.6-r1.ebuild b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
deleted file mode 100644
index 26e1db0a646a..000000000000
--- a/x11-misc/piedock/piedock-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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
-	)
-"
-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) \
-		--disable-kde \
-		--bindir="${EPREFIX}"/usr/bin \
-		--enable-xft \
-		--enable-xmu \
-		--enable-xrender
-}
diff --git a/x11-misc/piedock/piedock-1.6.9.ebuild b/x11-misc/piedock/piedock-1.6.9.ebuild
index 8a2ea62a1509..2f6dc152253d 100644
--- a/x11-misc/piedock/piedock-1.6.9.ebuild
+++ b/x11-misc/piedock/piedock-1.6.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -10,15 +10,15 @@ HOMEPAGE="
 	http://markusfisch.de/PieDock
 	https://github.com/markusfisch/PieDock
 "
-SRC_URI="
-	https://github.com/markusfisch/PieDock/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/markusfisch/PieDock/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/PieDock-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	media-libs/libpng:0=
 	x11-libs/libX11
@@ -32,8 +32,7 @@ RDEPEND="
 		x11-libs/gtk+:2
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
 
@@ -42,8 +41,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.9-freetype_pkgconfig.patch
 )
 
-S="${WORKDIR}/PieDock-${PV}"
-
 src_prepare() {
 	default
 	eautoreconf