dev-games/aseprite-1.2.17

Skia is now retrieved prebuilt, and aseprite-skia has been dropped.
Cleaned up a lot of old ebuilds as well; 9999 has not built for a while.

Signed-off-by: Albert Diserholt <albert@diserholt.com>

9 files changed, 27 insertions, 581 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index c4a3d4d..aa7f740 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,13 +1,6 @@
-AUX aseprite-1.2.14-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
-AUX aseprite-1.2.15-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
-AUX aseprite-1.2.9-system_libarchive.patch 3622 BLAKE2B 1b3d74497a8510c2988b86646823f1972a5f210dd690ede65a5f1c71cfaebdafe2c3f352a3a86dec006cd9d30a4f9d7532b33373d89f92eed4fe7e32e25e1af6 SHA512 0abf6d1329c1aa894adfb09a8a05418c063962bd606abbe2832b4f344911a76541ebed0181dbc1889620aff8d25c061c2a1940ec3fcb5cb65047f250a1676892
-AUX aseprite-9999-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
+AUX aseprite-1.2.17-system_libarchive.patch 3837 BLAKE2B f9b5f4eb6f81befbaa0fb1255501367aa6ac7c7e20a16a1764a51afdaf2a09208c6a7f68708d1d65e04499bb004e438415d7402537166ab5954e3437a4b32aca SHA512 5eaac64aa9ee339b6991d42b46798392b668f2715e3f99455c8bfc860acb06d5525c0d431d833428037cce67572dcf48d1b384bbffefc79184cafa57acbdc8d2
 DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
-DIST Aseprite-v1.2.14-Source.zip 23797447 BLAKE2B b4e87a359a829d551b43ce05215f33b6ef6e46db56cd98f5d06f5a01c62efdbe57a75c21c273b5b0e09c8da90d78ef2e2060b7285793a5bd2dd78098b0afbe38 SHA512 d984ac9123744b93ce4dd151491518485f8abce44d8b478416c0f30adb4cd8ec0d8f0e59fc7269528b5e38e115ab012239eb1f0e3427c9ce5e65ac66ddc2115c
-DIST Aseprite-v1.2.15-Source.zip 23798637 BLAKE2B ab7e32694e2f73207819a55fba5f3ac2d39cd7dcb191a8e6c1cb5b5cd462987c9515e91412ec294473552228da8de1877c606bca871e4670ee7c536c9496e280 SHA512 bef0c9197f62518734c79a5a8a51ed4782ab22a04568e410a40decaa6b70306d67cea725c5989b1bf5e6aafc3d1dff2c8edea85e942a206583983c7f48675858
-DIST Aseprite-v1.2.9-Source.zip 23723562 BLAKE2B 6fd168cbd7f8b2fe4e9aae4ad2a14f99ff83f0c8b79142a1ec9c9ee483fd48a4c99dfb754a6071d6cd196951443064442af83405a132d8a6a18cdb4f42bb8da8 SHA512 24800a770d44ebe8ecafb26d454a30c78f5bf7321f14c80711efc2ff101fcaf936b400ee0db256e30ab04864f01b30fa3c1e6523b6b169476da023e2659968db
+DIST Aseprite-v1.2.17-Source.zip 24303986 BLAKE2B d3034d4491cef993f3f1238c42375a469c60c8ab69ab571670c233300169c1821943e59ca142cf9a7afd54100cffc729204fac5f55ec55218089b7f41228659c SHA512 559203dc0bca4da6145b08c3cca4e5dd40fbf3e5c5e4a7de4b05ed16c32d10de96034923aab42168daec5b64ea7459babd468d5d7b0de69337c4f95f2edc85bd
+DIST aseprite-1.2.17-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
 EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
