gentoo Easter resync : 12.04.2020

4 files changed, 140 insertions, 19 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index d2a6d49653c7..2a61f1ac7623 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,6 +1,8 @@
 AUX aseprite-1.1.7_type-punned_pointer.patch 836 BLAKE2B ca46926a87411fa74c7d66830bd4fc43dc3ae5130342bbb4300398c11a810949ccc530a8a7e66ae6265b2f89fe0bd667557ee7c647491e93d52768d74a340554 SHA512 c01ca8dc6bcee6276f3f4c7f7f141d8528372f0cbbb33c036b89ba64e639966d9b9955a78ec917ef7ebeda2148abc817bc4df7c1fe02818734f51cd7452df9ca
 DIST Aseprite-v1.1.6-Source.zip 11801981 BLAKE2B f20186a1669d7f9ab1453a2104a54228c22e2ef1703bba200f44c965b3fb3d9310c1ddd343db9c27ddca3564e4245352476c5228e171f1c0e74c553e5a59d419 SHA512 d87bcc5ece64cbc772ea5d4dc1edf29943d9038221905c0263511852afbb4e9119ce82468502a78c286729bb91389d08e3a8b7f358e4f6f8fe88507e7e69c9ac
 DIST Aseprite-v1.1.7-Source.zip 11801711 BLAKE2B 282492c29ece6b5b5bed029c7f27aa0a287bcb475f60066b6c34f54607b2714f35540e4d6ef4737818712776c2202162ce47c5713ba26b756d9e1c1d8af9c904 SHA512 9a92853042c7de567a7eb33d10ddd38c6d6bd53acfe4b93dc96e11408a7bda39ef7503c159934c483f0455700933c541dfdc0cb4c505d3385778e40686e474e6
+DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
 EBUILD aseprite-1.1.6.ebuild 2161 BLAKE2B 182bd7e62802ff539f4e6ffb71e6e787af9943793f0f6b866d05d052159b2f82b4237ce46744cb5fd07bd94f1283e9968d50f375c94c257cd386e1e0dfeeb95b SHA512 f313d15dc499f7b468ffe78b6df84aba6f663e9abbf4bbb8266a8a3f1e726d53202be92e2637bf264f1ebb37392497af0b52b32bd8a03900734de5502b6baba0
-EBUILD aseprite-1.1.7.ebuild 2549 BLAKE2B 874f2dc80192f0f71cd640fb5893159c1458527b48c2ecf09ddb8a7d5c4d3b94e5901636fb3edf39e5272b0e0a586128fc17a28d193348d7b5e330b1a90c3ba1 SHA512 11bfcf055b69dcf09c972d1c41c5b1cd8dfd9d98e94f035a11f227a47a155a88ff85ad1ca4815f09707ec192b0358321524e2cf6ee0884e271224c5ca73bd1b1
-MISC metadata.xml 736 BLAKE2B f51c9318ee809968234ec305c754f6eff180bb0117605e814d92729fd0c0b0b875977474451eec53883fdde4b6d619772b6d8180f8550a339bff0bc8e47492a2 SHA512 49d18653948b0426c33d0b85c0e6c827c0dd67fd8c4353d2b56ba4ab2dd3f891e6dd2f57c31591cd36a48c546b520a9937184e198103ebe6ebe59b1f92dc55cc
+EBUILD aseprite-1.1.7-r1.ebuild 2656 BLAKE2B 8733ec3e9344cb3348197d66076fd7057f807c7348414dc3921251541b7f3d08151e2c3a1036f8842fc3117601d65f11076d1a5cb97f94c2d833454e65fe898f SHA512 0ff21e737a2799096888d67964cef9948f4cdbd507cc6405834eb9faa3e5f6ab75ec894aed99e49c61e5ba0bc9fd6039c5622f1f38b769fce28af7b91a6fc9c3
+EBUILD aseprite-1.1.9.ebuild 2724 BLAKE2B d99f6a205a172d233ac76ed6403b317ff0cfb9a8c122cb3b7d1db081068bd98cac329aafafa38d1809fa1ba16a61a70fecb51bd6d411880a6e41fc4a17fde61d SHA512 ace408a1e48c3d1fdfe0aeada3274c34798c6e4947f5083158970c6ba39d8c698b028e69a00d74ea3f08393685c07ac0868f6277529269237f30f22caf6335e1
+MISC metadata.xml 653 BLAKE2B 7bfb4ab9faba731096e693600285b0390be6bf3dacf79076346d011660b7a558fe7711b05ac5bbf9ff9b4de9f0e32fbe7e4f44a7ad9251b7d97afa8094a6689b SHA512 7b3692fa1d9f37b2b15aeae2a7e77373c37b6f5dea9327c675294f23d7cb965d8aabb37be452c7d5a2b85e55f0aa23fd4e5f487f2c5f72e9ec0ffb9fb8c79438
diff --git a/dev-games/aseprite/aseprite-1.1.7.ebuild b/dev-games/aseprite/aseprite-1.1.7-r1.ebuild
index 4844689d6a3c..0a36ff657e7e 100644
--- a/dev-games/aseprite/aseprite-1.1.7.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils flag-o-matic
+inherit cmake desktop flag-o-matic
 
 DESCRIPTION="Animated sprite editor & pixel art tool"
 HOMEPAGE="https://www.aseprite.org"
