From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1294835-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id A67751382C5
	for <garchives@archives.gentoo.org>; Fri, 18 Jun 2021 15:00:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 02D05E0837;
	Fri, 18 Jun 2021 15:00:25 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id DD006E0837
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jun 2021 15:00:24 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3688533BE2E
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jun 2021 15:00:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B780878E
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Jun 2021 15:00:21 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1624028384.225a7e5b76549b6220b0cb48505c18c7e75e30e1.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/graphicsmagick/graphicsmagick-1.3.36-r1.ebuild media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
X-VCS-Directories: media-gfx/graphicsmagick/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 225a7e5b76549b6220b0cb48505c18c7e75e30e1
X-VCS-Branch: master
Date: Fri, 18 Jun 2021 15:00:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 884fdcfc-238b-464e-a666-b3381a0cf552
X-Archives-Hash: e9e41b14da03a2d24889949d71c5b492

commit:     225a7e5b76549b6220b0cb48505c18c7e75e30e1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 14:59:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 14:59:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=225a7e5b

media-gfx/graphicsmagick: Revert "drop IUSE=cxx (always on)"

This reverts commit d6520192b060b9668685259eabf63e8be8b3ab1c.
Need to update consumers -- doing that later on in batch.

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

 .../{graphicsmagick-1.3.36-r1.ebuild => graphicsmagick-1.3.36.ebuild} | 4 ++--
 media-gfx/graphicsmagick/graphicsmagick-9999.ebuild                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
similarity index 96%
rename from media-gfx/graphicsmagick/graphicsmagick-1.3.36-r1.ebuild
rename to media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index 14c616c7050..22f9ab4a3d5 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-IUSE="bzip2 debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
+IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
 	openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
 	webp wmf X zlib"
 
@@ -83,7 +83,7 @@ src_configure() {
 		$(use_with dynamic-loading modules)
 		--with-quantum-depth=${depth}
 		--without-frozenpaths
-		--with-magick-plus-plus
+		$(use_with cxx magick-plus-plus)
 		$(use_with perl)
 		--with-perl-options=INSTALLDIRS=vendor
 		$(use_with bzip2 bzlib)

diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index c3b91000750..71a6c9e5bbc 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-IUSE="bzip2 debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
+IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
 	openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
 	webp wmf X zlib"
 
@@ -83,7 +83,7 @@ src_configure() {
 		$(use_with dynamic-loading modules)
 		--with-quantum-depth=${depth}
 		--without-frozenpaths
-		--with-magick-plus-plus
+		$(use_with cxx magick-plus-plus)
 		$(use_with perl)
 		--with-perl-options=INSTALLDIRS=vendor
 		$(use_with bzip2 bzlib)