commit:     225c8ab97bc3831b3cbdd8ce6da5c552ce47bba7
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Jul 12 16:53:57 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 08:52:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=225c8ab9

dev-games/aseprite: Version bump 1.1.6, remove old 1.1.5

* Fix installation KDE thumbnailer into right place
* Add pixmap for desktop entry

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1875

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-games/aseprite/Manifest                         |  2 +-
 ...seprite-1.1.5.1.ebuild => aseprite-1.1.6.ebuild} | 21 +++------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 6fe73f9..5bdeed5 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,3 +1,3 @@
 DIST Aseprite-v1.1.4.1-Source.zip 11723085 SHA256 
731ac44259217626dde91cdcae9a24cdd4337540fc91bbe5c05cebcb12869879 SHA512 
deeb42c123517e17378498584bb788f375e8aaaf046d5f9732848a5bd794a1af1d8381ff51271f9e30c198478e0f716ae23495972b693db9049ff4c2b8968672
 WHIRLPOOL 
5c2bd1bf8f5d187c385086a431ab070f55308b01089ce703e54093963402a9300295ea1cbf3602021fea1211ae68c6a2a07391e8e054827ce82ee60462001c4a
-DIST Aseprite-v1.1.5.1-Source.zip 11753037 SHA256 
0579f8d78e492de22accfa390f5ab98b14de0f760bb4354f4ee8dc66fd3ee167 SHA512 
2f12c6f2a47f8646cb540334c2ea71742f24e18b4e117be713c85c5faa55ea714a938cf204d7a9abf2d0cc97261f76186ca02199d52bfdc30ee63bc1f1c006c5
 WHIRLPOOL 
9cdb1ce31daee2f98e4576b01d0a274373621c7c1180433510529c5f11d6d074342c0c1bae65658e85c1e9db77affaa6aebb0697d7d956305282c045df8be5e3
+DIST Aseprite-v1.1.6-Source.zip 11801981 SHA256 
259c6418d5bc48a04f63a27f4a8c5a0aa44ce759403ba976ebbfad293eab08e8 SHA512 
d87bcc5ece64cbc772ea5d4dc1edf29943d9038221905c0263511852afbb4e9119ce82468502a78c286729bb91389d08e3a8b7f358e4f6f8fe88507e7e69c9ac
 WHIRLPOOL 
8f9168551be29d8c453fc1db27930a87e8228081b837c8c1a608045acdb7968715a8eb3994e04df83288f1fb12c5744f2bbb6c0733e578dd20bc4c4a2a234801
 DIST aseprite-0.9.5.tar.xz 507744 SHA256 
81e0360d9d8a32d6c548775dbacdb1520aac94b54c2d9f1327d52f219737f154 SHA512 
fc6df942aefea67fd05e1b688209b70a2d5879a1441f61a6e3ee4d72fcdab4e580e1d4d7392fd493e0a46c45401a3eef759aa3efee17450e4c98df7f310b2d00
 WHIRLPOOL 
060dcf2754827ab3b30dde55cfcecd25e2d88f6e296b45529737e2194f4a9891d171776d10f9c571890efb9766b64080b85dc3d737102d2ac7be9843d27fdaef

diff --git a/dev-games/aseprite/aseprite-1.1.5.1.ebuild 
b/dev-games/aseprite/aseprite-1.1.6.ebuild
similarity index 80%
rename from dev-games/aseprite/aseprite-1.1.5.1.ebuild
rename to dev-games/aseprite/aseprite-1.1.6.ebuild
index 773babf..97b21ca 100644
--- a/dev-games/aseprite/aseprite-1.1.5.1.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic
+inherit cmake-utils eutils flag-o-matic
 
 DESCRIPTION="Animated sprite editor & pixel art tool"
 HOMEPAGE="http://www.aseprite.org";
@@ -53,7 +53,6 @@ src_prepare() {
        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
 }
@@ -62,7 +61,6 @@ src_configure() {
        use debug && append-cppflags -DDEBUGMODE -D_DEBUG
 
        local mycmakeargs=(
-               -DBUILD_SHARED_LIBS=OFF # Don't compile internal libs as shared
                -DENABLE_UPDATER=OFF
                -DFULLSCREEN_PLATFORM=ON
                -DUSE_SHARED_ALLEGRO4=ON
@@ -81,25 +79,12 @@ src_configure() {
                -DWITH_QT_THUMBNAILER="$(usex kde)"
                -DWITH_WEBP_SUPPORT="$(usex webp)"
                -DENABLE_TESTS="$(usex test)"
+               -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
        )
        cmake-utils_src_configure
-
-       if use kde; then
-               mycmakeargs=( )
-               CMAKE_USE_DIR="${S}/desktop/kde" \
-                       BUILD_DIR="${WORKDIR}/${P}_desktop_build" \
-                       cmake-utils_src_configure
-       fi
-}
-
-src_compile() {
-       cmake-utils_src_compile
-       use kde && BUILD_DIR="${WORKDIR}/${P}_desktop_build" \
-               cmake-utils_src_compile
 }
 
 src_install() {
+       newicon "${S}/data/icons/ase64.png" "${PN}.png"
        cmake-utils_src_install
-       use kde && BUILD_DIR="${WORKDIR}/${P}_desktop_build" \
-               cmake-utils_src_install
 }

Reply via email to