gentoo resync : 28.04.2018

4 files changed, 46 insertions, 31 deletions

diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index c509767db487..6e31491ff54d 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,5 +1,5 @@
 AUX slop-6.3.46-fix-build-system.patch 2274 BLAKE2B cec202a664d3329d7354f63d20e5a197363296d1506e46900ae51d542bc44279ac62fb9668dcaa2cbade49688d210f9fbac7cbbb706feb5382921536b8471c2b SHA512 344396f7cc8c60f09647c434b78183264dede5548e243df3408f46486f489eb14353fa770ba1f604f604a15417a92f84cd51c561b7026b74b854d8ba7d02cc67
-DIST slop-6.3.46.tar.gz 89391 BLAKE2B 0150ca63e4a598e892abd5505e867f01204f29796dc378a7f3d0c041c1a27f000e98962c41cbf8109573575b37449c1869f29f988c5d2046b504382b2a56779d SHA512 9f44bbb8e14e71a17858711d8da902cb9cf5dc65ed47284be15122f2d1793544deab7f0700517bd07e44613662bfbc7f0991f3d36dcf74af6f90de5fbbd79558
-EBUILD slop-6.3.46.ebuild 601 BLAKE2B 769a13a66a24a8067fdafbb6d3cce48090d4193fb40a14a98cd56d1d4d331e642ec50e601b8944e7276037e07cd52b27c0cb0b79295820c1305f63c8601f3051 SHA512 e96b0e0d8f2562f40a8770980dd46b0f7bbce5588b4fb1cb7d62c88a10fa9ae5880d40918db178f5f4ac5ce6c46957a685af528f795009c8094375738308fce4
-EBUILD slop-9999.ebuild 835 BLAKE2B 61cb3e26bd37c07451421c20765ab2b1b9ff518b8f6482a39a36dbd907eb22cf1cc892565355c478a7defd51d9cf3707150ada82fb6aa261875d265c88924f7d SHA512 a00c371cfabfcf239e37874dbf9b140ced681a25aaa78ffd9a11c65405826548752ef5f8e59b3bd0e49d783e371eebadef4ee042253cf8b657e9b8f040b2610a
+DIST slop-7.4.tar.gz 50079 BLAKE2B 20815270bf1bffe0ef26630fd31d0d4cc7261633cef389e64c232a89033b6e8b5e1651fb5c882e2870808107734c4c088123b85675fa2aae932570d770344dc8 SHA512 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58
+EBUILD slop-7.4.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
+EBUILD slop-9999.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
 MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/slop-6.3.46.ebuild b/x11-misc/slop/slop-6.3.46.ebuild
deleted file mode 100644
index 796bb1f9b9dc..000000000000
--- a/x11-misc/slop/slop-6.3.46.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An application that queries the user for a selection for printing"
-HOMEPAGE="https://github.com/naelstrof/slop"
-SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/icu:=
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender"
-DEPEND="
-	${RDEPEND}
-	media-libs/glm"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.3.46-fix-build-system.patch )
diff --git a/x11-misc/slop/slop-7.4.ebuild b/x11-misc/slop/slop-7.4.ebuild
new file mode 100644
index 000000000000..a61629c541d3
--- /dev/null
+++ b/x11-misc/slop/slop-7.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils
+
+DESCRIPTION="An application that queries the user for a selection for printing"
+HOMEPAGE="https://github.com/naelstrof/slop"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/naelstrof/slop.git"
+else
+	SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="opengl"
+
+RDEPEND="
+	dev-libs/icu:=
+	x11-libs/libX11
+	x11-libs/libXext
+	opengl? (
+		media-libs/glew:0=
+		virtual/opengl
+		x11-libs/libXrender:=
+	)"
+DEPEND="
+	${RDEPEND}
+	media-libs/glm"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSLOP_OPENGL=$(usex opengl)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-misc/slop/slop-9999.ebuild b/x11-misc/slop/slop-9999.ebuild
index 1d4abcaf3e88..a61629c541d3 100644
--- a/x11-misc/slop/slop-9999.ebuild
+++ b/x11-misc/slop/slop-9999.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="opengl"
 
 RDEPEND="