Updated haxe and aseprite

Thanks to Alexander Konotop for haxe ebuild and fixes.

7 files changed, 156 insertions, 20 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index c787a72..003dc6a 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,6 +1,4 @@
-AUX aseprite-freetype-include-1.1.1.patch 423 SHA256 143f1084b5a9eda6767549fa067076c9307e787c5daaab621fab0212c7970f6a SHA512 113925bd48fce8473137c6a8d814acc701dd8740c5cb17bbb889ffdf2cefdc970c32b9f40ce72453a1c6b6719c35fec0a9d6c3d6d49bdabfe2d804b7c7b4f892 WHIRLPOOL a3466656f4bd5250967685fe6c55a9087b47f8a1091afae9ef24548b0a92a9354696f58dfa6137ef75131b8c9d9e61f160684a2fc371db5579da999b4fd9cc2c
-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-1.2_beta7.ebuild 2918 SHA256 a4743d63045cfb90b31c9c2dedb5813339ad7af1de19a4d8cc310065e00e4c10 SHA512 5c676d2e00bbdad83e29eecefdaa50183ba8d75d18c9f603c4ebbee1b3a32efece192ecd239030a36ff94bacb634ea811ca3b91d43eb135894c8cdd22b52ce57 WHIRLPOOL 356f8939a1a6e6d23d683f831118fe13e911152c0692c84a7a71ac8616532f23eb0c5bf9a789ae5d446b2d4d6397c64d3d86cf85f8212f2bccf251ad232abd2f
-EBUILD aseprite-9999.ebuild 2918 SHA256 a4743d63045cfb90b31c9c2dedb5813339ad7af1de19a4d8cc310065e00e4c10 SHA512 5c676d2e00bbdad83e29eecefdaa50183ba8d75d18c9f603c4ebbee1b3a32efece192ecd239030a36ff94bacb634ea811ca3b91d43eb135894c8cdd22b52ce57 WHIRLPOOL 356f8939a1a6e6d23d683f831118fe13e911152c0692c84a7a71ac8616532f23eb0c5bf9a789ae5d446b2d4d6397c64d3d86cf85f8212f2bccf251ad232abd2f
+DIST Aseprite-v1.1.13-Source.zip 12809688 SHA256 f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 WHIRLPOOL 18af949c5a0d7f2b866e8c9a45fcf3fb623722c44537abbf8b3e79501e6f898b9e037e7afc83170b9383a567ff5889ab2013b1624a06a45c074220b68a51b736
+EBUILD aseprite-1.1.13.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
+EBUILD aseprite-1.2_beta9.ebuild 2981 SHA256 734aeabb701c559fb8a4f448cd7db716d1b0985c8671d8aea6c48786449e814b SHA512 57c9589cb28105e8a069edb905670d4c0ed71dfa620545117c3eac3ae7c1fc62f4c69f8cafce88c7f51c7242904e0fb209c09376034cb075e8c2a15e96541fbf WHIRLPOOL 85e3d939a4ce8c43f7bbca7e192166eb3498a9612edacb3a0ed98282c8df8b25bef006754e1e62956f0d35d3422ca153b40b015e562e03767e95afac126a0134
+EBUILD aseprite-9999.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
diff --git a/dev-games/aseprite/aseprite-1.2_beta7.ebuild b/dev-games/aseprite/aseprite-1.1.13.ebuild
index fd8871f..2041b70 100644
--- a/dev-games/aseprite/aseprite-1.2_beta7.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.13.ebuild
@@ -103,3 +103,7 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	elog "Aseprite is for personal use only. You may not distribute it."
+}
diff --git a/dev-games/aseprite/aseprite-1.2_beta9.ebuild b/dev-games/aseprite/aseprite-1.2_beta9.ebuild
new file mode 100644
index 0000000..87c0b32
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.2_beta9.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://www.aseprite.org"
+LICENSE="Proprietary"
+SLOT="0"
+
+if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aseprite/aseprite"
+	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"
+	S="${WORKDIR}"
+fi
+
+IUSE="
+	debug
+	memleak
+	webp
+	system-allegro
+	+system-curl
+	+system-giflib
+	+system-jpeg
+	+system-libpng
+	+system-libwebp
+	+system-pixman
+	+system-tinyxml
+	+system-zlib"
+
+RDEPEND="
+	system-tinyxml? ( dev-libs/tinyxml )
+	system-allegro? ( media-libs/allegro:0[X,png] )
+	system-giflib? ( >=media-libs/giflib-5.0 )
+	system-libpng? ( media-libs/libpng:0 )
+	webp? ( system-libwebp? ( media-libs/libwebp ) )
+	system-curl? ( net-misc/curl )
+	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
+
+DOCS=( EULA.txt
+	docs/ase-file-specs.md
+	docs/LICENSES.md
+	README.md )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-allegro; then
+		ewarn "system-allegro is enabled. It has know issues which are solved"
+		ewarn "in the bundled version:"
+		ewarn " * You will not be able to resize the window."
+		ewarn " * You will have problems adding HSV colours on non-English systems."
+	fi
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DCURL_STATICLIB=OFF
+		-DENABLE_UPDATER=OFF
+		-DFULLSCREEN_PLATFORM=ON
+		-DENABLE_TESTS=OFF
+		-DBUILD_GMOCK=OFF
+		$(use system-pixman && echo \
+			-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_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)"
+		-DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files."
+		-DUSE_SHARED_GIFLIB="$(usex system-giflib)"
+		-DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
+		-DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
+		-DUSE_SHARED_LIBPNG="$(usex system-libpng)"
+		-DUSE_SHARED_PIXMAN="$(usex system-pixman)"
+		-DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
+		-DUSE_SHARED_ZLIB="$(usex system-zlib)"
+		-DWITH_WEBP_SUPPORT="$(usex webp)"
+		-DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
+		-DENABLE_MEMLEAK="$(usex memleak)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "Aseprite is for personal use only. You may not distribute it."
+}
diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-9999.ebuild
index fd8871f..2041b70 100644
--- a/dev-games/aseprite/aseprite-9999.ebuild
+++ b/dev-games/aseprite/aseprite-9999.ebuild
@@ -103,3 +103,7 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	elog "Aseprite is for personal use only. You may not distribute it."
+}
diff --git a/dev-games/aseprite/files/aseprite-freetype-include-1.1.1.patch b/dev-games/aseprite/files/aseprite-freetype-include-1.1.1.patch
deleted file mode 100644
index 077c714..0000000
--- a/dev-games/aseprite/files/aseprite-freetype-include-1.1.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fixes an include when using the system freetype2.
-
-diff -uNr a/src/app/util/freetype_utils.cpp b/src/app/util/freetype_utils.cpp
---- a/src/app/util/freetype_utils.cpp	2016-01-25 20:45:54.965394178 +0100
-+++ b/src/app/util/freetype_utils.cpp	2016-01-25 20:49:26.146791380 +0100
-@@ -21,7 +21,7 @@
- 
- #include <stdexcept>
- 
--#include "freetype/ftglyph.h"
-+#include "ftglyph.h"
- #include "ft2build.h"
- #include FT_FREETYPE_H
- 
diff --git a/dev-lang/haxe/Manifest b/dev-lang/haxe/Manifest
index 99549fc..6483521 100644
--- a/dev-lang/haxe/Manifest
+++ b/dev-lang/haxe/Manifest
@@ -1 +1,2 @@
 EBUILD haxe-3.2.0.ebuild 710 SHA256 3caa872083803bed4b1c22cd0843c0a5031876a2728b59526a5155ba416a9491 SHA512 07a64770a5f7181d31bb44ab6f88afe52e1cdbb12fa0fa3d223c8b26b2b0e0f843fb9cacfb022bd53ee720a4576b162466fe5d4397c44d861f2327a09b7a4ad4 WHIRLPOOL 9f083c898500c2c76bebd2bbc458d87e3642c5e63cac641882b76e488b8428444fd39770d8921a70a14f4703e14a74b1db244d86f156f31eca0677c83a0d5288
