[gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
Date: Thu,  2 Jan 2020 22:36:52 +0000 (UTC)	[thread overview]
Message-ID: <1578004598.088d47495b72cf9d001f170887ad1e574b01da97.asturm@gentoo> (raw)

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}

next             reply	other threads:[~2020-01-02 22:36 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-02 22:36 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-27 11:02 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/ Marek Szuba
2023-10-26  0:38 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
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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:a96eb92467 dfblob:1edb9254ff dfblob:81708eba2f
dfblob:2a575ef1eb dfblob:81708eba2f dfblob:2a575ef1eb )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1578004598.088d47495b72cf9d001f170887ad1e574b01da97.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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