gentoo resync : 21.09.2018

3 files changed, 41 insertions, 59 deletions

diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 02345c166e05..5a64d89d9c27 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +1,4 @@
 DIST waffle-1.5.2.tar.xz 179284 BLAKE2B 40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56 SHA512 04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
-EBUILD waffle-1.5.2.ebuild 1588 BLAKE2B 31f81f4134cd77403add1e283875fd9f54bb04df770bf50b83af8b2169eee2ccf7fd77ff412c37838882615d0e97d69ec31161517d838e23479dd4f364cd98fc SHA512 cf7dadaf9b902ecd6c1afdb0d0169514ada5962557cb9f2b55fda83e8b9050affc9d904529dacd0fb0adeab5bcdc86a646c41ec857a9d1fdeb7c3f63686493c6
-EBUILD waffle-9999.ebuild 1568 BLAKE2B 0b0d86df3b63730d185c115e7ea0cefa2a2b3a632e1002b84dbe31cfaf2871591385eca2fc66e556dac660e08b3be591f2b84be2675774fd42b9b11a2b7303fd SHA512 d4cad6393e0bbcf2c91dbb8811629e523495f12c5951cd7b70b1a8351fee0ed72528a1364500201e94777215b1402038fe188e24951ced3f7827bedbe24a6395
+EBUILD waffle-1.5.2.ebuild 1414 BLAKE2B a88cd403d6173d0af963f2534d9df66a1b4ff184de9fcc98f88981eaea50bb338e58c12f165d5c320eb2071e6716d1dee3b6155c6367b13586e42b6cd8b9e1f2 SHA512 d0fca799279802a5deb3e8f32e85d3d63058f96ac78c8839c91f8bd2644f0fd35ea7bba647d24a57c6723f1f36340a63c5be6de264db71b8231a3ed692f85feb
+EBUILD waffle-9999.ebuild 1417 BLAKE2B c31f5b83990c3a8ef7ae90106bbf39fc508731fded1909fbb508beb3eede5ff5cf987f97602ecaf3e22e2d37348cebe1af472d26f345a85b89cae82073721606 SHA512 4f6ecbeaf8b830dcef8d57511ff8f1856f78c75b8186c9fecd194653b0a5f4184fbce7de7cfadc84b9868324fbd995bbae78fb7215cfab7db4587b3b21619a96
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild
index ec71eacc2bfe..2be51a342803 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -1,25 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-fi
-
-inherit cmake-utils cmake-multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"
-
-if [[ $PV = 9999* ]]; then
-	KEYWORDS="~ppc ~ppc64"
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
+	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"
 	KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 fi
+inherit cmake-multilib ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -28,31 +22,28 @@ IUSE="doc egl gbm test wayland"
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xml-dtd:4.2
-	)"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
+	)
+"
 
 src_configure() {
 	local mycmakeargs=(
 		-Dwaffle_has_glx=ON
 		-Dwaffle_build_examples=OFF
-		$(cmake-utils_use doc waffle_build_manpages)
-		$(cmake-utils_use egl waffle_has_x11_egl)
-		$(cmake-utils_use gbm waffle_has_gbm)
-		$(cmake-utils_use test waffle_build_tests)
-		$(cmake-utils_use wayland waffle_has_wayland)
+		-Dwaffle_build_manpages=$(usex doc )
+		-Dwaffle_has_x11_egl=$(usex egl)
+		-Dwaffle_has_gbm=$(usex gbm)
+		-Dwaffle_build_tests=$(usex test)
+		-Dwaffle_has_wayland=$(usex wayland)
 	)
 
 	cmake-multilib_src_configure
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 23384f2ecadf..dc2a60608875 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
-
-inherit cmake-utils cmake-multilib ${GIT_ECLASS}
+inherit cmake-multilib ${GIT_ECLASS}
 
 DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
 HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"
 
-if [[ $PV = 9999* ]]; then
-	KEYWORDS=""
-else
-	SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="doc egl gbm test wayland"
@@ -28,31 +22,28 @@ IUSE="doc egl gbm test wayland"
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xml-dtd:4.2
-	)"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
+	)
+"
 
 src_configure() {
 	local mycmakeargs=(
 		-Dwaffle_has_glx=ON
 		-Dwaffle_build_examples=OFF
-		$(cmake-utils_use doc waffle_build_manpages)
-		$(cmake-utils_use egl waffle_has_x11_egl)
-		$(cmake-utils_use gbm waffle_has_gbm)
-		$(cmake-utils_use test waffle_build_tests)
-		$(cmake-utils_use wayland waffle_has_wayland)
+		-Dwaffle_build_manpages=$(usex doc )
+		-Dwaffle_has_x11_egl=$(usex egl)
+		-Dwaffle_has_gbm=$(usex gbm)
+		-Dwaffle_build_tests=$(usex test)
+		-Dwaffle_has_wayland=$(usex wayland)
 	)
 
 	cmake-multilib_src_configure