dev-games/aseprite: New upstream version

No longer GPL licensed, but still fine for personal use.

4 files changed, 38 insertions, 111 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index b3177ee..c787a72 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -2,4 +2,5 @@ AUX aseprite-freetype-include-1.1.1.patch 423 SHA256 143f1084b5a9eda6767549fa067
 DIST Aseprite-v1.1.4.1-Source.zip 11723085 SHA256 731ac44259217626dde91cdcae9a24cdd4337540fc91bbe5c05cebcb12869879 SHA512 deeb42c123517e17378498584bb788f375e8aaaf046d5f9732848a5bd794a1af1d8381ff51271f9e30c198478e0f716ae23495972b693db9049ff4c2b8968672 WHIRLPOOL 5c2bd1bf8f5d187c385086a431ab070f55308b01089ce703e54093963402a9300295ea1cbf3602021fea1211ae68c6a2a07391e8e054827ce82ee60462001c4a
 EBUILD aseprite-1.1.1.ebuild 2448 SHA256 7895541da855d083cff2bb2b24ddd780819fd6bcf335d1703be46ba728ada828 SHA512 f9f58d56c495381f2225524b427f32469599c8102fa92894a4ceb230d94445e5b107f9f8eac3f72f96887f5b817e6d90945fe649aad25f0835a9cda20baaf81d WHIRLPOOL db45a1d6564a959fa74372954f62e62061985810b86cd0541e81311d6fa4999d8a7f2b1e2d0445e89afb2d7a7b34dd584682a562f82721ec3280d100f317772f
 EBUILD aseprite-1.1.4.1.ebuild 2916 SHA256 4bf92aa71fb2adf844c8ac26479a627b04109ac20db1f92ea57f99597c0cbd4f SHA512 06e2ac0a22ad1d06be5fb6df4cdfdaa7146cd431c91635abc2596fdd9ded9cfeba9150d22dd2b4b414feacca6cdc797867e635774ff2e6ac539731b780098ca6 WHIRLPOOL 32fced5f3b7de835c9097a8ce39d52fa2b7eb91aec25bd1aba12d0a3b9a3978fd69aecfda41e3a5449068974a67b063d2eeefafcc9f090288e8c064def801e34
