Added new versions of aseprite.

Cleaned up a lot of system-* use flags, since they shouldn't
make a big difference, and the Gentoo way is to compile shared
libraries.

6 files changed, 337 insertions, 47 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 836d24b..b362ff0 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,8 +1,13 @@
-AUX aseprite-system_libarchive.patch 3268 SHA256 c62aae0a7707860600adb5beb2003af53761ebb9a981c96725f7cc74c3a3195d SHA512 eb0588983620e77cc5e054f585f347a382e3a23517a04ddc0251beaf21869015e58ed5c964ddbfe17a79749cfb1b05ce0e71dab39fc8fe71558115b571493cce WHIRLPOOL 64bd00a17eed5037975518794f7d9e0c998d7411a635565076384d591a8f932baa80bee66790c3803726747ad12d570171dcc71ba426b8227537149943cd4c66
-DIST Aseprite-v1.1.13-Source.zip 12809688 SHA256 f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 WHIRLPOOL 18af949c5a0d7f2b866e8c9a45fcf3fb623722c44537abbf8b3e79501e6f898b9e037e7afc83170b9383a567ff5889ab2013b1624a06a45c074220b68a51b736
-DIST Aseprite-v1.2.5-Source.zip 21167203 SHA256 3b976e3cae78f1457f401f93eb02bf73afde7c820470349fe19ef055b6599bb2 SHA512 888c8fe43c6dbe94679e44bfb0fe805262e4a846a6eb8ea91ce6e007d6dff7a89eb195f168efaa9643ea058205850ce979280f324b45c2d4c20a14be26c21877 WHIRLPOOL e53dc459b8e9bf131c37427a320b16465f879ccdc3dbf555db326cff0507184d53f9167952dcec9d68b34d9f41df88e1770a30886ec1b7b64cf61b72a20518fd
-DIST Aseprite-v1.2.6-Source.zip 20560401 SHA256 e92a9c19cb5d36c64f8ee916ca34f8c2d628beadc58ab75c4718bd99683f8972 SHA512 e2e7316f0ac723dff86e23759135dc662cfe7bfc8c63160c4066c8503c92eebbf05a3b6f8003581d8daaa77eee62060e575c825a6e34020157ecdfc6e3def418 WHIRLPOOL b413a5c9ba20e2989fd7f7dd94cd1dc56c9118a2affd0a67b81158ef44b9f9dfddd3fe457720cf2b9194d3e713cf2d68b74ca19cdbbe7f6b6b09df885d0778d4
-EBUILD aseprite-1.1.13.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
-EBUILD aseprite-1.2.5.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e
-EBUILD aseprite-1.2.6.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e
-EBUILD aseprite-9999.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
+AUX aseprite-1.2.7.2-system_libarchive.patch 3268 BLAKE2B 1f2b40321cfa6c7f973abf8adf467a49d2259262ed217e956a3002abf3e830fc97fc5414e36465fae8e8327dcf2c9497945961bdda8e7885e9f683027f39e5a6 SHA512 eb0588983620e77cc5e054f585f347a382e3a23517a04ddc0251beaf21869015e58ed5c964ddbfe17a79749cfb1b05ce0e71dab39fc8fe71558115b571493cce
+AUX aseprite-1.2.9-system_libarchive.patch 3622 BLAKE2B 1b3d74497a8510c2988b86646823f1972a5f210dd690ede65a5f1c71cfaebdafe2c3f352a3a86dec006cd9d30a4f9d7532b33373d89f92eed4fe7e32e25e1af6 SHA512 0abf6d1329c1aa894adfb09a8a05418c063962bd606abbe2832b4f344911a76541ebed0181dbc1889620aff8d25c061c2a1940ec3fcb5cb65047f250a1676892
+DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
+DIST Aseprite-v1.2.5-Source.zip 21167203 BLAKE2B e5630b093d0a0df54f9f5704d7a40aaa8f409b1c2a7aad5ad358d1eb735017f82f102c22d543f1945c1e8a74055d4da422aebeb13e03e10ccada0a21721d9576 SHA512 888c8fe43c6dbe94679e44bfb0fe805262e4a846a6eb8ea91ce6e007d6dff7a89eb195f168efaa9643ea058205850ce979280f324b45c2d4c20a14be26c21877
+DIST Aseprite-v1.2.6-Source.zip 20560401 BLAKE2B eed9de0b05f40c42396ed92d08bac5badf3f21f206d96de0b55890c3f105258534f841a0af09648884899960eafd5b63623ab40f6e878154bdfa2a454eab830a SHA512 e2e7316f0ac723dff86e23759135dc662cfe7bfc8c63160c4066c8503c92eebbf05a3b6f8003581d8daaa77eee62060e575c825a6e34020157ecdfc6e3def418
+DIST Aseprite-v1.2.7.2-Source.zip 20599047 BLAKE2B d5150b99aa6343a60921212c4edddd06cc1e90e9f4e487fbc37e66b2475a5a53eedbfc4ac10f72a2843f4f8b67ee5ce42a677d2a72506f999c11c10de84fa478 SHA512 6f10793a82862c862a8b95010f14617d18367a7a24c554530661dd4218d89b50b1c43d10676bf2a66499b1403bc66cc1d557573a1a4850e1ed07353cf7a11286
+DIST Aseprite-v1.2.9-Source.zip 23723562 BLAKE2B 6fd168cbd7f8b2fe4e9aae4ad2a14f99ff83f0c8b79142a1ec9c9ee483fd48a4c99dfb754a6071d6cd196951443064442af83405a132d8a6a18cdb4f42bb8da8 SHA512 24800a770d44ebe8ecafb26d454a30c78f5bf7321f14c80711efc2ff101fcaf936b400ee0db256e30ab04864f01b30fa3c1e6523b6b169476da023e2659968db
+EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
+EBUILD aseprite-1.2.5.ebuild 2909 BLAKE2B 9f4c4fba6634a9f26764eb36af00b03dafaa9039ee44fc6b5a988cd58fad22b83346fa16bd379b21480ca105f5d72c06749c1fce258d0ef16d5eb18b22fd6173 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1
+EBUILD aseprite-1.2.6.ebuild 2909 BLAKE2B 9f4c4fba6634a9f26764eb36af00b03dafaa9039ee44fc6b5a988cd58fad22b83346fa16bd379b21480ca105f5d72c06749c1fce258d0ef16d5eb18b22fd6173 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1
+EBUILD aseprite-1.2.7.2.ebuild 2908 BLAKE2B bf5176a5ccfca118b59eec443c887438c0c639d4d58a1daa03f033469d0470a96fe3e63d23dc79df680521e953cdc444d955e803c19fd0f709e10fb7315cfcdc SHA512 54aae3c01062800b68819a460c922709bc3065b3a85182f51157583920917d35f756ec65672ada20b47a8877d7d2f2f89b64b3a83171bb9a02d0f1e82bd65a2b
+EBUILD aseprite-1.2.9.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
+EBUILD aseprite-9999.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
diff --git a/dev-games/aseprite/aseprite-1.2.7.2.ebuild b/dev-games/aseprite/aseprite-1.2.7.2.ebuild
new file mode 100644
index 0000000..1fb7642
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.2.7.2.ebuild
@@ -0,0 +1,109 @@
+# 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"
+
+PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
+
+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="
+	app-arch/libarchive
+	app-text/cmark
+	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 || CMAKE_BUILD_TYPE=Release
+
+	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")
+		-DUSE_SHARED_CMARK=ON
+		-DUSE_SHARED_CURL="$(usex system-curl)"
+		-DUSE_SHARED_GIFLIB="$(usex system-giflib)"
+		-DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
+		-DUSE_SHARED_LIBARCHIVE=ON
+		-DUSE_SHARED_LIBPNG="$(usex system-libpng)"
+		-DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
+		-DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
+		-DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
+		-DUSE_SHARED_PIXMAN="$(usex system-pixman)"
+		-DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files."
+		-DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
+		-DWITH_WEBP_SUPPORT="$(usex webp)"
+		-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-1.2.9.ebuild b/dev-games/aseprite/aseprite-1.2.9.ebuild
new file mode 100644
index 0000000..92c9b8b
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.2.9.ebuild
@@ -0,0 +1,97 @@
+# 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"
+
+PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
+
+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"
+
+RDEPEND="
+	app-arch/libarchive
+	app-text/cmark
+	dev-libs/tinyxml
+	system-allegro? ( media-libs/allegro:0[X,png] )
+	media-libs/freetype:2
+	>=media-libs/giflib-5.0
+	media-libs/libpng:0
+	webp? ( !!media-libs/libwebp )
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:=
+	x11-libs/libX11
+	x11-libs/libXxf86dga
+	x11-libs/pixman"
+DEPEND="$RDEPEND
+	app-arch/unzip"
+
+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 || CMAKE_BUILD_TYPE=Release
+
+	local mycmakeargs=(
+		-DENABLE_UPDATER=OFF
+		-DFULLSCREEN_PLATFORM=ON
+		-DBUILD_GMOCK=OFF
+		-DUSE_SHARED_CMARK=ON
+		-DUSE_SHARED_CURL=ON
+		-DUSE_SHARED_GIFLIB=ON
+		-DUSE_SHARED_JPEGLIB=ON
+		-DUSE_SHARED_ZLIB=ON
+		-DUSE_SHARED_LIBARCHIVE=ON
+		-DUSE_SHARED_LIBPNG=ON
+		-DUSE_SHARED_LIBLOADPNG=OFF # Does not exist in the main tree
+		-DUSE_SHARED_TINYXML=ON
+		-DUSE_SHARED_PIXMAN=ON
+		-DUSE_SHARED_FREETYPE=ON
+		-DUSE_SHARED_HARFBUZZ=ON
+		-DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
+		-DWITH_WEBP_SUPPORT="$(usex webp)"
+		-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 2041b70..92c9b8b 100644
--- a/dev-games/aseprite/aseprite-9999.ebuild
+++ b/dev-games/aseprite/aseprite-9999.ebuild
@@ -10,6 +10,8 @@ HOMEPAGE="http://www.aseprite.org"
 LICENSE="Proprietary"
 SLOT="0"
 
+PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
+
 if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/aseprite/aseprite"
@@ -27,33 +29,25 @@ IUSE="
 	debug
 	memleak
 	webp
-	system-allegro
-	+system-curl
-	+system-freetype
-	+system-giflib
-	+system-jpeg
-	+system-libpng
-	+system-libwebp
-	+system-pixman
-	+system-tinyxml
-	+system-zlib"
+	system-allegro"
 
 RDEPEND="
-	system-tinyxml? ( dev-libs/tinyxml )
+	app-arch/libarchive
+	app-text/cmark
+	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 )
-	webp? ( system-libwebp? ( media-libs/libwebp ) )
-	system-curl? ( net-misc/curl )
-	system-zlib? ( sys-libs/zlib )
-	system-jpeg? ( virtual/jpeg:= )
+	media-libs/freetype:2
+	>=media-libs/giflib-5.0
+	media-libs/libpng:0
+	webp? ( !!media-libs/libwebp )
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:=
 	x11-libs/libX11
 	x11-libs/libXxf86dga
