diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2b02fc119989..fa8c71094bd9 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 9b4a8d9f6bc9..46ea00dbc32c 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dpkg/dpkg-1.20.0.ebuild b/app-arch/dpkg/dpkg-1.20.0.ebuild
index 841e049310cb..155450d1586a 100644
--- a/app-arch/dpkg/dpkg-1.20.0.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils multilib autotools ltprune toolchain-funcs
+inherit eutils multilib autotools toolchain-funcs
DESCRIPTION="Package maintenance system for Debian"
HOMEPAGE="https://packages.qa.debian.org/dpkg"
@@ -85,7 +85,6 @@ src_install() {
keepdir \
/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
/var/lib/dpkg/{alternatives,info,parts,updates}
-# /usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index f79a6ea951e9..52df0e26c54f 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus/ibus-1.5.21-r1.ebuild b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
index f9210d59c4d8..e7dd6b2a1936 100644
--- a/app-i18n/ibus/ibus-1.5.21-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.21-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
RESTRICT="!test? ( test )"
REQUIRED_USE="emoji? ( gtk )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 9c36e78955f9..f237b04baa4e 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 06dcddff4476..ef7855809398 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,2 +1,3 @@
DIST Aseprite-v1.1.6-Source.zip 11801981 BLAKE2B f20186a1669d7f9ab1453a2104a54228c22e2ef1703bba200f44c965b3fb3d9310c1ddd343db9c27ddca3564e4245352476c5228e171f1c0e74c553e5a59d419 SHA512 d87bcc5ece64cbc772ea5d4dc1edf29943d9038221905c0263511852afbb4e9119ce82468502a78c286729bb91389d08e3a8b7f358e4f6f8fe88507e7e69c9ac
DIST Aseprite-v1.1.7-Source.zip 11801711 BLAKE2B 282492c29ece6b5b5bed029c7f27aa0a287bcb475f60066b6c34f54607b2714f35540e4d6ef4737818712776c2202162ce47c5713ba26b756d9e1c1d8af9c904 SHA512 9a92853042c7de567a7eb33d10ddd38c6d6bd53acfe4b93dc96e11408a7bda39ef7503c159934c483f0455700933c541dfdc0cb4c505d3385778e40686e474e6
+DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
diff --git a/dev-games/aseprite/aseprite-1.1.7.ebuild b/dev-games/aseprite/aseprite-1.1.7-r1.ebuild
similarity index 86%
rename from dev-games/aseprite/aseprite-1.1.7.ebuild
rename to dev-games/aseprite/aseprite-1.1.7-r1.ebuild
index 4844689d6a3c..0a36ff657e7e 100644
--- a/dev-games/aseprite/aseprite-1.1.7.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils eutils flag-o-matic
+inherit cmake desktop flag-o-matic
DESCRIPTION="Animated sprite editor & pixel art tool"
HOMEPAGE="https://www.aseprite.org"
@@ -19,22 +19,24 @@ KEYWORDS="~amd64 ~x86"
IUSE="bundled-libs debug kde gtk3 test webp"
RESTRICT="!test? ( test )"
-RDEPEND="dev-libs/tinyxml
+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:=
- webp? ( media-libs/libwebp )
media-libs/libpng:0=
net-misc/curl
sys-libs/zlib
virtual/jpeg:0
x11-libs/libX11
- x11-libs/pixman
- gtk3? ( dev-cpp/gtkmm:3.0 )
- kde? (
- dev-qt/qtcore:5
- kde-frameworks/kio:5 )"
-DEPEND="${RDEPEND}
+ x11-libs/pixman"
+BDEPEND="
app-arch/unzip
gtk3? ( virtual/pkgconfig )
webp? ( virtual/pkgconfig )"
@@ -51,7 +53,7 @@ S="${WORKDIR}"
PATCHES=( "${FILESDIR}/${P}_type-punned_pointer.patch" )
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# Fix to make flag-o-matic work.
if use debug ; then
@@ -85,12 +87,12 @@ src_configure() {
-DENABLE_TESTS="$(usex test)"
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
- cmake-utils_src_install
+ cmake_src_install
}
pkg_postinst() {
@@ -99,4 +101,11 @@ pkg_postinst() {
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_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
diff --git a/dev-games/aseprite/aseprite-1.1.9.ebuild b/dev-games/aseprite/aseprite-1.1.9.ebuild
new file mode 100644
index 000000000000..85eafdfe6926
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.1.9.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop flag-o-matic
+
+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=ON
+ -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/metadata.xml b/dev-games/aseprite/metadata.xml
index e5313dbe03f0..1bf066565824 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -9,9 +9,6 @@
proxy-maint@gentoo.org
Proxy Maintainers
-
- Animated sprite editor and pixel art tool
-