+EBUILD haxe-3.4.2.ebuild 710 SHA256 3caa872083803bed4b1c22cd0843c0a5031876a2728b59526a5155ba416a9491 SHA512 07a64770a5f7181d31bb44ab6f88afe52e1cdbb12fa0fa3d223c8b26b2b0e0f843fb9cacfb022bd53ee720a4576b162466fe5d4397c44d861f2327a09b7a4ad4 WHIRLPOOL 9f083c898500c2c76bebd2bbc458d87e3642c5e63cac641882b76e488b8428444fd39770d8921a70a14f4703e14a74b1db244d86f156f31eca0677c83a0d5288
diff --git a/dev-lang/haxe/haxe-3.4.2.ebuild b/dev-lang/haxe/haxe-3.4.2.ebuild
new file mode 100644
index 0000000..3995786
--- /dev/null
+++ b/dev-lang/haxe/haxe-3.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit git-r3
+
+EGIT_REPO_URI="https://github.com/HaxeFoundation/${PN}"
+EGIT_COMMIT=${PV}
+SRC_URI=""
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Haxe cross-platform toolkit"
+HOMEPAGE="http://haxe.org/"
+
+LICENSE="GPL-2 LGPL-2.1 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-lang/neko
+	>=dev-lang/ocaml-4.02[ocamlopt]
+	dev-libs/libpcre
+	dev-ml/camlp4[ocamlopt]
+	sys-libs/zlib"
+
+MAKEOPTS+=" -j1"
+
+src_install() {
+	mkdir -p "${D}/usr/bin" # Missing from install target
+	emake INSTALL_DIR="${D}/usr" install
+	# Strip destination from haxelib.
+	sed -i "s|${D}||" "${D}/usr/bin/haxelib"
+}