public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2016-10-29  4:49 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2016-10-29  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     1233993fcc6768ded4ed76028e100929ee302a8d
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 04:49:26 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 04:49:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1233993f

media-gfx/gmic: fix phase ordering

 media-gfx/gmic/gmic-1.7.8.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/gmic/gmic-1.7.8.ebuild b/media-gfx/gmic/gmic-1.7.8.ebuild
index 80601fc..a15978b 100644
--- a/media-gfx/gmic/gmic-1.7.8.ebuild
+++ b/media-gfx/gmic/gmic-1.7.8.ebuild
@@ -43,11 +43,6 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
-src_prepare() {
-	default
-	gunzip man/${PN}.1.gz || die
-}
-
 pkg_pretend() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
@@ -58,6 +53,11 @@ pkg_pretend() {
 	fi
 }
 
+src_prepare() {
+	default
+	gunzip man/${PN}.1.gz || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_LIB=ON


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2016-10-29  5:10 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2016-10-29  5:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a504986abe1633b94442e60f1d95fc8a16615918
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 05:09:26 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 05:09:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a504986a

media-gfx/gmic: only install man page if cli interface is installed

 media-gfx/gmic/gmic-1.7.8.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/media-gfx/gmic/gmic-1.7.8.ebuild b/media-gfx/gmic/gmic-1.7.8.ebuild
index a15978b..d680021c 100644
--- a/media-gfx/gmic/gmic-1.7.8.ebuild
+++ b/media-gfx/gmic/gmic-1.7.8.ebuild
@@ -83,8 +83,10 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-
 	dodoc README
-	doman man/${PN}.1
-	use cli && newbashcomp resources/${PN}_bashcompletion.sh ${PN}
+
+	if use cli; then
+		doman man/${PN}.1
+		newbashcomp resources/${PN}_bashcompletion.sh ${PN}
+	fi
 }


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2016-10-29 20:30 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2016-10-29 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     1a8bb89945141d5bb10f993ff1ac13b5c47f4f20
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 20:29:20 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 20:29:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a8bb899

media-gfx/gmic: update upstream metadata to use github

 media-gfx/gmic/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index 2999c9f..c92b795 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -11,6 +11,6 @@
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">gmic</remote-id>
+		<remote-id type="github">dtschump/gmic</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2017-06-07  9:08 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2017-06-07  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     80ca8bc4e2a1a47c373836d4dffe83104982c02a
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  7 09:06:58 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Jun  7 09:08:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ca8bc4

media-gfx/gmic: version bump to 2.0.0

 media-gfx/gmic/Manifest          |  1 +
 media-gfx/gmic/gmic-2.0.0.ebuild | 91 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index a21f4ab655e..fbb4d023576 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_1.7.8.tar.gz 3013635 SHA256 3a2f32d79714239cfa56ecb10799b7d73362b4e2a852444bc24866272cd041a4 SHA512 2bfa7bb9ff3a99a76c71f7c4e0d619e9c205dafc02b5a2d1f097b6285c141e5413f7016b92d974327f787010a6832d272ab21a89842eee2484151072c2d4c559 WHIRLPOOL a81e135031ac095e700302d1b59428b6f86df4543643d17e759fcde3bcd7ceac950b7418d89854d2ee8c55af18efc67efc65f41984ca1dbbe5c12c3a12c36539
 DIST gmic_1.7.9.tar.gz 3069082 SHA256 932fd2ad89d090864bd7bf3860f1751c14d34276c542416114b77fd30cc8642b SHA512 749611748c9fe2a141efc9b0a445411c1ece842f4c576b68b3b17cbbffdc1cf43a2aee55dc399b899dc03882f240289beaef96d9ec85b10ffc0ad986412cd4bc WHIRLPOOL cce3788a095d115afaa1c5641ac240d9b9977e62cdced9e0876bd53a623b91bb951faa07a404b4247c6b84e3e81eca8d3edac4bd0ff29a63efef8cf9a35a66f0
+DIST gmic_2.0.0.tar.gz 3181386 SHA256 27c57f0ca630895a0dab5c0eff854f3133a29743267c4aa196dc2d1936463ca4 SHA512 08cb3bb02d072db5881dc3b2c23be766ae9909a29042777b474733afe30efeaeff35582ac69e8c5f38258c563919a17ce22294c594cbe04f792769b6609b3efb WHIRLPOOL 2732285e61438988b71bae88ba474004c1f2c187aca3423b4d0f1c62261b2d77aaa81cdbf836d48607776da88b56c56d465bc7647e94bc8e5cf06a6282fff9de

diff --git a/media-gfx/gmic/gmic-2.0.0.ebuild b/media-gfx/gmic/gmic-2.0.0.ebuild
new file mode 100644
index 00000000000..bf371feb3ea
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.0.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib"
+REQUIRED_USE="|| ( cli gimp )"
+
+COMMON_DEPEND="
+	fftw? ( sci-libs/fftw:3.0[threads] )
+	gimp? ( >=media-gfx/gimp-2.4.0 )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg:0 )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.9-flags.patch
+	"${FILESDIR}"/${PN}-1.7.9-man.patch
+)
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_PLUGIN=$(usex gimp)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp resources/${PN}_bashcompletion.sh ${PN}
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2019-01-14  7:48 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2019-01-14  7:48 UTC (permalink / raw
  To: gentoo-commits

commit:     3358b8f975a8a2c746aaf16db674389d5c8f6350
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 07:20:15 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 07:47:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3358b8f9

media-gfx/gmic: version bump to 2.4.5

Closes: https://bugs.gentoo.org/674624

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.4.5.ebuild | 171 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index d9a7a458c06..ba950258f35 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1 +1,2 @@
 DIST gmic_2.4.3.tar.gz 3816129 BLAKE2B 1c9dd6c7e45809d0cf8b8a45476a4b20ad321b5f34fbc5214cb149777c6e9a6aba845cd816cc1503010e281bda0b32e1059dd34d052afe2ebc086469163967be SHA512 482e70b0c82992799c5769ded1547904d16dbc9206d67279b6f524c1214258b97fa539678844a450d6f64144dc7a2715c754d6a1d85398e648bc34086fc3218f
+DIST gmic_2.4.5.tar.gz 3819428 BLAKE2B 71d19bf6d79ca00bf95006bd96595b83ee28caadf46a9c899176dcd96c5da1b3b9fa7b2150ea2383262c1db2357838c4c716c8ab09060c6c06faa5f7c52975c8 SHA512 39f7c35303704c579d62377f491830f6d310be672f3015aafbd6715c5fa1185d64671f841fd5e0cb818dfc96851afc6dbdbbb99f9b5156ccaeab91e7e1b08033

diff --git a/media-gfx/gmic/gmic-2.4.5.ebuild b/media-gfx/gmic/gmic-2.4.5.ebuild
new file mode 100644
index 00000000000..4774c14f3a4
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.4.5.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=()
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_film_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2019-03-21 21:04 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2019-03-21 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8a76628b53b63c2fe85854b9ff72ce7164b77637
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 05:47:08 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 21:03:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a76628b

media-gfx/gmic: version bump to 2.5.3

Closes: https://bugs.gentoo.org/680856

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.5.3.ebuild | 171 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index ba950258f35..7504d64e6e4 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.4.3.tar.gz 3816129 BLAKE2B 1c9dd6c7e45809d0cf8b8a45476a4b20ad321b5f34fbc5214cb149777c6e9a6aba845cd816cc1503010e281bda0b32e1059dd34d052afe2ebc086469163967be SHA512 482e70b0c82992799c5769ded1547904d16dbc9206d67279b6f524c1214258b97fa539678844a450d6f64144dc7a2715c754d6a1d85398e648bc34086fc3218f
 DIST gmic_2.4.5.tar.gz 3819428 BLAKE2B 71d19bf6d79ca00bf95006bd96595b83ee28caadf46a9c899176dcd96c5da1b3b9fa7b2150ea2383262c1db2357838c4c716c8ab09060c6c06faa5f7c52975c8 SHA512 39f7c35303704c579d62377f491830f6d310be672f3015aafbd6715c5fa1185d64671f841fd5e0cb818dfc96851afc6dbdbbb99f9b5156ccaeab91e7e1b08033
+DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5

diff --git a/media-gfx/gmic/gmic-2.5.3.ebuild b/media-gfx/gmic/gmic-2.5.3.ebuild
new file mode 100644
index 00000000000..bfd30752357
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.5.3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=()
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2019-07-02 21:06 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2019-07-02 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     941b0628f8086a1d63caa9809da845e483161c4b
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  2 21:04:40 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Jul  2 21:05:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941b0628

media-gfx/gmic: remove old

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   2 -
 media-gfx/gmic/gmic-2.4.3.ebuild | 170 --------------------------------------
 media-gfx/gmic/gmic-2.4.5.ebuild | 171 ---------------------------------------
 3 files changed, 343 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index fc20d5e7d3c..df4a2a056fb 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,2 @@
-DIST gmic_2.4.3.tar.gz 3816129 BLAKE2B 1c9dd6c7e45809d0cf8b8a45476a4b20ad321b5f34fbc5214cb149777c6e9a6aba845cd816cc1503010e281bda0b32e1059dd34d052afe2ebc086469163967be SHA512 482e70b0c82992799c5769ded1547904d16dbc9206d67279b6f524c1214258b97fa539678844a450d6f64144dc7a2715c754d6a1d85398e648bc34086fc3218f
-DIST gmic_2.4.5.tar.gz 3819428 BLAKE2B 71d19bf6d79ca00bf95006bd96595b83ee28caadf46a9c899176dcd96c5da1b3b9fa7b2150ea2383262c1db2357838c4c716c8ab09060c6c06faa5f7c52975c8 SHA512 39f7c35303704c579d62377f491830f6d310be672f3015aafbd6715c5fa1185d64671f841fd5e0cb818dfc96851afc6dbdbbb99f9b5156ccaeab91e7e1b08033
 DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5
 DIST gmic_2.6.7.tar.gz 5810623 BLAKE2B 407349683a7871937a37735aef81665ef5b06e5a88d5135e0d4264ce231ddba7ab088645049b1378dd73a7e6b45ada58958986b3282916aba19f7d7735c8bdaa SHA512 18088e33c133ddfa9642295af331d1808e0a618df8a7d3bb7f93d9933d4b6ec2f53a96e5a0f2bca5f1a53b4c7c0628ac7906503be007860fc37907db47029567

diff --git a/media-gfx/gmic/gmic-2.4.3.ebuild b/media-gfx/gmic/gmic-2.4.3.ebuild
deleted file mode 100644
index 0b6b7df9acb..00000000000
--- a/media-gfx/gmic/gmic-2.4.3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${P}-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=()
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_film_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}

diff --git a/media-gfx/gmic/gmic-2.4.5.ebuild b/media-gfx/gmic/gmic-2.4.5.ebuild
deleted file mode 100644
index 4774c14f3a4..00000000000
--- a/media-gfx/gmic/gmic-2.4.5.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=()
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_film_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2019-08-24  4:49 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2019-08-24  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     bfc08aa3de8e1f4e9faed1f0166f210fc2649234
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 04:48:43 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 04:49:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc08aa3

media-gfx/gmic: version bump to 2.7.0

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.7.0.ebuild | 171 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index df4a2a056fb..5e7819d5276 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5
 DIST gmic_2.6.7.tar.gz 5810623 BLAKE2B 407349683a7871937a37735aef81665ef5b06e5a88d5135e0d4264ce231ddba7ab088645049b1378dd73a7e6b45ada58958986b3282916aba19f7d7735c8bdaa SHA512 18088e33c133ddfa9642295af331d1808e0a618df8a7d3bb7f93d9933d4b6ec2f53a96e5a0f2bca5f1a53b4c7c0628ac7906503be007860fc37907db47029567
+DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4

diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
new file mode 100644
index 00000000000..eabe0e38d0f
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.7.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2019-08-24  4:52 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2019-08-24  4:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0e30fd4af59ae7f862323b0d2dad72b8be706db6
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 04:51:04 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 04:51:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e30fd4a

media-gfx/gmic: move virtual/pkgconfig to BDEPEND

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/gmic-2.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
index eabe0e38d0f..d4bacf38744 100644
--- a/media-gfx/gmic/gmic-2.7.0.ebuild
+++ b/media-gfx/gmic/gmic-2.7.0.ebuild
@@ -63,11 +63,11 @@ RDEPEND="${COMMON_DEPEND}
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	gimp? ( dev-qt/linguist-tools )
 	krita? ( dev-qt/linguist-tools )
 	qt5? ( dev-qt/linguist-tools )
 "
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
 	if use openmp ; then


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2019-09-03  5:21 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2019-09-03  5:21 UTC (permalink / raw
  To: gentoo-commits

commit:     930d276c8141a184268735dbbcd960511d36cfd7
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 05:20:18 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 05:20:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930d276c

media-gfx/gmic: remove old

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   2 -
 media-gfx/gmic/gmic-2.5.3.ebuild | 171 ---------------------------------------
 media-gfx/gmic/gmic-2.6.7.ebuild | 171 ---------------------------------------
 3 files changed, 344 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 610ea968ed3..96f04e36bdf 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,2 @@
-DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5
-DIST gmic_2.6.7.tar.gz 5810623 BLAKE2B 407349683a7871937a37735aef81665ef5b06e5a88d5135e0d4264ce231ddba7ab088645049b1378dd73a7e6b45ada58958986b3282916aba19f7d7735c8bdaa SHA512 18088e33c133ddfa9642295af331d1808e0a618df8a7d3bb7f93d9933d4b6ec2f53a96e5a0f2bca5f1a53b4c7c0628ac7906503be007860fc37907db47029567
 DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
 DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e

diff --git a/media-gfx/gmic/gmic-2.5.3.ebuild b/media-gfx/gmic/gmic-2.5.3.ebuild
deleted file mode 100644
index bfd30752357..00000000000
--- a/media-gfx/gmic/gmic-2.5.3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=()
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}