@@ -19,22 +19,24 @@ KEYWORDS="~amd64 ~x86"
 IUSE="bundled-libs debug kde gtk3 test webp"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/tinyxml
+RDEPEND="
 	!bundled-libs? ( media-libs/allegro:0[X,png] )
+	gtk3? ( dev-cpp/gtkmm:3.0 )
+	kde? (
+		dev-qt/qtcore:5
+		kde-frameworks/kio:5
+	)
+	webp? ( media-libs/libwebp )
+	dev-libs/tinyxml
 	media-libs/freetype
 	media-libs/giflib:=
-	webp? ( media-libs/libwebp )
 	media-libs/libpng:0=
 	net-misc/curl
 	sys-libs/zlib
 	virtual/jpeg:0
 	x11-libs/libX11
-	x11-libs/pixman
-	gtk3? ( dev-cpp/gtkmm:3.0 )
-	kde? (
-		dev-qt/qtcore:5
-		kde-frameworks/kio:5 )"
-DEPEND="${RDEPEND}
+	x11-libs/pixman"
+BDEPEND="
 	app-arch/unzip
 	gtk3? ( virtual/pkgconfig )
 	webp? ( virtual/pkgconfig )"
@@ -51,7 +53,7 @@ S="${WORKDIR}"
 PATCHES=( "${FILESDIR}/${P}_type-punned_pointer.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Fix to make flag-o-matic work.
 	if use debug ; then
@@ -85,12 +87,12 @@ src_configure() {
 		-DENABLE_TESTS="$(usex test)"
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
-	cmake-utils_src_install
+	cmake_src_install
 }
 
 pkg_postinst() {
@@ -99,4 +101,11 @@ pkg_postinst() {
 		ewarn "Please note that you will not be able to resize the main window."
 		ewarn "For resizing support enable USE-flag bundled-libs and rebuild package."
 	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/dev-games/aseprite/aseprite-1.1.9.ebuild b/dev-games/aseprite/aseprite-1.1.9.ebuild
new file mode 100644
index 000000000000..85eafdfe6926
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.1.9.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop flag-o-matic
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="https://www.aseprite.org"
+SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip"
+
+# See https://github.com/aseprite/aseprite#license
+# Some bundled third-party packages built-in:
+# gtest duktape modp_b64 simpleini
+LICENSE="Aseprite-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="bundled-libs debug kde gtk3 test webp"
+RESTRICT="bindist mirror !test? ( test )"
+
+RDEPEND="
+	!bundled-libs? ( media-libs/allegro:0[X,png] )
+	gtk3? ( dev-cpp/gtkmm:3.0 )
+	kde? (
+		dev-qt/qtcore:5
+		kde-frameworks/kio:5
+	)
+	webp? ( media-libs/libwebp )
+	dev-libs/tinyxml
+	media-libs/freetype
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/pixman"
+BDEPEND="
+	app-arch/unzip
+	gtk3? ( virtual/pkgconfig )
+	webp? ( virtual/pkgconfig )"
+
+DOCS=( docs/files/ase.txt
+	docs/files/fli.txt
+	docs/files/msk.txt
+	docs/files/pic.txt
+	docs/files/picpro.txt
+	README.md )
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.1.7_type-punned_pointer.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix to make flag-o-matic work.
+	if use debug ; then
+		sed -i '/-DNDEBUG/d' CMakeLists.txt || die
+	fi
+	# Fix shebang in thumbnailer
+	sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' desktop/aseprite-thumbnailer || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUGMODE -D_DEBUG
+
+	local mycmakeargs=(
+		-DENABLE_UPDATER=OFF
+		-DFULLSCREEN_PLATFORM=ON
+		-DUSE_SHARED_ALLEGRO4=$(usex !bundled-libs)
+		-DUSE_SHARED_CURL=ON
+		-DUSE_SHARED_FREETYPE=ON
+		-DUSE_SHARED_GIFLIB=ON
+		-DUSE_SHARED_JPEGLIB=ON
+		-DUSE_SHARED_LIBLOADPNG=ON
+		-DUSE_SHARED_LIBPNG=ON
+		-DUSE_SHARED_PIXMAN=ON
+		-DUSE_SHARED_TINYXML=ON
+		-DUSE_SHARED_ZLIB=ON
+		-DUSE_SHARED_LIBWEBP=ON
+		-DWITH_DESKTOP_INTEGRATION=ON
+		-DWITH_GTK_FILE_DIALOG_SUPPORT="$(usex gtk3)"
+		-DWITH_QT_THUMBNAILER="$(usex kde)"
+		-DWITH_WEBP_SUPPORT="$(usex webp)"
+		-DENABLE_TESTS="$(usex test)"
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
+	cmake_src_install
+}
+
+pkg_postinst() {
+	if use !bundled-libs ; then
+		ewarn "Aseprite has been built with system-wide Allegro 4."
+		ewarn "Please note that you will not be able to resize the main window."
+		ewarn "For resizing support enable USE-flag bundled-libs and rebuild package."
+	fi
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index e5313dbe03f0..1bf066565824 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>
-		Animated sprite editor and pixel art tool
-	</longdescription>
 	<use>
 		<flag name="bundled-libs">Use the upstream provided bundled version of allegro 4.4.2</flag>
 		<flag name="gtk3">Enable support for the experimental native GTK File Dialog</flag>