-EBUILD aseprite-1.2.14.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
-EBUILD aseprite-1.2.15.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
-EBUILD aseprite-1.2.9.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
-EBUILD aseprite-9999.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
+EBUILD aseprite-1.2.17.ebuild 2021 BLAKE2B 4233a4ecd4e633a984457ed610b065f55bf93bd27cc6abdfada648209a4b9a9a10e8ebf6e649fed376aed51b3015737734c53aae7c660cdefb5bd4019ec114c8 SHA512 26ea0b676c09dcba6663f09d89d350571f2c7e7ca4532c31f5cd686295121f02aac2290df92023dd443978f51ca68208653b2a9ca1ede5d611b383855c94843e
diff --git a/dev-games/aseprite/aseprite-1.2.15.ebuild b/dev-games/aseprite/aseprite-1.2.15.ebuild
deleted file mode 100644
index 9eff062..0000000
--- a/dev-games/aseprite/aseprite-1.2.15.ebuild
+++ /dev/null
@@ -1,90 +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
-
-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* ]]; 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"
-
-RDEPEND="
-	app-arch/libarchive
-	app-text/cmark
-	dev-libs/expat
-	dev-libs/tinyxml
-	=dev-games/aseprite-skia-9999-r71[debug=]
-	media-libs/freetype:2
-	>=media-libs/giflib-5.0
-	media-libs/fontconfig
-	media-libs/libpng:0
-	webp? ( !!media-libs/libwebp )
-	net-misc/curl
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/jpeg:=
-	x11-libs/libX11
-	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
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
-
-	local mycmakeargs=(
-		-DENABLE_UPDATER=OFF
-		-DFULLSCREEN_PLATFORM=ON
-		-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_TINYXML=ON
-		-DUSE_SHARED_PIXMAN=ON
-		-DUSE_SHARED_FREETYPE=ON
-		-DUSE_SHARED_HARFBUZZ=ON
-		-DWITH_WEBP_SUPPORT="$(usex webp)"
-		-DENABLE_MEMLEAK="$(usex memleak)"
-		-DSKIA_DIR="/var/lib/aseprite-skia"
-		-DSKIA_OUT_DIR="/var/lib/aseprite-skia/out/Release"
-	)
-
-	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.14.ebuild b/dev-games/aseprite/aseprite-1.2.17.ebuild
index 9eff062..1b9446f 100644
--- a/dev-games/aseprite/aseprite-1.2.14.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI=7
 inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Animated sprite editor & pixel art tool"
@@ -12,18 +12,16 @@ SLOT="0"
 
 PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
 
-if [[ ${PV} = 9999* ]]; 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
+SKIA_VERSION="m81-b607b32047"
+SKIA_FILE="Skia-Linux-Release-${ARCH/amd64/x64}.zip"
+SKIA_BASE_URL="https://github.com/${PN}/skia/releases/download"
+SKIA_URI="${SKIA_BASE_URL}/${SKIA_VERSION}/${SKIA_FILE} -> ${P}-skia-${SKIA_VERSION}.zip"
+
+ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip"
+ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}"
+
+SRC_URI="${ASEPRITE_URI} ${SKIA_URI}"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="
 	debug
@@ -35,7 +33,6 @@ RDEPEND="
 	app-text/cmark
 	dev-libs/expat
 	dev-libs/tinyxml
-	=dev-games/aseprite-skia-9999-r71[debug=]
 	media-libs/freetype:2
 	>=media-libs/giflib-5.0
 	media-libs/fontconfig
@@ -47,14 +44,19 @@ RDEPEND="
 	virtual/jpeg:=
 	x11-libs/libX11
 	x11-libs/pixman"
-DEPEND="$RDEPEND
-	app-arch/unzip"
 
 DOCS=( EULA.txt
 	docs/ase-file-specs.md
 	docs/LICENSES.md
 	README.md )
 