-	system-pixman? ( x11-libs/pixman )"
+	x11-libs/pixman"
 DEPEND="$RDEPEND
 	app-arch/unzip"
-	#dev-cpp/gtest
 
 DOCS=( EULA.txt
 	docs/ase-file-specs.md
@@ -72,32 +66,26 @@ src_prepare() {
 }
 
 src_configure() {
-	use debug && CMAKE_BUILD_TYPE=Debug
+	use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
 
 	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_CMARK=ON
+		-DUSE_SHARED_CURL=ON
+		-DUSE_SHARED_GIFLIB=ON
+		-DUSE_SHARED_JPEGLIB=ON
+		-DUSE_SHARED_ZLIB=ON
+		-DUSE_SHARED_LIBARCHIVE=ON
+		-DUSE_SHARED_LIBPNG=ON
+		-DUSE_SHARED_LIBLOADPNG=OFF # Does not exist in the main tree
+		-DUSE_SHARED_TINYXML=ON
+		-DUSE_SHARED_PIXMAN=ON
+		-DUSE_SHARED_FREETYPE=ON
+		-DUSE_SHARED_HARFBUZZ=ON
 		-DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
-		-DUSE_SHARED_CURL="$(usex system-curl)"
-		-DUSE_SHARED_FREETYPE="$(usex system-freetype)"
-		-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)"
 	)
 