-EBUILD aseprite-9999.ebuild 2916 SHA256 4bf92aa71fb2adf844c8ac26479a627b04109ac20db1f92ea57f99597c0cbd4f SHA512 06e2ac0a22ad1d06be5fb6df4cdfdaa7146cd431c91635abc2596fdd9ded9cfeba9150d22dd2b4b414feacca6cdc797867e635774ff2e6ac539731b780098ca6 WHIRLPOOL 32fced5f3b7de835c9097a8ce39d52fa2b7eb91aec25bd1aba12d0a3b9a3978fd69aecfda41e3a5449068974a67b063d2eeefafcc9f090288e8c064def801e34
+EBUILD aseprite-1.2_beta7.ebuild 2918 SHA256 a4743d63045cfb90b31c9c2dedb5813339ad7af1de19a4d8cc310065e00e4c10 SHA512 5c676d2e00bbdad83e29eecefdaa50183ba8d75d18c9f603c4ebbee1b3a32efece192ecd239030a36ff94bacb634ea811ca3b91d43eb135894c8cdd22b52ce57 WHIRLPOOL 356f8939a1a6e6d23d683f831118fe13e911152c0692c84a7a71ac8616532f23eb0c5bf9a789ae5d446b2d4d6397c64d3d86cf85f8212f2bccf251ad232abd2f
+EBUILD aseprite-9999.ebuild 2918 SHA256 a4743d63045cfb90b31c9c2dedb5813339ad7af1de19a4d8cc310065e00e4c10 SHA512 5c676d2e00bbdad83e29eecefdaa50183ba8d75d18c9f603c4ebbee1b3a32efece192ecd239030a36ff94bacb634ea811ca3b91d43eb135894c8cdd22b52ce57 WHIRLPOOL 356f8939a1a6e6d23d683f831118fe13e911152c0692c84a7a71ac8616532f23eb0c5bf9a789ae5d446b2d4d6397c64d3d86cf85f8212f2bccf251ad232abd2f
diff --git a/dev-games/aseprite/aseprite-1.1.1.ebuild b/dev-games/aseprite/aseprite-1.1.1.ebuild
deleted file mode 100644
index ac956ad..0000000
--- a/dev-games/aseprite/aseprite-1.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit cmake-utils toolchain-funcs git-r3
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="http://www.aseprite.org"
-EGIT_REPO_URI="https://github.com/aseprite/aseprite"
-EGIT_COMMIT="v${PV}"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug memleak +system-curl +system-tinyxml +system-giflib +system-libpng +system-zlib +system-jpeg +system-pixman +system-freetype system-allegro"
-
-RDEPEND="
-	system-tinyxml? ( dev-libs/tinyxml )
-	system-allegro? ( media-libs/allegro:0[X,png] )
-	system-freetype? ( media-libs/freetype:2 )
-	system-giflib? ( >=media-libs/giflib-5.0 )
-	system-libpng? ( media-libs/libpng:0 )
-	system-curl? ( net-misc/curl )
-	system-zlib? ( sys-libs/zlib )
-	system-jpeg? ( virtual/jpeg:= )
-	x11-libs/libX11
-	system-pixman? ( x11-libs/pixman )"
-DEPEND="$RDEPEND
-	dev-cpp/gtest"
-
-DOCS=( docs/files/ase.txt
-	docs/files/fli.txt
-	docs/files/msk.txt
-	docs/files/pic.txt
-	docs/files/picpro.txt
-	README.md )
-
-src_prepare() {
-	use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include-${PV}.patch"
-
-	cmake-utils_src_prepare
-
-	if use system-allegro; then
-		ewarn "system-allegro is enabled. It has a bug which prevents"
-		ewarn "resizing of the Aseprite window."
-	fi
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local mycmakeargs=(
-		-DCURL_STATICLIB=OFF
-		-DENABLE_UPDATER=OFF
-		-DFULLSCREEN_PLATFORM=ON
-		$(use system-pixman && echo \
-			-DLIBPIXMAN_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
-			-DLIBPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
-		$(use system-freetype && echo \
-			-DFREETYPE_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
-			-DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so")
-		-DUSE_SHARED_CURL="$(usex system-curl)"
-		-DUSE_SHARED_GIFLIB="$(usex system-giflib)"
-		-DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
-		-DUSE_SHARED_ZLIB="$(usex system-zlib)"
-		-DUSE_SHARED_LIBPNG="$(usex system-libpng)"
-		-DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
-		-DUSE_SHARED_PIXMAN="$(usex system-pixman)"
-		-DUSE_SHARED_FREETYPE="$(usex system-freetype)"
-		-DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
-		-DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
-		-DENABLE_memleak="$(usex memleak)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-games/aseprite/aseprite-1.1.4.1.ebuild b/dev-games/aseprite/aseprite-1.2_beta7.ebuild
index 0553cae..fd8871f 100644
--- a/dev-games/aseprite/aseprite-1.1.4.1.ebuild
+++ b/dev-games/aseprite/aseprite-1.2_beta7.ebuild
@@ -7,13 +7,16 @@ inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Animated sprite editor & pixel art tool"
 HOMEPAGE="http://www.aseprite.org"
-LICENSE="GPL-2"
+LICENSE="Proprietary"
 SLOT="0"
 
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/aseprite/aseprite"
-	EGIT_COMMIT="master"
+	EGIT_BRANCH="master"
+	if [[ ${PV} != 9999* ]]; then
+		EGIT_COMMIT="v${PV/_/-}"
+	fi
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
 	KEYWORDS="~amd64 ~x86"
@@ -46,18 +49,16 @@ RDEPEND="
 	system-zlib? ( sys-libs/zlib )
 	system-jpeg? ( virtual/jpeg:= )
 	x11-libs/libX11
+	x11-libs/libXxf86dga
 	system-pixman? ( x11-libs/pixman )"
 DEPEND="$RDEPEND
-	app-arch/unzip
-	dev-cpp/gtest"
+	app-arch/unzip"
+	#dev-cpp/gtest
 
-DOCS=( docs/files/ase.txt
-	docs/files/fli.txt
-	docs/files/msk.txt
-	docs/files/pic.txt
-	docs/files/picpro.txt
+DOCS=( EULA.txt
+	docs/ase-file-specs.md
+	docs/LICENSES.md
 	README.md )
-# EULA.txt not applicable to source code distribution.
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -77,12 +78,13 @@ src_configure() {
 		-DCURL_STATICLIB=OFF
 		-DENABLE_UPDATER=OFF
 		-DFULLSCREEN_PLATFORM=ON
-		-DENABLE_TESTS=ON
+		-DENABLE_TESTS=OFF
+		-DBUILD_GMOCK=OFF
 		$(use system-pixman && echo \
-			-DLIBPIXMAN_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
-			-DLIBPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
+			-DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
+			-DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
 		$(use system-freetype && echo \
-			-DFREETYPE_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
+			-DFREETYPE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
 			-DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so")
 		-DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
 		-DUSE_SHARED_CURL="$(usex system-curl)"
@@ -96,7 +98,7 @@ src_configure() {
 		-DUSE_SHARED_ZLIB="$(usex system-zlib)"
 		-DWITH_WEBP_SUPPORT="$(usex webp)"
 		-DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
-		-DENABLE_memleak="$(usex memleak)"
+		-DENABLE_MEMLEAK="$(usex memleak)"
 	)
 
 	cmake-utils_src_configure
diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-9999.ebuild
index 0553cae..fd8871f 100644
--- a/dev-games/aseprite/aseprite-9999.ebuild
+++ b/dev-games/aseprite/aseprite-9999.ebuild
@@ -7,13 +7,16 @@ inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Animated sprite editor & pixel art tool"
 HOMEPAGE="http://www.aseprite.org"
-LICENSE="GPL-2"
+LICENSE="Proprietary"
 SLOT="0"
 
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/aseprite/aseprite"
-	EGIT_COMMIT="master"
+	EGIT_BRANCH="master"
+	if [[ ${PV} != 9999* ]]; then
+		EGIT_COMMIT="v${PV/_/-}"
+	fi
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
 	KEYWORDS="~amd64 ~x86"
@@ -46,18 +49,16 @@ RDEPEND="
 	system-zlib? ( sys-libs/zlib )
 	system-jpeg? ( virtual/jpeg:= )
 	x11-libs/libX11
+	x11-libs/libXxf86dga
 	system-pixman? ( x11-libs/pixman )"
 DEPEND="$RDEPEND
-	app-arch/unzip
-	dev-cpp/gtest"
+	app-arch/unzip"
+	#dev-cpp/gtest
 
-DOCS=( docs/files/ase.txt
-	docs/files/fli.txt
-	docs/files/msk.txt
-	docs/files/pic.txt
-	docs/files/picpro.txt
+DOCS=( EULA.txt
+	docs/ase-file-specs.md
+	docs/LICENSES.md
 	README.md )
-# EULA.txt not applicable to source code distribution.
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -77,12 +78,13 @@ src_configure() {
 		-DCURL_STATICLIB=OFF
 		-DENABLE_UPDATER=OFF
 		-DFULLSCREEN_PLATFORM=ON
-		-DENABLE_TESTS=ON
+		-DENABLE_TESTS=OFF
+		-DBUILD_GMOCK=OFF
 		$(use system-pixman && echo \
-			-DLIBPIXMAN_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
-			-DLIBPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
+			-DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
+			-DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
 		$(use system-freetype && echo \
-			-DFREETYPE_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
+			-DFREETYPE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
 			-DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so")
 		-DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
 		-DUSE_SHARED_CURL="$(usex system-curl)"
@@ -96,7 +98,7 @@ src_configure() {
 		-DUSE_SHARED_ZLIB="$(usex system-zlib)"
 		-DWITH_WEBP_SUPPORT="$(usex webp)"
 		-DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
-		-DENABLE_memleak="$(usex memleak)"
+		-DENABLE_MEMLEAK="$(usex memleak)"
 	)
 
 	cmake-utils_src_configure