+src_unpack() {
+	mkdir -p "${P}/skia"
+	cd "${P}"
+	unpack "${ASEPRITE_FILE}"
+	( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" )
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 }
@@ -78,8 +80,7 @@ src_configure() {
 		-DUSE_SHARED_HARFBUZZ=ON
 		-DWITH_WEBP_SUPPORT="$(usex webp)"
 		-DENABLE_MEMLEAK="$(usex memleak)"
-		-DSKIA_DIR="/var/lib/aseprite-skia"
-		-DSKIA_OUT_DIR="/var/lib/aseprite-skia/out/Release"
+		-DSKIA_DIR="${S}/skia"
 	)
 
 	cmake-utils_src_configure
diff --git a/dev-games/aseprite/aseprite-1.2.9.ebuild b/dev-games/aseprite/aseprite-1.2.9.ebuild
deleted file mode 100644
index 92c9b8b..0000000
--- a/dev-games/aseprite/aseprite-1.2.9.ebuild
+++ /dev/null
@@ -1,97 +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
-
-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
deleted file mode 100644
index 9eff062..0000000
--- a/dev-games/aseprite/aseprite-9999.ebuild
+++ /dev/null
@@ -1,90 +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
-
-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* ]]; 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"
-
-RDEPEND="
-	app-arch/libarchive
-	app-text/cmark
-	dev-libs/expat
-	dev-libs/tinyxml
-	=dev-games/aseprite-skia-9999-r71[debug=]
-	media-libs/freetype:2
-	>=media-libs/giflib-5.0
-	media-libs/fontconfig
-	media-libs/libpng:0
-	webp? ( !!media-libs/libwebp )
-	net-misc/curl
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/jpeg:=
-	x11-libs/libX11
-	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
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
-
-	local mycmakeargs=(
-		-DENABLE_UPDATER=OFF
-		-DFULLSCREEN_PLATFORM=ON
-		-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_TINYXML=ON
-		-DUSE_SHARED_PIXMAN=ON
-		-DUSE_SHARED_FREETYPE=ON
-		-DUSE_SHARED_HARFBUZZ=ON
-		-DWITH_WEBP_SUPPORT="$(usex webp)"
-		-DENABLE_MEMLEAK="$(usex memleak)"
-		-DSKIA_DIR="/var/lib/aseprite-skia"
-		-DSKIA_OUT_DIR="/var/lib/aseprite-skia/out/Release"
-	)
-
-	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-1.2.15-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.15-system_libarchive.patch
deleted file mode 100644
index 467b5b1..0000000
--- a/dev-games/aseprite/files/aseprite-1.2.15-system_libarchive.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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_CURRENT_BINARY_DIR}/third_party/cmark)
-+  include_directories(${CMARK_DIR})
- endif()
- 
- if(REQUIRE_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)
diff --git a/dev-games/aseprite/files/aseprite-1.2.14-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
index 467b5b1..7cd457b 100644
--- a/dev-games/aseprite/files/aseprite-1.2.14-system_libarchive.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
@@ -62,10 +62,11 @@ 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()
+@@ -113,16 +113,18 @@ endif()
  add_subdirectory(json11)
  
  # libarchive
+-set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
 -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")
@@ -76,6 +77,7 @@ index 596ffa2e4..977816439 100644
 -target_include_directories(archive_static INTERFACE
 -  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
 +if(NOT USE_SHARED_LIBARCHIVE)
++  set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
 +  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")
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
deleted file mode 100644
index c531a1d..0000000
--- a/dev-games/aseprite/files/aseprite-1.2.9-system_libarchive.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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)
diff --git a/dev-games/aseprite/files/aseprite-9999-system_libarchive.patch b/dev-games/aseprite/files/aseprite-9999-system_libarchive.patch
deleted file mode 100644
index 467b5b1..0000000
--- a/dev-games/aseprite/files/aseprite-9999-system_libarchive.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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_CURRENT_BINARY_DIR}/third_party/cmark)
-+  include_directories(${CMARK_DIR})
- endif()
- 
- if(REQUIRE_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)