[gentoo-commits] proj/gamerlay:master commit in: dev-games/aseprite/, dev-games/aseprite/files/

[Azamat H. Hackimov]

commit:     5e58b916cdb360e8a1753b33f6a64a8cfa3b2243
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu Jul  7 23:24:35 2016 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Thu Jul  7 23:24:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=5e58b916

dev-games/aseprite: bump to 1.1.6.

Package-Manager: portage-2.2.28
Manifest-Sign-Key: A018DE8C

 ...eprite-1.1.4.1.ebuild => aseprite-1.1.6.ebuild} | 40 ++++++++++++++++++----
 .../files/aseprite-1.1.4.1_underlinking.patch      | 12 -------
 dev-games/aseprite/metadata.xml                    | 18 +++++++---
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/dev-games/aseprite/aseprite-1.1.4.1.ebuild 
b/dev-games/aseprite/aseprite-1.1.6.ebuild
similarity index 65%
rename from dev-games/aseprite/aseprite-1.1.4.1.ebuild
rename to dev-games/aseprite/aseprite-1.1.6.ebuild
index f89be11..fb64e0e 100644
--- a/dev-games/aseprite/aseprite-1.1.4.1.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.6.ebuild
@@ -17,24 +17,26 @@ LICENSE="BSD GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug test webp"
+IUSE="debug kde gtk3 test webp"
 
 RDEPEND="dev-libs/tinyxml
        media-libs/allegro:0[X,png]
        media-libs/freetype
-       media-libs/giflib
+       media-libs/giflib:=
        webp? ( media-libs/libwebp )
-       media-libs/libpng:0
+       media-libs/libpng:0=
        net-misc/curl
        sys-libs/zlib
        virtual/jpeg:0
        x11-libs/libX11
-       x11-libs/pixman"
+       x11-libs/pixman
+       gtk3? ( dev-cpp/gtkmm:3.0 )
+       kde? (
+               dev-qt/qtcore:5
+               kde-frameworks/kio:5 )"
 DEPEND="${RDEPEND}
        app-arch/unzip"
 
-PATCHES=( "${FILESDIR}"/${P}_underlinking.patch )
-
 DOCS=( docs/files/ase.txt
        docs/files/fli.txt
        docs/files/msk.txt
@@ -51,6 +53,9 @@ 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
 }
 
 src_configure() {
@@ -70,9 +75,30 @@ src_configure() {
                -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)"
        )
-
        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() {
+#      cmake-utils_src_install
+#      use kde && BUILD_DIR="${WORKDIR}/${P}_desktop_build" \
+#              cmake-utils_src_install
+#}

diff --git a/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch 
b/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
deleted file mode 100644
index e485571..0000000
--- a/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
-index eddf386..d1b8ce5 100644
---- a/src/she/CMakeLists.txt
-+++ b/src/she/CMakeLists.txt
-@@ -205,6 +205,7 @@ endif()
- add_library(she ${SHE_SOURCES})
- 
- target_link_libraries(she
-+  ${PLATFORM_LIBS}
-   gfx-lib
-   base-lib)
- 

diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index bafa309..7f80b35 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -1,13 +1,23 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-nee...@gentoo.org</email>
+  <maintainer type="person">
+       <email>azamat.hacki...@gmail.com</email>
+       <name>Azamat H. Hackimov</name>
+    <description>Proxy maintainer for this package</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-ma...@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <longdescription>
     Animated sprite editor and pixel art tool
   </longdescription>
   <use>
-       <flag name="webp">Enable webp image format support</flag>
+       <flag name="gtk3">Enable support for the experimental native GTK File 
Dialog</flag>
+    <flag name="webp">Enable webp image format support</flag>
   </use>
+  <upstream>
+    <remote-id type="github">aseprite/aseprite</remote-id>
+  </upstream>
 </pkgmetadata>