diff --git a/media-gfx/gmic/gmic-2.6.7.ebuild b/media-gfx/gmic/gmic-2.6.7.ebuild
deleted file mode 100644
index 2a1fe822e6e..00000000000
--- a/media-gfx/gmic/gmic-2.6.7.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=( "${FILESDIR}"/${P}-qt-cmake.patch )
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2019-09-03  5:21 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2019-09-03  5:21 UTC (permalink / raw
  To: gentoo-commits

commit:     9a4ddf1a8d57cc6c1b26bacd9a576a3ef079698a
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 05:19:51 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 05:19:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a4ddf1a

media-gfx/gmic: version bump to 2.7.1

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.7.1.ebuild | 171 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 5e7819d5276..610ea968ed3 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,4 @@
 DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5
 DIST gmic_2.6.7.tar.gz 5810623 BLAKE2B 407349683a7871937a37735aef81665ef5b06e5a88d5135e0d4264ce231ddba7ab088645049b1378dd73a7e6b45ada58958986b3282916aba19f7d7735c8bdaa SHA512 18088e33c133ddfa9642295af331d1808e0a618df8a7d3bb7f93d9933d4b6ec2f53a96e5a0f2bca5f1a53b4c7c0628ac7906503be007860fc37907db47029567
 DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
+DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e

diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
new file mode 100644
index 00000000000..d4bacf38744
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.7.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2019-09-27  3:35 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2019-09-27  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     1e4c9d4638e6daa24a041ccf763b688579bedd0e
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 03:31:24 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 03:31:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4c9d46

media-gfx/gmic: version bump to 2.7.2

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.7.2.ebuild | 171 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 96f04e36bdf..dbb05f62c7b 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
 DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
+DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B 192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a SHA512 d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb

diff --git a/media-gfx/gmic/gmic-2.7.2.ebuild b/media-gfx/gmic/gmic-2.7.2.ebuild
new file mode 100644
index 00000000000..bd8a5d1a186
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.7.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-01-02 22:36 Andreas Sturmlechner
  0 siblings, 0 replies; 91+ messages in thread
From: Andreas Sturmlechner @ 2020-01-02 22:36 UTC (permalink / raw
  To: gentoo-commits

commit:     088d47495b72cf9d001f170887ad1e574b01da97
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 22:35:56 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 22:36:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088d4749

media-gfx/gmic: Revert back to cmake-utils.eclass

Sorry for breaking. It is weird, but not for me to figure out.

Bug: https://bugs.gentoo.org/704524
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/gmic/gmic-2.7.0.ebuild | 28 +++++++++++++++-------------
 media-gfx/gmic/gmic-2.7.1.ebuild | 28 +++++++++++++++-------------
 media-gfx/gmic/gmic-2.7.2.ebuild | 28 +++++++++++++++-------------
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
index a96eb924674..1edb9254ff0 100644
--- a/media-gfx/gmic/gmic-2.7.0.ebuild
+++ b/media-gfx/gmic/gmic-2.7.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
@@ -79,14 +81,14 @@ pkg_pretend() {
 
 src_prepare() {
 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake_src_prepare
+	cmake-utils_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
 	if use gimp || use krita || use qt5; then
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
 		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
-		cmake_src_prepare
+		cmake-utils_src_prepare
 	fi
 }
 
@@ -113,7 +115,7 @@ src_configure() {
 		-DENABLE_DYNAMIC_LINKING=ON
 	)
 
-	cmake_src_configure
+	cmake-utils_src_configure
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -126,32 +128,32 @@ src_configure() {
 
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
 	fi
 
 	if use krita; then
 		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
 	fi
 
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
 	fi
 }
 
 src_compile() {
-	cmake_src_compile
+	cmake-utils_src_compile
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
-	cmake_src_install
+	cmake-utils_src_install
 	dodoc README
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 

diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
index 81708eba2f7..2a575ef1eb6 100644
--- a/media-gfx/gmic/gmic-2.7.1.ebuild
+++ b/media-gfx/gmic/gmic-2.7.1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
@@ -79,14 +81,14 @@ pkg_pretend() {
 
 src_prepare() {
 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake_src_prepare
+	cmake-utils_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
 	if use gimp || use krita || use qt5; then
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
 		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake_src_prepare
+		cmake-utils_src_prepare
 	fi
 }
 
@@ -113,7 +115,7 @@ src_configure() {
 		-DENABLE_DYNAMIC_LINKING=ON
 	)
 
-	cmake_src_configure
+	cmake-utils_src_configure
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -126,32 +128,32 @@ src_configure() {
 
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
 	fi
 
 	if use krita; then
 		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
 	fi
 
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
 	fi
 }
 
 src_compile() {
-	cmake_src_compile
+	cmake-utils_src_compile
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
-	cmake_src_install
+	cmake-utils_src_install
 	dodoc README
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 

diff --git a/media-gfx/gmic/gmic-2.7.2.ebuild b/media-gfx/gmic/gmic-2.7.2.ebuild
index 81708eba2f7..2a575ef1eb6 100644
--- a/media-gfx/gmic/gmic-2.7.2.ebuild
+++ b/media-gfx/gmic/gmic-2.7.2.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
@@ -79,14 +81,14 @@ pkg_pretend() {
 
 src_prepare() {
 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake_src_prepare
+	cmake-utils_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
 	if use gimp || use krita || use qt5; then
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
 		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake_src_prepare
+		cmake-utils_src_prepare
 	fi
 }
 
@@ -113,7 +115,7 @@ src_configure() {
 		-DENABLE_DYNAMIC_LINKING=ON
 	)
 
-	cmake_src_configure
+	cmake-utils_src_configure
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -126,32 +128,32 @@ src_configure() {
 
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
 	fi
 
 	if use krita; then
 		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
 	fi
 
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
 	fi
 }
 
 src_compile() {
-	cmake_src_compile
+	cmake-utils_src_compile
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
-	cmake_src_install
+	cmake-utils_src_install
 	dodoc README
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-01-03  6:34 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2020-01-03  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b825cfa9c9e38cc3da781a90d3a9de0973fda96e
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 06:28:59 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 06:31:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b825cfa9

media-gfx/gmic: version bump to 2.8.1

And update from the cmake-utils to the cmake eclass.

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.8.1.ebuild | 173 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index dbb05f62c7b..edf579caa75 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,4 @@
 DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
 DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
 DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B 192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a SHA512 d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
+DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9

diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild
new file mode 100644
index 00000000000..1d3205fc5a2
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.8.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+
+		# fix linking with fftw when thread support is enabled
+		pushd "${S}"/gmic-qt > /dev/null || die
+		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
+		cmake_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-01-04  9:56 Andreas Sturmlechner
  0 siblings, 0 replies; 91+ messages in thread
From: Andreas Sturmlechner @ 2020-01-04  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     35f729e094640deb8bc7d0cb5662bbb3b1d2a851
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 09:55:17 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 09:56:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f729e0

media-gfx/gmic: Use src_prepare from 2.7.2 again

cmake.eclass was fixed instead, until a better solution is found.

Closes: https://bugs.gentoo.org/704758
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/gmic/gmic-2.8.1.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild
index 1d3205fc5a2..4c6884de786 100644
--- a/media-gfx/gmic/gmic-2.8.1.ebuild
+++ b/media-gfx/gmic/gmic-2.8.1.ebuild
@@ -85,12 +85,10 @@ src_prepare() {
 	if use gimp || use krita || use qt5; then
 		# respect user flags
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-
+		local S="${S}/gmic-qt"
 		# fix linking with fftw when thread support is enabled
-		pushd "${S}"/gmic-qt > /dev/null || die
 		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
 		cmake_src_prepare
-		popd > /dev/null || die
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-01-14 14:11 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2020-01-14 14:11 UTC (permalink / raw
  To: gentoo-commits

commit:     7973fdb7b3c29ad806750433870586f938285a59
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 14:09:43 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 14:10:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7973fdb7

media-gfx/gmic: remove old

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 -
 media-gfx/gmic/gmic-2.7.2.ebuild | 171 ---------------------------------------
 2 files changed, 172 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 68e44490b2c..53b6fcfee55 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
-DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B 192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a SHA512 d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
 DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
 DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a

diff --git a/media-gfx/gmic/gmic-2.7.2.ebuild b/media-gfx/gmic/gmic-2.7.2.ebuild
deleted file mode 100644
index 2a575ef1eb6..00000000000
--- a/media-gfx/gmic/gmic-2.7.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-01-14 14:11 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2020-01-14 14:11 UTC (permalink / raw
  To: gentoo-commits

commit:     85351d9f260b771eebc13c0033b1b61866a1aed8
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 14:07:50 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 14:10:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85351d9f

media-gfx/gmic: version bump to 2.8.2

Closes: https://bugs.gentoo.org/704742
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.8.2.ebuild | 170 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index ccf872e7f68..68e44490b2c 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B 192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a SHA512 d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
 DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
+DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a

diff --git a/media-gfx/gmic/gmic-2.8.2.ebuild b/media-gfx/gmic/gmic-2.8.2.ebuild
new file mode 100644
index 00000000000..b9efdacb34d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.8.2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-01-31  8:50 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2020-01-31  8:50 UTC (permalink / raw
  To: gentoo-commits

commit:     e7ac086a44381ca195346f7ee20d9a58603057d3
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 08:48:00 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 08:49:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ac086a

media-gfx/gmic: version bump to 2.8.3

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.8.3.ebuild | 170 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 53b6fcfee55..e252f1e9e13 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
 DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a
+DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd

diff --git a/media-gfx/gmic/gmic-2.8.3.ebuild b/media-gfx/gmic/gmic-2.8.3.ebuild
new file mode 100644
index 00000000000..b9efdacb34d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.8.3.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-04-05 10:05 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2020-04-05 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     b92c686904521a641358189c3227d461fe022460
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 08:07:52 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 10:02:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b92c6869

media-gfx/gmic: version bump to 2.9.0

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.9.0.ebuild | 170 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index e252f1e9e13..ec37d729338 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,4 @@
 DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
 DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a
 DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd
+DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d

diff --git a/media-gfx/gmic/gmic-2.9.0.ebuild b/media-gfx/gmic/gmic-2.9.0.ebuild
new file mode 100644
index 00000000000..660e4b3ff4d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-06-30  2:49 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2020-06-30  2:49 UTC (permalink / raw
  To: gentoo-commits

commit:     07732be1f8fff45dd0a5dea3e7a21fce9b25d101
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 02:35:31 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 02:35:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07732be1

media-gfx/gmic: remove old

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 -
 media-gfx/gmic/gmic-2.8.3.ebuild | 170 ---------------------------------------
 2 files changed, 171 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 0ebf428cd52..c36aae8a862 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
-DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd
 DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
 DIST gmic_2.9.1.tar.gz 6212626 BLAKE2B cb948987629f9bf07f3e756eb5f90526ac2012a7bd2c11021a3fbc253709d9e62ecd60a2f3a9f9fd9a8605f0f2a73497143c4f121e27d1cb5aa4f3a455916c56 SHA512 dc6a90bb130b50164f7696a2e0c702ee24267f1559f52b77d4040fa0477c452b52eb140263bb3abb49673638246784b356004866e13f6d0660feff759688b45b

diff --git a/media-gfx/gmic/gmic-2.8.3.ebuild b/media-gfx/gmic/gmic-2.8.3.ebuild
deleted file mode 100644
index 660e4b3ff4d..00000000000
--- a/media-gfx/gmic/gmic-2.8.3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-06-30  2:49 Tim Harder
  0 siblings, 0 replies; 91+ messages in thread
From: Tim Harder @ 2020-06-30  2:49 UTC (permalink / raw
  To: gentoo-commits

commit:     410e2d4167ed15cc8f1915fdb3cc54aa3781b3be
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 02:35:17 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 02:35:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410e2d41

media-gfx/gmic: version bump to 2.9.1

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.9.1.ebuild | 170 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index e743820e3bd..0ebf428cd52 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd
 DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
+DIST gmic_2.9.1.tar.gz 6212626 BLAKE2B cb948987629f9bf07f3e756eb5f90526ac2012a7bd2c11021a3fbc253709d9e62ecd60a2f3a9f9fd9a8605f0f2a73497143c4f121e27d1cb5aa4f3a455916c56 SHA512 dc6a90bb130b50164f7696a2e0c702ee24267f1559f52b77d4040fa0477c452b52eb140263bb3abb49673638246784b356004866e13f6d0660feff759688b45b

diff --git a/media-gfx/gmic/gmic-2.9.1.ebuild b/media-gfx/gmic/gmic-2.9.1.ebuild
new file mode 100644
index 00000000000..660e4b3ff4d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-10-31 11:11 David Seifert
  0 siblings, 0 replies; 91+ messages in thread
From: David Seifert @ 2020-10-31 11:11 UTC (permalink / raw
  To: gentoo-commits

commit:     6652abdee895a451fd6bf796f6559491c26e22bb
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 11:11:08 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 11:11:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6652abde

media-gfx/gmic: [QA] Inherit flag-o-matic.eclass explicitly

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.0.ebuild | 2 +-
 media-gfx/gmic/gmic-2.9.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gmic/gmic-2.9.0.ebuild b/media-gfx/gmic/gmic-2.9.0.ebuild
index 660e4b3ff4d..03af533ecf7 100644
--- a/media-gfx/gmic/gmic-2.9.0.ebuild
+++ b/media-gfx/gmic/gmic-2.9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1 toolchain-funcs
+inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"

diff --git a/media-gfx/gmic/gmic-2.9.1.ebuild b/media-gfx/gmic/gmic-2.9.1.ebuild
index 660e4b3ff4d..03af533ecf7 100644
--- a/media-gfx/gmic/gmic-2.9.1.ebuild
+++ b/media-gfx/gmic/gmic-2.9.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1 toolchain-funcs
+inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-11-06 17:18 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2020-11-06 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     eeb61045dc9d41fa99eb75cf4d2e3eb259308f1a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 17:03:37 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 17:16:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb61045

media-gfx/gmic: remove old

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   2 -
 media-gfx/gmic/gmic-2.9.0.ebuild | 170 ---------------------------------------
 media-gfx/gmic/gmic-2.9.1.ebuild | 170 ---------------------------------------
 3 files changed, 342 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 37a45bd8dc3..39f44b3db54 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1 @@
-DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
-DIST gmic_2.9.1.tar.gz 6212626 BLAKE2B cb948987629f9bf07f3e756eb5f90526ac2012a7bd2c11021a3fbc253709d9e62ecd60a2f3a9f9fd9a8605f0f2a73497143c4f121e27d1cb5aa4f3a455916c56 SHA512 dc6a90bb130b50164f7696a2e0c702ee24267f1559f52b77d4040fa0477c452b52eb140263bb3abb49673638246784b356004866e13f6d0660feff759688b45b
 DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796

diff --git a/media-gfx/gmic/gmic-2.9.0.ebuild b/media-gfx/gmic/gmic-2.9.0.ebuild
deleted file mode 100644
index 03af533ecf7..00000000000
--- a/media-gfx/gmic/gmic-2.9.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}

diff --git a/media-gfx/gmic/gmic-2.9.1.ebuild b/media-gfx/gmic/gmic-2.9.1.ebuild
deleted file mode 100644
index 03af533ecf7..00000000000
--- a/media-gfx/gmic/gmic-2.9.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-11-06 17:18 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2020-11-06 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     5582ec7ab92980ea620a21187fd9cc7d207bfdde
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 17:04:05 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 17:16:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5582ec7a

media-gfx/gmic: add self as maintainer

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index e2159e098bb..39d49193716 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<use>
 		<flag name="cli">Build CLI interface</flag>
 		<flag name="digikam">Build <pkg>media-gfx/digikam</pkg> plugin</flag>


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-11-06 20:25 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2020-11-06 20:25 UTC (permalink / raw
  To: gentoo-commits

commit:     7c5da76e715616d593aaa8c593660e7b75be77cd
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 20:16:13 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 20:25:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5da76e

media-gfx/gmic: make sure patches only get applied once

For certain USE flags, the ebuild calls cmake_src_prepare for the second
time in another source directory. This causes emerge to attempt to apply
all the patches listed in PATCHES again, in the wrong place. Make sure
PATCHES is empty when cmake_src_prepare is called for the second time.

Closes: https://bugs.gentoo.org/753377
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-gfx/gmic/gmic-2.9.2.ebuild b/media-gfx/gmic/gmic-2.9.2.ebuild
index 260962b2dc1..51708f537aa 100644
--- a/media-gfx/gmic/gmic-2.9.2.ebuild
+++ b/media-gfx/gmic/gmic-2.9.2.ebuild
@@ -96,6 +96,8 @@ src_prepare() {
 			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
 			-i gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
 		cmake_src_prepare
 	fi
 }


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-11-06 22:34 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2020-11-06 22:34 UTC (permalink / raw
  To: gentoo-commits

commit:     5604b1477d6c4ae96ca4b618a6a400012fa93ef2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 22:34:21 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 22:34:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5604b147

media-gfx/gmic: arm64 keyworded (bug #753356)

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.2.ebuild b/media-gfx/gmic/gmic-2.9.2.ebuild
index 51708f537aa..f92fe125726 100644
--- a/media-gfx/gmic/gmic-2.9.2.ebuild
+++ b/media-gfx/gmic/gmic-2.9.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-11-08 12:02 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2020-11-08 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     8b89862aec67d9b473972c08b61419c399eeccb6
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Nov  4 22:14:31 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov  8 11:53:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b89862a

media-gfx/gmic: switch media-gfx/gimp-2.10 to SLOT="0/2"

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/{gmic-2.9.2.ebuild => gmic-2.9.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.2.ebuild b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
similarity index 99%
rename from media-gfx/gmic/gmic-2.9.2.ebuild
rename to media-gfx/gmic/gmic-2.9.2-r1.ebuild
index f92fe125726..4af6d1c63fa 100644
--- a/media-gfx/gmic/gmic-2.9.2.ebuild
+++ b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	)
 	fftw? ( sci-libs/fftw:3.0=[threads] )
 	gimp? (
-		>=media-gfx/gimp-2.8.0
+		media-gfx/gimp:0/2
 		${QT_DEPEND}
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-11-18 15:14 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2020-11-18 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     de5b5f14a0117060931cd10d8e41769202488b63
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 15:12:06 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 15:14:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de5b5f14

media-gfx/gmic: bump to 2.9.3

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.9.3.ebuild | 192 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 39f44b3db54..4ecb061abd1 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1 +1,2 @@
 DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
+DIST gmic_2.9.3.tar.gz 7279292 BLAKE2B 920a94321b2916f65bb2c5b273c4938acdcd7b4825a3eeeb15407b1a6d7881f927792f89524db7d3a33272ddae8e39e8f60d29a922b5dd2873e6b9be2948a646 SHA512 e640c73b9d008b445d075b02ed7d359a0c2ee51df8245557192e38ed108e6db43de0fca577f1636c40b2c4a7db038f79926e7666b9f00b6421cda96d9a91b3ff

diff --git a/media-gfx/gmic/gmic-2.9.3.ebuild b/media-gfx/gmic/gmic-2.9.3.ebuild
new file mode 100644
index 00000000000..4af6d1c63fa
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.3.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli digikam gimp krita qt5 )
+	digikam? ( png zlib fftw X )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	digikam? (
+		media-gfx/digikam
+		${QT_DEPEND}
+	)
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	digikam? ( dev-qt/linguist-tools )
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use digikam || use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use digikam; then
+		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
+		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
+	fi
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use digikam; then
+		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
+		exeinto "${DIGIKAMDIR}"
+		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
+	fi
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2020-11-27 19:17 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2020-11-27 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     0f2970dd05a43ad426c1cb5c859ba1a052ee4409
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 19:15:19 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 19:17:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f2970dd

media-gfx/gmic: bump to 2.9.4

Fixes a potential null-pointer read.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                                 | 2 +-
 media-gfx/gmic/{gmic-2.9.3.ebuild => gmic-2.9.4.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 4ecb061abd1..a5ed8f534c6 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,2 @@
 DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
-DIST gmic_2.9.3.tar.gz 7279292 BLAKE2B 920a94321b2916f65bb2c5b273c4938acdcd7b4825a3eeeb15407b1a6d7881f927792f89524db7d3a33272ddae8e39e8f60d29a922b5dd2873e6b9be2948a646 SHA512 e640c73b9d008b445d075b02ed7d359a0c2ee51df8245557192e38ed108e6db43de0fca577f1636c40b2c4a7db038f79926e7666b9f00b6421cda96d9a91b3ff
+DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73

diff --git a/media-gfx/gmic/gmic-2.9.3.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
similarity index 100%
rename from media-gfx/gmic/gmic-2.9.3.ebuild
rename to media-gfx/gmic/gmic-2.9.4.ebuild


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-02-03  3:12 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2021-02-03  3:12 UTC (permalink / raw
  To: gentoo-commits

commit:     7600673e359ac7d87a6a69931266b04c1672837a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  3 03:12:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb  3 03:12:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7600673e

media-gfx/gmic: Stabilize 2.9.4 amd64, #768393

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
index 4af6d1c63fa..c87b31713bd 100644
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ b/media-gfx/gmic/gmic-2.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-02-04  8:12 Agostino Sarubbo
  0 siblings, 0 replies; 91+ messages in thread
From: Agostino Sarubbo @ 2021-02-04  8:12 UTC (permalink / raw
  To: gentoo-commits

commit:     99ae85072be2da8a6d1c3fd81b2a3a1ecda8cd28
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  4 08:12:29 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 08:12:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ae8507

media-gfx/gmic: x86 stable wrt bug #768393

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
index c87b31713bd..0c669de12cc 100644
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ b/media-gfx/gmic/gmic-2.9.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-02-08 13:48 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-02-08 13:48 UTC (permalink / raw
  To: gentoo-commits

commit:     967211c08378d7a65c70e53b7351d69de5eb5d2c
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 13:24:28 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 13:47:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967211c0

media-gfx/gmic: bump to 2.9.5

Now without the "at least one front-end must be enabled" REQUIRED_USE
rule, there _are_ legitimate use cases for installing only the library
 - media-gfx/darktable[gmic] for instance.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.9.5.ebuild | 191 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index a5ed8f534c6..cbad8cc6505 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
+DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809

diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
new file mode 100644
index 00000000000..30c1bc1b4da
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	digikam? ( png zlib fftw X )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	digikam? (
+		media-gfx/digikam
+		${QT_DEPEND}
+	)
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	digikam? ( dev-qt/linguist-tools )
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use digikam || use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use digikam; then
+		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
+		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
+	fi
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use digikam; then
+		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
+		exeinto "${DIGIKAMDIR}"
+		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
+	fi
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-02-09  9:25 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-02-09  9:25 UTC (permalink / raw
  To: gentoo-commits

commit:     7412f904e54b0d1285d008df4e4f91beb7ad0f3e
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 09:21:55 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 09:25:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7412f904

media-gfx/gmic-2.9.5: drop IUSE=digikam

The digiKam host got removed from gmic-qt (which comes bunded with G'MIC
itself) in late January 2021.

Closes: https://bugs.gentoo.org/769560
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.5.ebuild | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index 30c1bc1b4da..20cad100504 100644
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -20,9 +20,8 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-IUSE="cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
 REQUIRED_USE="
-	digikam? ( png zlib fftw X )
 	gimp? ( png zlib fftw X )
 	krita? ( png zlib fftw X )
 	qt5? ( png zlib fftw X )
@@ -37,10 +36,6 @@ QT_DEPEND="
 "
 COMMON_DEPEND="
 	curl? ( net-misc/curl )
-	digikam? (
-		media-gfx/digikam
-		${QT_DEPEND}
-	)
 	fftw? ( sci-libs/fftw:3.0=[threads] )
 	gimp? (
 		media-gfx/gimp:0/2
@@ -66,7 +61,6 @@ RDEPEND="${COMMON_DEPEND}
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 DEPEND="${COMMON_DEPEND}
-	digikam? ( dev-qt/linguist-tools )
 	gimp? ( dev-qt/linguist-tools )
 	krita? ( dev-qt/linguist-tools )
 	qt5? ( dev-qt/linguist-tools )
@@ -89,7 +83,7 @@ src_prepare() {
 	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
-	if use digikam || use gimp || use krita || use qt5; then
+	if use gimp || use krita || use qt5; then
 		# respect user flags
 		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
 			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
@@ -135,11 +129,6 @@ src_configure() {
 		-DGMIC_PATH="${S}/src"
 	)
 
-	if use digikam; then
-		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
-		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
-	fi
-
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
 		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
@@ -161,7 +150,6 @@ src_compile() {
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
 	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
 	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
 	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
@@ -177,11 +165,6 @@ src_install() {
 	doins resources/gmic_cluts.gmz
 
 	# install gmic-qt frontends
-	if use digikam; then
-		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
-		exeinto "${DIGIKAMDIR}"
-		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
-	fi
 	if use gimp; then
 		exeinto "${PLUGINDIR}"
 		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-02-15  6:05 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2021-02-15  6:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8dbcf0ce43ad91ebeba378175a0fcd8edb78b1a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 06:04:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 06:04:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbcf0ce

media-gfx/gmic: Stabilize 2.9.4 arm64, #768393

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
index 0c669de12cc..09772f17dec 100644
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ b/media-gfx/gmic/gmic-2.9.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-02-15 12:26 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-02-15 12:26 UTC (permalink / raw
  To: gentoo-commits

commit:     bf09577ce7b1bea037d90c55b4e4033f30c6fa90
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 12:24:07 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 12:24:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf09577c

media-gfx/gmic: remove old

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest             |   1 -
 media-gfx/gmic/gmic-2.9.2-r1.ebuild | 192 ------------------------------------
 2 files changed, 193 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index cbad8cc6505..17da03c6dd4 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
-DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809

diff --git a/media-gfx/gmic/gmic-2.9.2-r1.ebuild b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
deleted file mode 100644
index 4af6d1c63fa..00000000000
--- a/media-gfx/gmic/gmic-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli digikam gimp krita qt5 )
-	digikam? ( png zlib fftw X )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	digikam? (
-		media-gfx/digikam
-		${QT_DEPEND}
-	)
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	digikam? ( dev-qt/linguist-tools )
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use digikam || use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use digikam; then
-		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
-		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
-	fi
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use digikam; then
-		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
-		exeinto "${DIGIKAMDIR}"
-		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
-	fi
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-03-12 15:25 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2021-03-12 15:25 UTC (permalink / raw
  To: gentoo-commits

commit:     a79cd13af700023b5a6ac45940aa807078f50215
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 15:23:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 15:25:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79cd13a

media-gfx/gmic: Stabilize 2.9.5 amd64, #775449

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index 20cad100504..c225ea989d7 100644
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-03-12 15:28 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2021-03-12 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     351d1a835925b577422803c80085d3a3c59fcd9a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 15:26:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 15:28:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351d1a83

media-gfx/gmic: Stabilize 2.9.5 x86, #775449

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index c225ea989d7..cd2efec6e1b 100644
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-03-14 22:03 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2021-03-14 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     c407bbe0196a95db53618c5852746e485c0dcd60
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 22:02:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 22:02:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c407bbe0

media-gfx/gmic: Stabilize 2.9.5 arm64, #775449

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index cd2efec6e1b..5e85c6f688a 100644
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-03-19 12:32 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-03-19 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     1d0f148e17a66d28a1ffd90a077a4690d4601ec8
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 12:28:41 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 12:32:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d0f148e

media-gfx/gmic: bump to 2.9.6

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.9.6.ebuild | 174 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 17da03c6dd4..319ad713ab3 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
+DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2

diff --git a/media-gfx/gmic/gmic-2.9.6.ebuild b/media-gfx/gmic/gmic-2.9.6.ebuild
new file mode 100644
index 00000000000..20cad100504
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-04-16 18:25 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-04-16 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9963d01a2e92746225423d8a597560298c542b76
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 16:04:02 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 18:24:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9963d01a

media-gfx/gmic: remove old

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 -
 media-gfx/gmic/gmic-2.9.4.ebuild | 192 ---------------------------------------
 media-gfx/gmic/metadata.xml      |   1 -
 3 files changed, 194 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 319ad713ab3..aca29246a6a 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
-DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2

diff --git a/media-gfx/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
deleted file mode 100644
index 09772f17dec..00000000000
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli digikam gimp krita qt5 )
-	digikam? ( png zlib fftw X )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	digikam? (
-		media-gfx/digikam
-		${QT_DEPEND}
-	)
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	digikam? ( dev-qt/linguist-tools )
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use digikam || use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use digikam; then
-		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
-		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
-	fi
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use digikam; then
-		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
-		exeinto "${DIGIKAMDIR}"
-		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
-	fi
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}

diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index 39d49193716..2e93f14ae22 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Build CLI interface</flag>
-		<flag name="digikam">Build <pkg>media-gfx/digikam</pkg> plugin</flag>
 		<flag name="krita">Build <pkg>media-gfx/krita</pkg> plugin</flag>
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-04-16 18:25 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-04-16 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     1436fe0912b4513792c2214296312016acb4b758
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 16:04:57 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 18:24:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1436fe09

media-gfx/gmic: bump to 2.9.7

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.9.7.ebuild | 174 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index aca29246a6a..3241a2c8cda 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2
+DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730

diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
new file mode 100644
index 00000000000..20cad100504
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.7.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-04-27 11:05 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-04-27 11:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d36b1f3cdaac290f5a497fc9004c479c0eb8ef0c
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 10:54:01 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 11:04:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36b1f3c

media-gfx/gmic: drop 2.9.6

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 -
 media-gfx/gmic/gmic-2.9.6.ebuild | 174 ---------------------------------------
 2 files changed, 175 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 3241a2c8cda..dd9826f2c11 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
-DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2
 DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730

diff --git a/media-gfx/gmic/gmic-2.9.6.ebuild b/media-gfx/gmic/gmic-2.9.6.ebuild
deleted file mode 100644
index 20cad100504..00000000000
--- a/media-gfx/gmic/gmic-2.9.6.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-05-25 15:04 Agostino Sarubbo
  0 siblings, 0 replies; 91+ messages in thread
From: Agostino Sarubbo @ 2021-05-25 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     3315a8641067062dfbb58fac14388416aba17eae
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 15:04:34 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 25 15:04:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3315a864

media-gfx/gmic: x86 stable wrt bug #791940

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
index 20cad100504..d10f49713a4 100644
--- a/media-gfx/gmic/gmic-2.9.7.ebuild
+++ b/media-gfx/gmic/gmic-2.9.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-05-26  6:49 Agostino Sarubbo
  0 siblings, 0 replies; 91+ messages in thread
From: Agostino Sarubbo @ 2021-05-26  6:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b222061b586e9dc4f13201c32b5a8e260fc72640
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 06:48:12 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 26 06:48:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b222061b

media-gfx/gmic: amd64 stable wrt bug #791940

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
index d10f49713a4..cd2efec6e1b 100644
--- a/media-gfx/gmic/gmic-2.9.7.ebuild
+++ b/media-gfx/gmic/gmic-2.9.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-06-04  8:14 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2021-06-04  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     5598e000045338f524ef437c5c9ef76b6b3fb3b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  4 08:13:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  4 08:13:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5598e000

media-gfx/gmic: Stabilize 2.9.7 arm64, #791940

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
index cd2efec6e1b..5e85c6f688a 100644
--- a/media-gfx/gmic/gmic-2.9.7.ebuild
+++ b/media-gfx/gmic/gmic-2.9.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-06-04 11:51 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-06-04 11:51 UTC (permalink / raw
  To: gentoo-commits

commit:     c07b33cb58186203816249114ee37f5654849f8c
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  4 11:50:56 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun  4 11:51:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c07b33cb

media-gfx/gmic: drop 2.9.5

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 -
 media-gfx/gmic/gmic-2.9.5.ebuild | 174 ---------------------------------------
 2 files changed, 175 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index dd9826f2c11..446125cf91c 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1 @@
-DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730

diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
deleted file mode 100644
index 5e85c6f688a..00000000000
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-07-16 13:59 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-07-16 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     40807273abe9d0f89ba4bb2e86a0c5db0349276b
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 13:19:21 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 13:59:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40807273

media-gfx/gmic: add 2.9.8

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.9.8.ebuild | 174 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 446125cf91c..50dff22c6f7 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1 +1,2 @@
 DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
+DIST gmic_2.9.8.tar.gz 7311372 BLAKE2B 6438198cbaefe1de712ccd85179887b858ec1f7e039a080f0070e5ed454fd52b9414ecbd7c93dce740261df501f086634ab0bd291b70bb18778979faf2331486 SHA512 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3

diff --git a/media-gfx/gmic/gmic-2.9.8.ebuild b/media-gfx/gmic/gmic-2.9.8.ebuild
new file mode 100644
index 00000000000..20cad100504
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.8.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-08-21  4:49 Agostino Sarubbo
  0 siblings, 0 replies; 91+ messages in thread
From: Agostino Sarubbo @ 2021-08-21  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a117fd1bd2c653cb8e25973cb8c72e9f338ae607
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 21 04:49:13 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 04:49:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a117fd1b

media-gfx/gmic: amd64 stable wrt bug #809233

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.8.ebuild b/media-gfx/gmic/gmic-2.9.8.ebuild
index 20cad100504..c225ea989d7 100644
--- a/media-gfx/gmic/gmic-2.9.8.ebuild
+++ b/media-gfx/gmic/gmic-2.9.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-08-23  0:39 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2021-08-23  0:39 UTC (permalink / raw
  To: gentoo-commits

commit:     f77f0ef95af21b40a14cdad760ba403c2008cb23
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 23 00:37:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 23 00:39:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77f0ef9

media-gfx/gmic: Stabilize 2.9.8 arm64, #809233

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.8.ebuild b/media-gfx/gmic/gmic-2.9.8.ebuild
index c225ea989d7..d29f30e5e8b 100644
--- a/media-gfx/gmic/gmic-2.9.8.ebuild
+++ b/media-gfx/gmic/gmic-2.9.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-08-23 22:16 Agostino Sarubbo
  0 siblings, 0 replies; 91+ messages in thread
From: Agostino Sarubbo @ 2021-08-23 22:16 UTC (permalink / raw
  To: gentoo-commits

commit:     9fe5b31f9e007098a56d2635dc44b9c859456450
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 23 22:13:49 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Aug 23 22:13:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe5b31f

media-gfx/gmic: x86 stable wrt bug #809233

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.8.ebuild b/media-gfx/gmic/gmic-2.9.8.ebuild
index d29f30e5e8b..5e85c6f688a 100644
--- a/media-gfx/gmic/gmic-2.9.8.ebuild
+++ b/media-gfx/gmic/gmic-2.9.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-08-23 23:45 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-08-23 23:45 UTC (permalink / raw
  To: gentoo-commits

commit:     c721a6e16dc5691fbd9cc029593441360982111e
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 23 23:44:46 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Aug 23 23:44:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c721a6e1

media-gfx/gmic: drop 2.9.7

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 -
 media-gfx/gmic/gmic-2.9.7.ebuild | 174 ---------------------------------------
 2 files changed, 175 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 50dff22c6f7..430b2b2df6d 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1 @@
-DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
 DIST gmic_2.9.8.tar.gz 7311372 BLAKE2B 6438198cbaefe1de712ccd85179887b858ec1f7e039a080f0070e5ed454fd52b9414ecbd7c93dce740261df501f086634ab0bd291b70bb18778979faf2331486 SHA512 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3

diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
deleted file mode 100644
index 5e85c6f688a..00000000000
--- a/media-gfx/gmic/gmic-2.9.7.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-09-09 10:45 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-09-09 10:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f6a737ecacba2202fd0a08feec4501c0e4b15eb5
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  9 10:41:51 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep  9 10:45:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a737ec

media-gfx/gmic: add 2.9.9

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-2.9.9.ebuild | 174 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 430b2b2df6d..56fcb91b08c 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1 +1,2 @@
 DIST gmic_2.9.8.tar.gz 7311372 BLAKE2B 6438198cbaefe1de712ccd85179887b858ec1f7e039a080f0070e5ed454fd52b9414ecbd7c93dce740261df501f086634ab0bd291b70bb18778979faf2331486 SHA512 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3
+DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64

diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-2.9.9.ebuild
new file mode 100644
index 00000000000..b58559de375
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.9.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-11-19 18:10 Jakov Smolić
  0 siblings, 0 replies; 91+ messages in thread
From: Jakov Smolić @ 2021-11-19 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     92c5a1fc451cb12eafb08de735a6bec8f37242c2
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 18:10:34 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 18:10:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c5a1fc

media-gfx/gmic: Stabilize 2.9.9 x86, #824942

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-2.9.9.ebuild
index b58559de3751..d2d0f1535058 100644
--- a/media-gfx/gmic/gmic-2.9.9.ebuild
+++ b/media-gfx/gmic/gmic-2.9.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-11-20  7:26 Agostino Sarubbo
  0 siblings, 0 replies; 91+ messages in thread
From: Agostino Sarubbo @ 2021-11-20  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     93afd35b964f3246afcfe75df9fea5eaf60ee735
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 07:26:21 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 07:26:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93afd35b

media-gfx/gmic: amd64 stable wrt bug #824942

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-2.9.9.ebuild
index d2d0f1535058..f242e08c4cbe 100644
--- a/media-gfx/gmic/gmic-2.9.9.ebuild
+++ b/media-gfx/gmic/gmic-2.9.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-11-25 20:07 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2021-11-25 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     817192f84d8c93b9afe48c86fb4cb5b8d5991917
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 20:07:20 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 20:07:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=817192f8

media-gfx/gmic: Stabilize 2.9.9 arm64, #824942

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-2.9.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-2.9.9.ebuild
index f242e08c4cbe..5591771336db 100644
--- a/media-gfx/gmic/gmic-2.9.9.ebuild
+++ b/media-gfx/gmic/gmic-2.9.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-11-25 21:01 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2021-11-25 21:01 UTC (permalink / raw
  To: gentoo-commits

commit:     03855aa04e6ca14dcbe6f5ff372ab3bef01c6c1b
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 20:55:58 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 21:01:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03855aa0

media-gfx/gmic: drop 2.9.8

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 -
 media-gfx/gmic/gmic-2.9.8.ebuild | 174 ---------------------------------------
 2 files changed, 175 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 56fcb91b08c9..88491591cb89 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1 @@
-DIST gmic_2.9.8.tar.gz 7311372 BLAKE2B 6438198cbaefe1de712ccd85179887b858ec1f7e039a080f0070e5ed454fd52b9414ecbd7c93dce740261df501f086634ab0bd291b70bb18778979faf2331486 SHA512 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3
 DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64

diff --git a/media-gfx/gmic/gmic-2.9.8.ebuild b/media-gfx/gmic/gmic-2.9.8.ebuild
deleted file mode 100644
index 5e85c6f688ac..000000000000
--- a/media-gfx/gmic/gmic-2.9.8.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2021-12-29 13:46 Yixun Lan
  0 siblings, 0 replies; 91+ messages in thread
From: Yixun Lan @ 2021-12-29 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e9f620fc8a1e7980639d008bb36669068801ee85
Author:     Alex Fan <alex.fan.q <AT> gmail <DOT> com>
AuthorDate: Tue Dec 28 10:25:37 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 13:42:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9f620fc

media-gfx/gmic: keyword 3.0.0 for ~riscv

Closes: https://github.com/gentoo/gentoo/pull/23559
Signed-off-by: Alex Fan <alex.fan.q <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
index 8f9fa857f2b0..d9f626bbeb07 100644
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ b/media-gfx/gmic/gmic-3.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-01-02 12:58 Georgy Yakovlev
  0 siblings, 0 replies; 91+ messages in thread
From: Georgy Yakovlev @ 2022-01-02 12:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6730a1e2e52536bec0bb229b46e5b0e8e4ba3f8c
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  2 12:41:04 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Jan  2 12:55:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6730a1e2

media-gfx/gmic: keyword 3.0.0 for ~ppc64

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
index d9f626bbeb07..f8eead423554 100644
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ b/media-gfx/gmic/gmic-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-01-13 11:57 Jakov Smolić
  0 siblings, 0 replies; 91+ messages in thread
From: Jakov Smolić @ 2022-01-13 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     772fe6447c4ba5296e7682d736fb93da2436c4a1
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 11:57:46 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 11:57:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772fe644

media-gfx/gmic: Stabilize 3.0.0 x86, #831124

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
index f8eead423554..537107693554 100644
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ b/media-gfx/gmic/gmic-3.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-01-13 11:58 Jakov Smolić
  0 siblings, 0 replies; 91+ messages in thread
From: Jakov Smolić @ 2022-01-13 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     8b4d0bb55bb120ec44a08507c35621ae032489bd
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 11:57:53 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 11:57:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4d0bb5

media-gfx/gmic: Stabilize 3.0.0 amd64, #831124

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
index 537107693554..9e5f62bdaaa9 100644
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ b/media-gfx/gmic/gmic-3.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-01-14 14:40 Arthur Zamarin
  0 siblings, 0 replies; 91+ messages in thread
From: Arthur Zamarin @ 2022-01-14 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     0dfe7d7f32561973222af568ce6c16dc8b9c72bc
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 14:40:31 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 14:40:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dfe7d7f

media-gfx/gmic: Stabilize 3.0.0 arm64, #831124

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
index 9e5f62bdaaa9..2ef54b68ee93 100644
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ b/media-gfx/gmic/gmic-3.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-01-14 15:35 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-01-14 15:35 UTC (permalink / raw
  To: gentoo-commits

commit:     f77d2fb985376f03a272b2628ac5e140e76cbfe7
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 15:32:47 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 15:35:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77d2fb9

media-gfx/gmic: add 3.0.1, drop 2.9.9

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                            |  2 +-
 .../gmic/{gmic-2.9.9.ebuild => gmic-3.0.1.ebuild}  | 39 +++++++++++-----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index e4cdf89bbb61..d0e13ce81e85 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,2 @@
-DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64
 DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c
+DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a

diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-3.0.1.ebuild
similarity index 83%
rename from media-gfx/gmic/gmic-2.9.9.ebuild
rename to media-gfx/gmic/gmic-3.0.1.ebuild
index 5591771336db..b2a210733dc4 100644
--- a/media-gfx/gmic/gmic-2.9.9.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-CMAKE_BUILD_TYPE=Release
-
 inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
@@ -12,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
@@ -20,10 +18,9 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib"
 REQUIRED_USE="
 	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
 	qt5? ( png zlib fftw X )
 "
 
@@ -43,7 +40,6 @@ COMMON_DEPEND="
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )
 	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
 	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
 	openexr? (
 		media-libs/ilmbase:0=
@@ -62,13 +58,12 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
 	qt5? ( dev-qt/linguist-tools )
 "
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
 )
 
 pkg_pretend() {
@@ -83,7 +78,7 @@ src_prepare() {
 	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
-	if use gimp || use krita || use qt5; then
+	if use gimp || use qt5; then
 		# respect user flags
 		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
 			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
@@ -98,7 +93,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_LIB_STATIC=no
 		-DBUILD_CLI=$(usex cli)
 		-DBUILD_MAN=$(usex cli)
 		-DBUILD_BASH_COMPLETION=$(usex cli)
@@ -134,11 +129,6 @@ src_configure() {
 		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
 	fi
 
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
 		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
@@ -151,13 +141,12 @@ src_compile() {
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
 	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
 	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
 	cmake_src_install
-	dodoc README
+
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 
 	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
@@ -169,6 +158,18 @@ src_install() {
 		exeinto "${PLUGINDIR}"
 		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
 	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
 	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
 }
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -le "3.0.0"; then
+				einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
+				einfo "Please use the built-in G'MIC plugin provided with Krita 5, or use an older version."
+				break
+			fi
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-02-28  5:21 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2022-02-28  5:21 UTC (permalink / raw
  To: gentoo-commits

commit:     823797fb582b533ad657643a1888957baeec881e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 05:19:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 05:19:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823797fb

media-gfx/gmic: Stabilize 3.0.1-r1 amd64, #833158

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index e1eadca4d27c..d4011adba6fc 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-02-28 23:58 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2022-02-28 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     be95aed41fa6c2cc0b69a06a52066cbdbc2abe16
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 23:56:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 23:56:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be95aed4

media-gfx/gmic: Stabilize 3.0.1-r1 x86, #833158

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index d4011adba6fc..89d9778cb66c 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-03-01  0:02 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2022-03-01  0:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e43b315cac9b93c4f97b565272550be194ded4f5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 00:01:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 00:01:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e43b315c

media-gfx/gmic: Stabilize 3.0.1-r1 arm64, #833158

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index 89d9778cb66c..2c806f819a10 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-03-26 22:31 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-03-26 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     14f9cda09f23327a05e54266e1789f1993c4414a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 22:10:24 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 22:31:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f9cda0

media-gfx/gmic: drop 3.0.0, 3.0.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest             |   1 -
 media-gfx/gmic/gmic-3.0.0.ebuild    | 172 -----------------------------------
 media-gfx/gmic/gmic-3.0.1-r1.ebuild |   2 +-
 media-gfx/gmic/gmic-3.0.1.ebuild    | 175 ------------------------------------
 media-gfx/gmic/metadata.xml         |   1 -
 5 files changed, 1 insertion(+), 350 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index d0e13ce81e85..12e056f95844 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1 @@
-DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c
 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a

diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
deleted file mode 100644
index 2ef54b68ee93..000000000000
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=no
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index 2c806f819a10..997f0d677392 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -168,7 +168,7 @@ pkg_postinst() {
 		for v in ${REPLACING_VERSIONS}; do
 			if ver_test "${v}" -le "3.0.0"; then
 				einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
-				einfo "Please use the built-in G'MIC plugin provided with Krita 5, or use an older version."
+				einfo "Please use the built-in G'MIC plugin provided with Krita 5 instead."
 				break
 			fi
 		done

diff --git a/media-gfx/gmic/gmic-3.0.1.ebuild b/media-gfx/gmic/gmic-3.0.1.ebuild
deleted file mode 100644
index b2a210733dc4..000000000000
--- a/media-gfx/gmic/gmic-3.0.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=no
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -le "3.0.0"; then
-				einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
-				einfo "Please use the built-in G'MIC plugin provided with Krita 5, or use an older version."
-				break
-			fi
-		done
-	fi
-}

diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index efde0ceebe6f..d725eae2d066 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Build CLI interface</flag>
-		<flag name="krita">Build <pkg>media-gfx/krita</pkg> plugin</flag>
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-05-14 21:30 David Seifert
  0 siblings, 0 replies; 91+ messages in thread
From: David Seifert @ 2022-05-14 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     09bbbebeb57fd901c169b92f7333b931dd74b303
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:30:09 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:30:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bbbebe

media-gfx/gmic: [QA] tc-has-openmp → tc-check-openmp

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.1-r1.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index 997f0d677392..a9cf822de4db 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -68,11 +68,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-07-13 18:23 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-07-13 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     8a0fc3f981bbc5bf0d03d472ea3b6145ad3746fa
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 18:22:51 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 18:22:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0fc3f9

media-gfx/gmic: replace deprecated virtual/jpeg dependency

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-3.1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.1.5.ebuild b/media-gfx/gmic/gmic-3.1.5.ebuild
index a4e2815a060b..2c4b842ada70 100644
--- a/media-gfx/gmic/gmic-3.1.5.ebuild
+++ b/media-gfx/gmic/gmic-3.1.5.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 		${QT_DEPEND}
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
 	openexr? (
 		dev-libs/imath:=


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-07-27  8:43 Andreas Sturmlechner
  0 siblings, 0 replies; 91+ messages in thread
From: Andreas Sturmlechner @ 2022-07-27  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2d86c758328a5685890c9c81c6121d5591909070
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 17:42:09 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 08:43:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d86c758

media-gfx/gmic: Move dev-qt/linguist-tools:5 to BDEPEND

Closes: https://bugs.gentoo.org/861047
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.1-r1.ebuild | 12 ++++++------
 media-gfx/gmic/gmic-3.1.5.ebuild    | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index a9cf822de4db..7ab9e4589957 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -31,7 +31,7 @@ QT_DEPEND="
 	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
 	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
 "
-COMMON_DEPEND="
+DEPEND="
 	curl? ( net-misc/curl )
 	fftw? ( sci-libs/fftw:3.0=[threads] )
 	gimp? (
@@ -53,14 +53,14 @@ COMMON_DEPEND="
 		x11-libs/libXext
 	)
 	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
+BDEPEND="
+	virtual/pkgconfig
+	gimp? ( dev-qt/linguist-tools:5 )
+	qt5? ( dev-qt/linguist-tools:5 )
 "
-BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch

diff --git a/media-gfx/gmic/gmic-3.1.5.ebuild b/media-gfx/gmic/gmic-3.1.5.ebuild
index 2c4b842ada70..cd77bcb4433b 100644
--- a/media-gfx/gmic/gmic-3.1.5.ebuild
+++ b/media-gfx/gmic/gmic-3.1.5.ebuild
@@ -34,7 +34,7 @@ QT_DEPEND="
 	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
 	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
 "
-COMMON_DEPEND="
+DEPEND="
 	sys-libs/zlib:0=
 	curl? ( net-misc/curl )
 	fftw? ( sci-libs/fftw:3.0=[threads] )
@@ -56,14 +56,14 @@ COMMON_DEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 	)"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
+BDEPEND="
+	virtual/pkgconfig
+	gimp? ( dev-qt/linguist-tools:5 )
+	qt5? ( dev-qt/linguist-tools:5 )
 "
-BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.5-makefile_automagic.patch


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-07-27 23:54 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-07-27 23:54 UTC (permalink / raw
  To: gentoo-commits

commit:     4f55b5b32622ed40a43274e1d4df0d2fa5d2643a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 23:53:20 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 23:53:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f55b5b3

media-gfx/gmic: drop := from dev-qt dependencies

No private-header use as far as I can see.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-3.1.5.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/gmic/gmic-3.1.5.ebuild b/media-gfx/gmic/gmic-3.1.5.ebuild
index cd77bcb4433b..4555221810cb 100644
--- a/media-gfx/gmic/gmic-3.1.5.ebuild
+++ b/media-gfx/gmic/gmic-3.1.5.ebuild
@@ -29,10 +29,10 @@ RESTRICT="test"
 
 MIN_QT_VER="5.2.0"
 QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+	>=dev-qt/qtcore-${MIN_QT_VER}:5
+	>=dev-qt/qtgui-${MIN_QT_VER}:5
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
 "
 DEPEND="
 	sys-libs/zlib:0=


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-09-01 23:22 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-09-01 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1c4645a8eda7487292d4bb0efacf2c70f0656144
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 23:19:56 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 23:19:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4645a8

media-gfx/gmic: no longer inherit bash-completion-r1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
index 1f33517bc284..2cd367947f79 100644
--- a/media-gfx/gmic/gmic-3.1.6.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit bash-completion-r1 toolchain-funcs
+inherit toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-09-01 23:22 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-09-01 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     2dc420b0138f074b8ca2cb5040ca08cd8d4a620e
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 23:21:40 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 23:21:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc420b0

media-gfx/gmic: update HOMEPAGE

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.1-r1.ebuild | 2 +-
 media-gfx/gmic/gmic-3.1.6.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index 7ab9e4589957..1136691482d8 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"

diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
index 2cd367947f79..936aba83276c 100644
--- a/media-gfx/gmic/gmic-3.1.6.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-09-01 23:22 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-09-01 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     04c6aae3e92541f7603cf08916383d186f2af0b0
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 23:22:17 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 23:22:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c6aae3

media-gfx/gmic: update upstream metadata

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index d725eae2d066..28dae0feb98a 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">dtschump/gmic</remote-id>
+		<remote-id type="github">GreycLab/gmic</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-09-20  0:43 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-09-20  0:43 UTC (permalink / raw
  To: gentoo-commits

commit:     aeb9bceb89d94c59e3b0ded5375442d5f99d4130
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 23:53:28 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 00:42:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb9bceb

media-gfx/gmic: phase out virtual/jpeg

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-3.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index 1136691482d8..013dbdbdad9b 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 		${QT_DEPEND}
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
 	openexr? (
 		dev-libs/imath:=


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-09-20  0:43 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2022-09-20  0:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c9eaacb7f947b4fc08bc6631223b9398760ef7c4
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 23:51:49 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 00:42:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9eaacb7

media-gfx/gmic: use different OpenMP library when using clang

Closes: https://bugs.gentoo.org/870823
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-3.1.6.ebuild | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
index 936aba83276c..da836f3b546c 100644
--- a/media-gfx/gmic/gmic-3.1.6.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -80,24 +80,30 @@ pkg_setup() {
 }
 
 gmic_emake() {
+	local mymakeargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		STRIP="/bin/true"
+		LIB="$(get_libdir)"
+		OPT_CFLAGS="${CXXFLAGS}"
+		OPT_LIBS="${LDFLAGS}"
+		GMIC_USE_CURL=$(usex curl)
+		GMIC_USE_EXR=$(usex openexr)
+		GMIC_USE_FFTW=$(usex fftw)
+		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		GMIC_USE_JPEG=$(usex jpeg)
+		GMIC_USE_OPENCV=$(usex opencv)
+		GMIC_USE_OPENMP=$(usex openmp)
+		GMIC_USE_PNG=$(usex png)
+		GMIC_USE_TIFF=$(usex tiff)
+		GMIC_USE_X11=$(usex X)
+		QMAKE="qmake5"
+	)
+
+	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
+
 	emake -j1 -C src \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		STRIP="/bin/true" \
-		LIB="$(get_libdir)" \
-		OPT_CFLAGS="${CXXFLAGS}" \
-		OPT_LIBS="${LDFLAGS}" \
-		GMIC_USE_CURL=$(usex curl) \
-		GMIC_USE_EXR=$(usex openexr) \
-		GMIC_USE_FFTW=$(usex fftw) \
-		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) \
-		GMIC_USE_JPEG=$(usex jpeg) \
-		GMIC_USE_OPENCV=$(usex opencv) \
-		GMIC_USE_OPENMP=$(usex openmp) \
-		GMIC_USE_PNG=$(usex png) \
-		GMIC_USE_TIFF=$(usex tiff) \
-		GMIC_USE_X11=$(usex X) \
-		QMAKE="qmake5" \
+		"${mymakeargs[@]}" \
 		$@
 }
 


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-12-14  5:19 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2022-12-14  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     6bc8d7f45819306d3936fe1311012711bd74095c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 05:18:56 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 05:18:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bc8d7f4

media-gfx/gmic: Stabilize 3.1.6 x86, #885819

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
index 85bb406d8cc0..d180943f6127 100644
--- a/media-gfx/gmic/gmic-3.1.6.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-12-14  8:50 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2022-12-14  8:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f117b4b5e79ef275a989a7ef124d62eb5880ef88
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 08:50:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 08:50:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f117b4b5

media-gfx/gmic: Stabilize 3.1.6 amd64, #885819

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
index d180943f6127..714a20683732 100644
--- a/media-gfx/gmic/gmic-3.1.6.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2022-12-16 20:57 Arthur Zamarin
  0 siblings, 0 replies; 91+ messages in thread
From: Arthur Zamarin @ 2022-12-16 20:57 UTC (permalink / raw
  To: gentoo-commits

commit:     cf868c86888056ca7b606e07a6f2f141b14a3452
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 20:57:34 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 20:57:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf868c86

media-gfx/gmic: Stabilize 3.1.6-r1 arm64, #885819

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.1.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.1.6-r1.ebuild b/media-gfx/gmic/gmic-3.1.6-r1.ebuild
index 22193460e30e..900c5180f8da 100644
--- a/media-gfx/gmic/gmic-3.1.6-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-02-28 10:42 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2023-02-28 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     c017fa0361f650cb3ffe21681b9d88110ab4ed90
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 09:50:51 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 10:42:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c017fa03

media-gfx/gmic: add 3.2.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-3.2.1.ebuild | 138 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index ccbaa655c45e..f5db8513e425 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
+DIST gmic_3.2.1.tar.gz 11236401 BLAKE2B 8a68cee641892298e93373f9ad1a1ea4dd9995d813db7050a8a1c5f6658b2b08f9f9c4064dbef2a87e5350dc62c0bfa10d226a53ebff1962c3ad3a75ad318fba SHA512 c03a06acdf6669291602df4938a14de113d48ffa598b3c4af7975bd16aea37d426878ff0f593f22992da135a7b6e27fbb39dbaca4f89726ec367552f14be433b

diff --git a/media-gfx/gmic/gmic-3.2.1.ebuild b/media-gfx/gmic/gmic-3.2.1.ebuild
new file mode 100644
index 000000000000..e37b2cb59f90
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.2.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
+SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
+
+REQUIRED_USE="
+	gimp? ( png fftw X )
+	qt5? ( png fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5
+	>=dev-qt/qtgui-${MIN_QT_VER}:5
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
+"
+DEPEND="
+	sys-libs/zlib:0=
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
+RDEPEND="${DEPEND}
+	ffmpeg? ( media-video/ffmpeg:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gimp? (
+		dev-qt/linguist-tools:5
+		media-gfx/gimp:0/2
+	)
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
+	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
+	"${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+gmic_emake() {
+	local mymakeargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		STRIP="/bin/true"
+		LIB="$(get_libdir)"
+		OPT_CFLAGS="${CXXFLAGS}"
+		OPT_LIBS="${LDFLAGS}"
+		GMIC_USE_CURL=$(usex curl)
+		GMIC_USE_EXR=$(usex openexr)
+		GMIC_USE_FFTW=$(usex fftw)
+		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		GMIC_USE_JPEG=$(usex jpeg)
+		GMIC_USE_OPENCV=$(usex opencv)
+		GMIC_USE_OPENMP=$(usex openmp)
+		GMIC_USE_PNG=$(usex png)
+		GMIC_USE_TIFF=$(usex tiff)
+		GMIC_USE_X11=$(usex X)
+		QMAKE="qmake5"
+	)
+
+	# Possibly unnecessary since 3.2.0, just in case though.
+	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
+
+	emake -j1 -C src \
+		"${mymakeargs[@]}" \
+		$@
+}
+
+src_compile() {
+	gmic_emake lib libc
+	use cli && gmic_emake cli_shared
+	use gimp && gmic_emake gimp_shared
+	use qt5 && gmic_emake gmic_qt_shared
+}
+
+src_install() {
+	# See below for why this has to name a directory even if USE=-gimp
+	local gimp_plugindir="/deleteme"
+	if use gimp; then
+		if type gimptool &>/dev/null; then
+			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif type gimptool-2.0 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		elif type gimptool-2.99 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+		else
+			die "Cannot find GIMP plugin directory"
+		fi
+	fi
+
+	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
+
+	# Upstream build scripts create PLUGINDIR and write some files to it
+	# regardless of whether the GIMP plug-in has been built or not, or even
+	# when they haven't been able to execute gimptool to get the base path.
+	use gimp || rm -rf "${ED}/${gimp_plugindir}"
+
+	# These are already gzipped in the source tarballs
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-03-01 23:12 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2023-03-01 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     6b7a787c7f0a0d0dc0cb1605812f42447991be34
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 22:21:39 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 23:11:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7a787c

media-gfx/gmic: only build one target at a time

May or may not help with Bug #887681.

Closes: https://bugs.gentoo.org/887681
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/gmic-3.2.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.2.1.ebuild b/media-gfx/gmic/gmic-3.2.1.ebuild
index e37b2cb59f90..3c824f3eee11 100644
--- a/media-gfx/gmic/gmic-3.2.1.ebuild
+++ b/media-gfx/gmic/gmic-3.2.1.ebuild
@@ -105,7 +105,8 @@ gmic_emake() {
 }
 
 src_compile() {
-	gmic_emake lib libc
+	gmic_emake lib
+	gmic_emake libc
 	use cli && gmic_emake cli_shared
 	use gimp && gmic_emake gimp_shared
 	use qt5 && gmic_emake gmic_qt_shared


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-03-22 23:43 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2023-03-22 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     fc3986b9050bf9adadeb03be48f62a32a6502681
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 23:30:11 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 23:43:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3986b9

media-gfx/gmic: add 3.2.2, drop 3.2.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                                 | 2 +-
 media-gfx/gmic/{gmic-3.2.1.ebuild => gmic-3.2.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index f5db8513e425..01aac4b89f1e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,3 @@
 DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
-DIST gmic_3.2.1.tar.gz 11236401 BLAKE2B 8a68cee641892298e93373f9ad1a1ea4dd9995d813db7050a8a1c5f6658b2b08f9f9c4064dbef2a87e5350dc62c0bfa10d226a53ebff1962c3ad3a75ad318fba SHA512 c03a06acdf6669291602df4938a14de113d48ffa598b3c4af7975bd16aea37d426878ff0f593f22992da135a7b6e27fbb39dbaca4f89726ec367552f14be433b
+DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e

diff --git a/media-gfx/gmic/gmic-3.2.1.ebuild b/media-gfx/gmic/gmic-3.2.2.ebuild
similarity index 100%
rename from media-gfx/gmic/gmic-3.2.1.ebuild
rename to media-gfx/gmic/gmic-3.2.2.ebuild


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-03-30  9:56 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2023-03-30  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     c565eb005c90fa88cda4394a9de735511554e2e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 09:56:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 09:56:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c565eb00

media-gfx/gmic: Stabilize 3.2.0 amd64, #903567

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.2.0.ebuild b/media-gfx/gmic/gmic-3.2.0.ebuild
index e37b2cb59f90..b7bf7807bdf2 100644
--- a/media-gfx/gmic/gmic-3.2.0.ebuild
+++ b/media-gfx/gmic/gmic-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
 
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-03-30  9:58 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2023-03-30  9:58 UTC (permalink / raw
  To: gentoo-commits

commit:     1112944f44191c6979d24908fcae553e5d3e7f9f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 09:58:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 09:58:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1112944f

media-gfx/gmic: Stabilize 3.2.0 x86, #903567

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.2.0.ebuild b/media-gfx/gmic/gmic-3.2.0.ebuild
index b7bf7807bdf2..285d496ae180 100644
--- a/media-gfx/gmic/gmic-3.2.0.ebuild
+++ b/media-gfx/gmic/gmic-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
 
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-04-01 19:52 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2023-04-01 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     bd465b4ba80daab24bfa9d5721c4091273749a82
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 19:51:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 19:52:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd465b4b

media-gfx/gmic: Stabilize 3.2.0 arm64, #903567

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.2.0.ebuild b/media-gfx/gmic/gmic-3.2.0.ebuild
index 285d496ae180..d7382d8cbecc 100644
--- a/media-gfx/gmic/gmic-3.2.0.ebuild
+++ b/media-gfx/gmic/gmic-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
 
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-07-10 23:04 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2023-07-10 23:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8ab198dcc010e88364fd77df3a5464b36a7608bf
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 22:42:40 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 23:04:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab198dc

media-gfx/gmic: add 3.2.6, drop 3.2.2

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                                 | 2 +-
 media-gfx/gmic/{gmic-3.2.2.ebuild => gmic-3.2.6.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 2e7c54c78759..e889e861285a 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,3 @@
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
-DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e
 DIST gmic_3.2.5.tar.gz 11352319 BLAKE2B 812e28119bcbe485a7551c7afc89d7efb2a46ba3d9cc31597fddcd4c4ba48fa040827eccd92c1abbef3035c057d432f6b7b783ff9067da8be2806a05902bdf35 SHA512 e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27
+DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395

diff --git a/media-gfx/gmic/gmic-3.2.2.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
similarity index 97%
rename from media-gfx/gmic/gmic-3.2.2.ebuild
rename to media-gfx/gmic/gmic-3.2.6.ebuild
index 3c824f3eee11..e49f4fe6fe0d 100644
--- a/media-gfx/gmic/gmic-3.2.2.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -63,8 +63,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
 	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
-	"${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch
-	"${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
+	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-08-21 15:49 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2023-08-21 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a4db22a0f72b133a8f85aafdbd025a08c8884daa
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 15:12:23 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 15:49:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4db22a0

media-gfx/gmic: drop 3.2.5

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 -
 media-gfx/gmic/gmic-3.2.5.ebuild | 139 ---------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index e889e861285a..a17dec1164a6 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
-DIST gmic_3.2.5.tar.gz 11352319 BLAKE2B 812e28119bcbe485a7551c7afc89d7efb2a46ba3d9cc31597fddcd4c4ba48fa040827eccd92c1abbef3035c057d432f6b7b783ff9067da8be2806a05902bdf35 SHA512 e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27
 DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395

diff --git a/media-gfx/gmic/gmic-3.2.5.ebuild b/media-gfx/gmic/gmic-3.2.5.ebuild
deleted file mode 100644
index e49f4fe6fe0d..000000000000
--- a/media-gfx/gmic/gmic-3.2.5.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
-SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
-
-REQUIRED_USE="
-	gimp? ( png fftw X )
-	qt5? ( png fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5
-	>=dev-qt/qtgui-${MIN_QT_VER}:5
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
-"
-DEPEND="
-	sys-libs/zlib:0=
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
-	openexr? (
-		dev-libs/imath:=
-		media-libs/openexr:=
-	)
-	png? ( media-libs/libpng:= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gimp? (
-		dev-qt/linguist-tools:5
-		media-gfx/gimp:0/2
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
-	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
-	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
-	"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-gmic_emake() {
-	local mymakeargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		STRIP="/bin/true"
-		LIB="$(get_libdir)"
-		OPT_CFLAGS="${CXXFLAGS}"
-		OPT_LIBS="${LDFLAGS}"
-		GMIC_USE_CURL=$(usex curl)
-		GMIC_USE_EXR=$(usex openexr)
-		GMIC_USE_FFTW=$(usex fftw)
-		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		GMIC_USE_JPEG=$(usex jpeg)
-		GMIC_USE_OPENCV=$(usex opencv)
-		GMIC_USE_OPENMP=$(usex openmp)
-		GMIC_USE_PNG=$(usex png)
-		GMIC_USE_TIFF=$(usex tiff)
-		GMIC_USE_X11=$(usex X)
-		QMAKE="qmake5"
-	)
-
-	# Possibly unnecessary since 3.2.0, just in case though.
-	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
-
-	emake -j1 -C src \
-		"${mymakeargs[@]}" \
-		$@
-}
-
-src_compile() {
-	gmic_emake lib
-	gmic_emake libc
-	use cli && gmic_emake cli_shared
-	use gimp && gmic_emake gimp_shared
-	use qt5 && gmic_emake gmic_qt_shared
-}
-
-src_install() {
-	# See below for why this has to name a directory even if USE=-gimp
-	local gimp_plugindir="/deleteme"
-	if use gimp; then
-		if type gimptool &>/dev/null; then
-			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif type gimptool-2.0 &>/dev/null; then
-			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		elif type gimptool-2.99 &>/dev/null; then
-			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
-		else
-			die "Cannot find GIMP plugin directory"
-		fi
-	fi
-
-	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
-
-	# Upstream build scripts create PLUGINDIR and write some files to it
-	# regardless of whether the GIMP plug-in has been built or not, or even
-	# when they haven't been able to execute gimptool to get the base path.
-	use gimp || rm -rf "${ED}/${gimp_plugindir}"
-
-	# These are already gzipped in the source tarballs
-	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
-}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-08-21 17:43 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2023-08-21 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     11b4cf1bf1f36e7c2002ef9e1c7cfaa17df3593a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 17:42:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 17:42:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b4cf1b

media-gfx/gmic: Stabilize 3.2.6 arm64, #912751

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
index 6987b6673d70..2b300e5482d0 100644
--- a/media-gfx/gmic/gmic-3.2.6.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
 
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-08-22 11:16 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2023-08-22 11:16 UTC (permalink / raw
  To: gentoo-commits

commit:     064ec93b98b768d9316193630837ec55b974081b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 11:16:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 11:16:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064ec93b

media-gfx/gmic: Stabilize 3.2.6 amd64, #912751

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
index 2b300e5482d0..5864e270a814 100644
--- a/media-gfx/gmic/gmic-3.2.6.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
 
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-08-22 12:00 Sam James
  0 siblings, 0 replies; 91+ messages in thread
From: Sam James @ 2023-08-22 12:00 UTC (permalink / raw
  To: gentoo-commits

commit:     5dd4158bf3884ccd6dae0e80e1eada55ab645b68
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 11:59:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 11:59:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd4158b

media-gfx/gmic: Stabilize 3.2.6 x86, #912751

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gmic/gmic-3.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
index 5864e270a814..ce792e435b08 100644
--- a/media-gfx/gmic/gmic-3.2.6.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
 
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-10-26  0:38 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2023-10-26  0:38 UTC (permalink / raw
  To: gentoo-commits

commit:     65924188c00e2e44592e29cecf1270bf0961a0a3
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 26 00:37:19 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 00:37:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65924188

media-gfx/gmic: add 3.3.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest          |   1 +
 media-gfx/gmic/gmic-3.3.1.ebuild | 140 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 05b82272c3e9..25fea17dcfce 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1 +1,2 @@
 DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395
+DIST gmic_3.3.1.tar.gz 18983077 BLAKE2B 1020168de6a80db4998d5f37a28f680a90cac6b0c7b91f3300105c4fdffc88df5517f4ff6439895f9bab91c27deea3436988b3e41c7a9e3b4d7dba6a69e8a552 SHA512 b31c3eac083e280203eb4651a22ed4d49d1b46e8a5a81400bb8cbb9bdd87cb1226f9017b7a1e52d493fbed38a580238c6242b033162213c32316d852ad0f90c5

diff --git a/media-gfx/gmic/gmic-3.3.1.ebuild b/media-gfx/gmic/gmic-3.3.1.ebuild
new file mode 100644
index 000000000000..6987b6673d70
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.3.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
+SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
+
+REQUIRED_USE="
+	gimp? ( png fftw X )
+	qt5? ( png fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5
+	>=dev-qt/qtgui-${MIN_QT_VER}:5
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
+"
+DEPEND="
+	sys-libs/zlib:0=
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
+RDEPEND="${DEPEND}
+	ffmpeg? ( media-video/ffmpeg:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gimp? (
+		dev-qt/linguist-tools:5
+		media-gfx/gimp:0/2
+	)
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
+	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
+	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
+	"${FILESDIR}"/${PN}-3.2.6-makefile_target_deps.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+gmic_emake() {
+	local mymakeargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		STRIP="/bin/true"
+		LIB="$(get_libdir)"
+		OPT_CFLAGS="${CXXFLAGS}"
+		OPT_LIBS="${LDFLAGS}"
+		GMIC_USE_CURL=$(usex curl)
+		GMIC_USE_EXR=$(usex openexr)
+		GMIC_USE_FFTW=$(usex fftw)
+		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		GMIC_USE_JPEG=$(usex jpeg)
+		GMIC_USE_OPENCV=$(usex opencv)
+		GMIC_USE_OPENMP=$(usex openmp)
+		GMIC_USE_PNG=$(usex png)
+		GMIC_USE_TIFF=$(usex tiff)
+		GMIC_USE_X11=$(usex X)
+		QMAKE="qmake5"
+	)
+
+	# Possibly unnecessary since 3.2.0, just in case though.
+	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
+
+	emake -j1 -C src \
+		"${mymakeargs[@]}" \
+		$@
+}
+
+src_compile() {
+	gmic_emake lib
+	gmic_emake libc
+	use cli && gmic_emake cli_shared
+	use gimp && gmic_emake gimp_shared
+	use qt5 && gmic_emake gmic_qt_shared
+}
+
+src_install() {
+	# See below for why this has to name a directory even if USE=-gimp
+	local gimp_plugindir="/deleteme"
+	if use gimp; then
+		if type gimptool &>/dev/null; then
+			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif type gimptool-2.0 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		elif type gimptool-2.99 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+		else
+			die "Cannot find GIMP plugin directory"
+		fi
+	fi
+
+	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
+
+	# Upstream build scripts create PLUGINDIR and write some files to it
+	# regardless of whether the GIMP plug-in has been built or not, or even
+	# when they haven't been able to execute gimptool to get the base path.
+	use gimp || rm -rf "${ED}/${gimp_plugindir}"
+
+	# These are already gzipped in the source tarballs
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
+}


^ permalink raw reply related	[flat|nested] 91+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
@ 2023-10-27 11:02 Marek Szuba
  0 siblings, 0 replies; 91+ messages in thread
From: Marek Szuba @ 2023-10-27 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     7da43a81122b891cc5be9052f49f1fa11c3161a9
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 11:01:48 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 11:02:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da43a81

media-gfx/gmic: drop myself as a maintainer. Package is now m-n.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/metadata.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index 28dae0feb98a..03ab5c7d51c0 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="cli">Build CLI interface</flag>
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>


^ permalink raw reply related	[flat|nested] 91+ messages in thread

end of thread, other threads:[~2023-10-27 11:02 UTC | newest]

Thread overview: 91+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-26  0:38 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2023-10-27 11:02 Marek Szuba
2023-08-22 12:00 Sam James
2023-08-22 11:16 Sam James
2023-08-21 17:43 Sam James
2023-08-21 15:49 Marek Szuba
2023-07-10 23:04 Marek Szuba
2023-04-01 19:52 Sam James
2023-03-30  9:58 Sam James
2023-03-30  9:56 Sam James
2023-03-22 23:43 Marek Szuba
2023-03-01 23:12 Marek Szuba
2023-02-28 10:42 Marek Szuba
2022-12-16 20:57 Arthur Zamarin
2022-12-14  8:50 Sam James
2022-12-14  5:19 Sam James
2022-09-20  0:43 Marek Szuba
2022-09-20  0:43 Marek Szuba
2022-09-01 23:22 Marek Szuba
2022-09-01 23:22 Marek Szuba
2022-09-01 23:22 Marek Szuba
2022-07-27 23:54 Marek Szuba
2022-07-27  8:43 Andreas Sturmlechner
2022-07-13 18:23 Marek Szuba
2022-05-14 21:30 David Seifert
2022-03-26 22:31 Marek Szuba
2022-03-01  0:02 Sam James
2022-02-28 23:58 Sam James
2022-02-28  5:21 Sam James
2022-01-14 15:35 Marek Szuba
2022-01-14 14:40 Arthur Zamarin
2022-01-13 11:58 Jakov Smolić
2022-01-13 11:57 Jakov Smolić
2022-01-02 12:58 Georgy Yakovlev
2021-12-29 13:46 Yixun Lan
2021-11-25 21:01 Marek Szuba
2021-11-25 20:07 Sam James
2021-11-20  7:26 Agostino Sarubbo
2021-11-19 18:10 Jakov Smolić
2021-09-09 10:45 Marek Szuba
2021-08-23 23:45 Marek Szuba
2021-08-23 22:16 Agostino Sarubbo
2021-08-23  0:39 Sam James
2021-08-21  4:49 Agostino Sarubbo
2021-07-16 13:59 Marek Szuba
2021-06-04 11:51 Marek Szuba
2021-06-04  8:14 Sam James
2021-05-26  6:49 Agostino Sarubbo
2021-05-25 15:04 Agostino Sarubbo
2021-04-27 11:05 Marek Szuba
2021-04-16 18:25 Marek Szuba
2021-04-16 18:25 Marek Szuba
2021-03-19 12:32 Marek Szuba
2021-03-14 22:03 Sam James
2021-03-12 15:28 Sam James
2021-03-12 15:25 Sam James
2021-02-15 12:26 Marek Szuba
2021-02-15  6:05 Sam James
2021-02-09  9:25 Marek Szuba
2021-02-08 13:48 Marek Szuba
2021-02-04  8:12 Agostino Sarubbo
2021-02-03  3:12 Sam James
2020-11-27 19:17 Marek Szuba
2020-11-18 15:14 Marek Szuba
2020-11-08 12:02 Sam James
2020-11-06 22:34 Sam James
2020-11-06 20:25 Marek Szuba
2020-11-06 17:18 Marek Szuba
2020-11-06 17:18 Marek Szuba
2020-10-31 11:11 David Seifert
2020-06-30  2:49 Tim Harder
2020-06-30  2:49 Tim Harder
2020-04-05 10:05 Tim Harder
2020-01-31  8:50 Tim Harder
2020-01-14 14:11 Tim Harder
2020-01-14 14:11 Tim Harder
2020-01-04  9:56 Andreas Sturmlechner
2020-01-03  6:34 Tim Harder
2020-01-02 22:36 Andreas Sturmlechner
2019-09-27  3:35 Tim Harder
2019-09-03  5:21 Tim Harder
2019-09-03  5:21 Tim Harder
2019-08-24  4:52 Tim Harder
2019-08-24  4:49 Tim Harder
2019-07-02 21:06 Tim Harder
2019-03-21 21:04 Tim Harder
2019-01-14  7:48 Tim Harder
2017-06-07  9:08 Tim Harder
2016-10-29 20:30 Tim Harder
2016-10-29  5:10 Tim Harder
2016-10-29  4:49 Tim Harder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox