gentoo auto-resync : 24:12:2022 - 20:03:07

4 files changed, 1 insertions, 149 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 6375b1c3e80a..8792b7837764 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,13 +1,10 @@
-AUX aseprite-1.1.7_type-punned_pointer.patch 836 BLAKE2B ca46926a87411fa74c7d66830bd4fc43dc3ae5130342bbb4300398c11a810949ccc530a8a7e66ae6265b2f89fe0bd667557ee7c647491e93d52768d74a340554 SHA512 c01ca8dc6bcee6276f3f4c7f7f141d8528372f0cbbb33c036b89ba64e639966d9b9955a78ec917ef7ebeda2148abc817bc4df7c1fe02818734f51cd7452df9ca
 AUX aseprite-1.2.35_laf_fixes.patch 1265 BLAKE2B 9c0c7ab527f15fdce6de34351c2f4b0a35f889f27c37cfce545dd36a7077cc9050b6922d14071713a2fd3d2afed94daea3df1c200f89ff8cf934c818155c53e2 SHA512 c8c55b3272d0caa367a8614d46ef0b6d684dd80e03d865f44ffaa71f097f7a53b193bf497ee6288c0b10b6eb7de1f521aea6212fd483a19b0d059f0cd2a8d3ba
 AUX aseprite-1.2.40_musl_pthreads.patch 1575 BLAKE2B 5dfbce6090973765fb2a4b34f04f5645cbd4787f7cdd8aa6ef9e09521a6dd5701c6d06a8d0e393714b95cac90ea3280894091fce16dfc2c385f65a834d98c0c7 SHA512 8a8359b8e8034588c45324ee174445682d8ecf526f08e3de532713dafeb8a800dbcf88e5c078299fc938e7cce5224b689e5c6544ffb49df1fdf5d79248a43e47
 AUX aseprite-1.2.40_shared_json11.patch 1790 BLAKE2B 7965d8116463ec8481e14f9f773e0bc942bd18ceb418595a13418850f3bf85a07f70bc5f17a0b74d3f6ee0dc853412df8c93ae8b2bf8e8f1cb262c175c6863b1 SHA512 6b97b6a0c4469d2130cada95f88a279608571593c9b45ee8329891ac6b094dbc55b12141c7fb1c80b4770402972d09e5e7d67e556af180c74d2e62428160d5ee
 AUX aseprite-1.2.40_shared_libarchive.patch 5060 BLAKE2B 1bce76d6621810152ef59e84c4c469753e379e550d074d7b2740e7d03a3c3affa8f1e90bbe3d30de91cd5ef9fa8d7d1ce34ac4bc559ed814d2290b7780ff6d43 SHA512 f673b03344fb56d4a71c23a4cc603a4db003efa604039607d854aaa6b8c87967d64d7c8d3c5e76b7b495f93e329e0d5e3b4f425aa580c37e43419aaff472ffc8
 AUX aseprite-1.2.40_shared_webp.patch 2865 BLAKE2B d3e54e5230c6161de6221b68bbbd574580b925052a0e8d28503c879c8cb6dc87b7e9053b926cc688987418d213da1937d419c1894342474fae4288e15016e7bf SHA512 0fea1dc6b0b0acff8a9097e026f45d648fad45f7510dc9bcd9ebbec340921017c8c53962b0c186e6cc3b89ff180c00389304be27278b56a12eb9463c1e1985d0
 AUX skia-m102_remove_angle2.patch 644 BLAKE2B 11705c6376ad85303b8d64e6046e6e31191774d940458ddc64b8bf2d2e998168d3f1c8cd4361d623c040a03fd948ee4e0b6189c774522ae255cd0f2f572bf4c0 SHA512 bc587d92286528cbaec140a0492d5381a1dfce8263e4a2c2231b1e28778e3e5919b3896ccae416faa1b39f34517b6ada77ccaf671d25ae7d3c552a7991f5bb45
-DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
 DIST Aseprite-v1.2.40-Source.zip 61802371 BLAKE2B f6f586a3ca222de208e6639e3fc94a63f98e487e1975dccd2974ffa71f937384177639e3799fb81f064afaf1c4a048394fab32a30bcda353320ac55c38b17636 SHA512 0a548428a3362f49cb6cecaa061de8371ad3f0bc22d00bc957e21f22316772e854d7ad36ebb7e5b69274eea376bb62fa39abfd4bc02250524c3707f81a628b1f
 DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
-EBUILD aseprite-1.1.9.ebuild 2751 BLAKE2B 6c5780619c95e893e181291c0fbce2f826f8ac6ba2cc559fd33c1461432e2498461f02496031b0ffc50bd974dc64ae47301c4546d600c823d809a7f162c74e64 SHA512 4178e2fb7f9c8b6b267cae0bc83d9887718057c99c4f6dd9acf7c2f41f484e463e75df78a60fbd7f8699de5ae2ee221e476148bf2bb5e93e7c064b66f6b1ac2e
 EBUILD aseprite-1.2.40.ebuild 5092 BLAKE2B a7daefdcba841381bbeb32534891028aefba10c23fb05c4b8f14d1d087c4aa765a9b06d3f209c7a1158914395729e357fe4c418409b49397d079ab992182eea7 SHA512 73e6388c615f0a5547f87d8b2c32ea269bbbae06acb7fbcfe0f8007cd54a66c3db2f858bb435acf25a964bcc8934c3a9d1668020ce3031460924a7ef78fd463c
-MISC metadata.xml 684 BLAKE2B a1ad6d72f940738634ce874c50abaadaee4f897a1a694170da97d4403a9fa69383934fff7392c1417b9b954c3c98a4f138a9da1921e01171a8ebf1ab91d9f256 SHA512 a4d1efc2228d170e868d8328d64a8195fec01807ca4a4424e44f55354d57ab1949c827dbadf6b8a2037979fa684cb6445d95feb37a61b4d3ac637620699f9a77
+MISC metadata.xml 489 BLAKE2B a7c8e63d627aed0bbdcab626fd6b15941b1597b56abe3de87d172a919008122cfa9ee29dc10256c5722e6cea243d836a8d3bb9918f1d1d1963bc299d04fab285 SHA512 beb3ca2b414414980370e02138e0ec8bc931d4807fabb403e21a244365c4af65a5830dc6465d2a3798d56eec360930444a71a549d4d6d4a03f292bf3946bab79
diff --git a/dev-games/aseprite/aseprite-1.1.9.ebuild b/dev-games/aseprite/aseprite-1.1.9.ebuild
deleted file mode 100644
index 61608ae8db1d..000000000000
--- a/dev-games/aseprite/aseprite-1.1.9.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop flag-o-matic xdg-utils
-
-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=$(usex !bundled-libs)
-		-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/files/aseprite-1.1.7_type-punned_pointer.patch b/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch
deleted file mode 100644
index ca0921437fc8..000000000000
--- a/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/allegro/src/x/xkeyboard.c b/src/allegro/src/x/xkeyboard.c
-index f121e62..86fa4f7 100644
---- a/src/allegro/src/x/xkeyboard.c
-+++ b/src/allegro/src/x/xkeyboard.c
-@@ -356,6 +356,14 @@ static int find_unknown_key_assignment (int i)
-    return _xwin.keycode_to_scancode[i];
- }
-
-+/* unicode_getc:
-+ * Reads a character from a Unicode string.
-+ */
-+static int unicode_getc(AL_CONST char *s)
-+{
-+   return *((unsigned short *)s);
-+}
-+
-
-
- /* _xwin_keyboard_handler:
-@@ -412,7 +420,7 @@ void _xwin_keyboard_handler(XKeyEvent *event, int dga2_hack)
-       }
-       buffer[len] = '\0';
-       uconvert(buffer, U_UTF8, buffer2, U_UNICODE, sizeof buffer2);
--      unicode = *(unsigned short *)buffer2;
-+      unicode = unicode_getc(buffer2);
-
- #ifdef ALLEGRO_XWINDOWS_WITH_XIM
-       r = XFilterEvent((XEvent *)event, _xwin.window);
diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 6a0f95b9f0be..66ff5b77ea41 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<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>
-	</use>
 	<upstream>
 		<remote-id type="github">aseprite/aseprite</remote-id>
 	</upstream>