gentoo resync : 28.04.2018

3 files changed, 44 insertions, 32 deletions

diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index 23a270bb75cf..55d87e122cfb 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
-DIST maim-5.4.63.tar.gz 39666 BLAKE2B 0c472480f231b84c7f772347d6eeca8620947e5494f176dd4513ee41a5de29e9b90eafbec1bb7064e745e24c9b1043a7ccd9627cbab5561f30f6e8a859273e21 SHA512 d84cfe051109c9c4b79f2a006f2d73a0fa9cd40151c9d6996740326766886f8b070bc49029d0d3810fd8743cc63d76c051fc249e53b4e9ff37faf8708c149dfd
-EBUILD maim-5.4.63.ebuild 599 BLAKE2B 23481feda7a67dea9ddfe017db071e07cc39b06bdd1e3c6e6a63bb2f198b0532f7c0a57d7c9f12b7de2fb1fb855cb9051a1695c5dbc64092eaeaae44a15b04d3 SHA512 a889034dd4c81f939c7e0edcb01f1de36b54e68bd8f793b08c935ba3affec3449c7492d418b7e614cf340e0092cd27410f72fa56b914d3d6ed6b9de849d607e6
+DIST maim-5.5.tar.gz 39571 BLAKE2B 82235f4c90c32e26a4a6e3ef7cf544ae8958204383af1160bf3c8bfca9df19d0d92a4aec8acd2232afc8ae72eb6850c0cd09e2554e3affbf625b19b0beee1c50 SHA512 e98c5dfbc41c8948e9acb219e78adbc69d61caaa100bc69cc70c446dc895fb4d93d6d42cbd2da8096af9e6769f13e9af13bd4b66249eca6dd8a0eadfb11622ac
+EBUILD maim-5.5.ebuild 883 BLAKE2B 1baf00072c8680985b11af816da86dd6c3e1188a189dfe4cc7296086be06879085689d1ac877773b372c10b6b026289655aff75586af5eb067327d30a62f9c1d SHA512 cb2bbc86c5e2b1a81625bfa7b792fbd5f39ab93560899f86348629dc5c720e2745c0083f81f3ef226aee3b25e81cc8dd21355c39007bc6118f95404e7c70b525
 EBUILD maim-9999.ebuild 883 BLAKE2B 1baf00072c8680985b11af816da86dd6c3e1188a189dfe4cc7296086be06879085689d1ac877773b372c10b6b026289655aff75586af5eb067327d30a62f9c1d SHA512 cb2bbc86c5e2b1a81625bfa7b792fbd5f39ab93560899f86348629dc5c720e2745c0083f81f3ef226aee3b25e81cc8dd21355c39007bc6118f95404e7c70b525
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/maim-5.4.63.ebuild b/media-gfx/maim/maim-5.4.63.ebuild
deleted file mode 100644
index 3f7ece5696d3..000000000000
--- a/media-gfx/maim/maim-5.4.63.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Commandline tool to take screenshots of the desktop"
-HOMEPAGE="https://github.com/naelstrof/maim"
-SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libjpeg-turbo
-	media-libs/libpng:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXcomposite
-	virtual/opengl
-	x11-misc/slop
-"
diff --git a/media-gfx/maim/maim-5.5.ebuild b/media-gfx/maim/maim-5.5.ebuild
new file mode 100644
index 000000000000..60cae2903780
--- /dev/null
+++ b/media-gfx/maim/maim-5.5.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="Commandline tool to take screenshots of the desktop"
+HOMEPAGE="https://github.com/naelstrof/maim"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/naelstrof/maim.git"
+else
+	SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="unicode"
+
+RDEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-misc/slop:=
+	unicode? ( dev-libs/icu:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAIM_UNICODE=$(usex unicode)
+	)
+	cmake-utils_src_configure
+}