diff --git a/dev-games/aseprite/files/aseprite-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.7.2-system_libarchive.patch
index 8959c10..8959c10 100644
--- a/dev-games/aseprite/files/aseprite-system_libarchive.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.7.2-system_libarchive.patch
diff --git a/dev-games/aseprite/files/aseprite-1.2.9-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.9-system_libarchive.patch
new file mode 100644
index 0000000..c531a1d
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.9-system_libarchive.patch
@@ -0,0 +1,91 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dae638be8..dd5d17794 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,6 +64,7 @@ option(USE_SHARED_CURL    "Use your installed copy of curl" off)
+ option(USE_SHARED_GIFLIB  "Use your installed copy of giflib" off)
+ option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
+ option(USE_SHARED_ZLIB    "Use your installed copy of zlib" off)
++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
+ option(USE_SHARED_LIBPNG  "Use your installed copy of libpng" off)
+ option(USE_SHARED_LIBLOADPNG "Use your installed copy of libloadpng" off)
+ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
+@@ -193,6 +194,15 @@ else()
+ endif()
+ include_directories(${ZLIB_INCLUDE_DIRS})
+ 
++# libarchive
++if(USE_SHARED_LIBARCHIVE)
++  find_library(ARCHIVE_LIBRARIES NAMES archive)
++  find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h)
++else()
++  add_definitions(-DLIBARCHIVE_STATIC)
++  set(ARCHIVE_LIBRARIES archive_static)
++endif()
++
+ # libpng
+ if(USE_SHARED_LIBPNG)
+   find_package(PNG REQUIRED)
+@@ -294,7 +304,7 @@ if(USE_SHARED_CMARK)
+ else()
+   add_definitions(-DCMARK_STATIC_DEFINE)
+   set(CMARK_LIBRARIES libcmark_static)
+-  include_directories(${CMAKE_BINARY_DIR}/third_party/cmark)
++  include_directories(${CMARK_DIR})
+ endif()
+ 
+ if(USE_SHARED_CURL)
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index a9e80d73c..619acac92 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -82,9 +82,6 @@ if(WITH_WEBP_SUPPORT)
+   add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
+ endif()
+ 
+-# libarchive definitions
+-add_definitions(-DLIBARCHIVE_STATIC)
+-
+ ######################################################################
+ # app-lib target
+ 
+@@ -551,7 +548,7 @@ target_link_libraries(app-lib
+   ${FREETYPE_LIBRARIES}
+   ${HARFBUZZ_LIBRARIES}
+   json11
+-  archive_static
++  ${ARCHIVE_LIBRARIES}
+   fmt
+   tinyexpr)
+ 
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index 596ffa2e4..977816439 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -113,15 +113,17 @@ endif()
+ add_subdirectory(json11)
+ 
+ # libarchive
+-set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
+-set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
+-set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
+-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
+-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
+-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
+-add_subdirectory(libarchive)
+-target_include_directories(archive_static INTERFACE
+-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++if(NOT USE_SHARED_LIBARCHIVE)
++  set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
++  set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
++  set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
++  set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
++  set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
++  set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
++  add_subdirectory(libarchive)
++  target_include_directories(archive_static INTERFACE
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++endif()
+ 
+ # benchmark
+ if(ENABLE_BENCHMARKS)