logo

overlay

My (experimental) gentoo overlay
commit: 195c85de48bcb6f493b0fba7b77c375bf16fce25
parent: c248c50967433482825f971ab909d8cb70806bb1
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sat, 24 Jun 2017 20:01:11 +0200

media-gfx/krita: Bump to 3.1.4
[ commit 9d80ab01c19d52c260cb37422db15b23584ff623 ]
> Update the licensing info: Krita is effectively GPLv3-only
> Or V3+

I guess this means I should put Krita to LICENSE="GPL3 GPL3+".
Note: Gentoo put LICENSE="GPL3"

Diffstat:

Amedia-gfx/krita/Manifest1+
Dmedia-gfx/krita/krita-3.1.2.1.ebuild87-------------------------------------------------------------------------------
Amedia-gfx/krita/krita-3.1.4.ebuild87+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mmedia-gfx/krita/krita-9999.ebuild30++++++++++++++++--------------
4 files changed, 104 insertions(+), 101 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest @@ -0,0 +1 @@ +DIST krita-3.1.4.tar.gz 1034 SHA256 46bdebd2967d4100614b7ea3f863601d9386c2b1a044869ec6089bc560805e54 SHA512 30ee70b7d9ce0c8a6831ea804e056580e560eb48777ba14ae25f7baeadca2e8abe2acbcb99e5966d3f44aa2c912015ff44c67ad635d18b3cf9bcc5beaec12c0b WHIRLPOOL 1c01ddf8910a29391d9bd5ff429223ebbd746e68ab1f3e35bb5c114ad6458cd9cfd0005fbe67aea2df7102809601aefa05d88c54b9f26033843b309253f2cb4c diff --git a/media-gfx/krita/krita-3.1.2.1.ebuild b/media-gfx/krita/krita-3.1.2.1.ebuild @@ -1,87 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="forceoptional" -inherit kde5 git-r3 - -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/" -SRC_URI="" -EGIT_REPO_URI="git://anongit.kde.org/krita.git" -EGIT_COMMIT="v${PV}" - -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc threads curl zlib" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kwindowsystem) - $(add_qt_dep qtgui '-gles2') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qttest) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtx11extras) - dev-libs/boost:= - media-gfx/exiv2:= - media-libs/lcms - media-libs/libpng:0= - virtual/opengl - x11-apps/xinput - color-management? ( media-libs/opencolorio ) - fftw? ( sci-libs/fftw:3.0= ) - gsl? ( sci-libs/gsl:= ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr - ) - pdf? ( app-text/poppler[qt5] ) - qtmedia? ( $(add_qt_dep qtmultimedia) ) - raw? ( media-libs/libraw:= ) - tiff? ( media-libs/tiff:0 ) - zlib? ( sys-libs/zlib ) - threads? ( dev-libs/libpthread-stubs ) - curl? ( net-misc/curl ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext - vc? ( >=dev-libs/vc-1.1.0 ) -" -RDEPEND="${COMMON_DEPEND} - !app-office/calligra:4[calligra_features_krita] - !app-office/calligra-l10n:4[calligra_features_krita(+)] -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package color-management OCIO) - $(cmake-utils_use_find_package fftw FFTW3) - $(cmake-utils_use_find_package gsl GSL) - $(cmake-utils_use_find_package jpeg JPEG) - $(cmake-utils_use_find_package openexr OpenEXR) - $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package qtmedia Qt5Multimedia) - $(cmake-utils_use_find_package raw LibRaw) - $(cmake-utils_use_find_package tiff TIFF) - $(cmake-utils_use_find_package vc Vc) - ) - - kde5_src_configure -} diff --git a/media-gfx/krita/krita-3.1.4.ebuild b/media-gfx/krita/krita-3.1.4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/" +SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-3 GPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc threads curl zlib" + +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtgui '-gles2') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qttest) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + $(add_qt_dep qtxml) + color-management? ( media-libs/opencolorio ) + curl? ( net-misc/curl ) + dev-libs/boost:= + fftw? ( sci-libs/fftw:3.0= ) + gsl? ( sci-libs/gsl:= ) + jpeg? ( virtual/jpeg:0 ) + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= + openexr? ( + media-libs/ilmbase:= + media-libs/openexr + ) + pdf? ( app-text/poppler[qt5] ) + qtmedia? ( $(add_qt_dep qtmultimedia) ) + raw? ( media-libs/libraw:= ) + threads? ( dev-libs/libpthread-stubs ) + tiff? ( media-libs/tiff:0 ) + virtual/opengl + x11-apps/xinput + zlib? ( sys-libs/zlib ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext + vc? ( >=dev-libs/vc-1.1.0 ) +" +RDEPEND="${COMMON_DEPEND} + !app-office/calligra:4[calligra_features_krita] + !app-office/calligra-l10n:4[calligra_features_krita(+)] +" + +PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package color-management OCIO) + $(cmake-utils_use_find_package fftw FFTW3) + $(cmake-utils_use_find_package gsl GSL) + $(cmake-utils_use_find_package jpeg JPEG) + $(cmake-utils_use_find_package openexr OpenEXR) + $(cmake-utils_use_find_package pdf Poppler) + $(cmake-utils_use_find_package qtmedia Qt5Multimedia) + $(cmake-utils_use_find_package raw LibRaw) + $(cmake-utils_use_find_package tiff TIFF) + $(cmake-utils_use_find_package vc Vc) + ) + + kde5_src_configure +} diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild @@ -11,40 +11,39 @@ HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/" SRC_URI="" EGIT_REPO_URI="git://anongit.kde.org/krita.git" -LICENSE="GPL-2+" +LICENSE="GPL-3 GPL-3+" KEYWORDS="" IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc threads curl zlib" COMMON_DEPEND=" $(add_frameworks_dep karchive) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kguiaddons) $(add_frameworks_dep ki18n) $(add_frameworks_dep kitemmodels) $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtconcurrent) $(add_qt_dep qtgui '-gles2') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) $(add_qt_dep qtnetwork) $(add_qt_dep qtprintsupport) $(add_qt_dep qtsvg) $(add_qt_dep qttest) - $(add_qt_dep qtconcurrent) + $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) - dev-libs/boost:= - media-gfx/exiv2:= - media-libs/lcms - media-libs/libpng:0= - virtual/opengl - x11-apps/xinput + $(add_qt_dep qtxml) color-management? ( media-libs/opencolorio ) + curl? ( net-misc/curl ) + dev-libs/boost:= fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= openexr? ( media-libs/ilmbase:= media-libs/openexr @@ -52,10 +51,11 @@ COMMON_DEPEND=" pdf? ( app-text/poppler[qt5] ) qtmedia? ( $(add_qt_dep qtmultimedia) ) raw? ( media-libs/libraw:= ) + threads? ( dev-libs/libpthread-stubs ) tiff? ( media-libs/tiff:0 ) + virtual/opengl + x11-apps/xinput zlib? ( sys-libs/zlib ) - threads? ( dev-libs/libpthread-stubs ) - curl? ( net-misc/curl ) " DEPEND="${COMMON_DEPEND} dev-cpp/eigen:3 @@ -68,6 +68,8 @@ RDEPEND="${COMMON_DEPEND} !app-office/calligra-l10n:4[calligra_features_krita(+)] " +PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package color-management OCIO)