From 3df077a143e1156fbcc19896c4f1fcbadebc58ed Mon Sep 17 00:00:00 2001
From: "Andreas K. Huettel" <dilfridge@gentoo.org>
Date: Wed, 17 Jun 2020 20:33:47 +0300
Subject: sci-visualization/gr: Hard-enable Qt5 and OpenGL, otherwise build
 fails

Closes: https://bugs.gentoo.org/726100
Closes: https://bugs.gentoo.org/727394
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Huettel <dilfridge@gentoo.org>
---
 sci-visualization/gr/gr-0.50.0-r1.ebuild | 67 ++++++++++++++++++++++++++++++
 sci-visualization/gr/gr-0.50.0.ebuild    | 70 --------------------------------
 2 files changed, 67 insertions(+), 70 deletions(-)
 create mode 100644 sci-visualization/gr/gr-0.50.0-r1.ebuild
 delete mode 100644 sci-visualization/gr/gr-0.50.0.ebuild

(limited to 'sci-visualization')

diff --git a/sci-visualization/gr/gr-0.50.0-r1.ebuild b/sci-visualization/gr/gr-0.50.0-r1.ebuild
new file mode 100644
index 000000000000..3a7bb7d68fbd
--- /dev/null
+++ b/sci-visualization/gr/gr-0.50.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Universal framework for cross-platform visualization applications"
+HOMEPAGE="http://gr-framework.org/"
+SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo ffmpeg postscript tiff truetype X"
+
+DEPEND="
+	dev-qt/qtgui:5
+	media-libs/fontconfig
+	media-libs/glfw
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/qhull
+	sys-libs/zlib
+	virtual/opengl
+	cairo? ( x11-libs/cairo )
+	ffmpeg? ( media-video/ffmpeg )
+	postscript? ( app-text/ghostscript-gpl )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
+	use postscript || mycmakeargs+=( -DGS_LIBRARY= )
+	use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= )
+	use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= )
+	use tiff || mycmakeargs+=( -DTIFF_LIBRARY= )
+
+	# todo: X11 automagic
+
+	mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr )
+	#
+	# I need to have a serious conversation with upstream.
+	# * The main consumer of this package is dev-lang/julia.
+	# * If I patch gr to install in standard locations, julia does
+	#   not find it anymore.
+	# * I can't patch julia, since the corresponding scripts are
+	#   downloaded at runtime from its package registry ...
+	#
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	find "${ED}" -name '*.a' -delete
+
+	echo "GRDIR=/usr/gr" > "${T}/99gr"
+	echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr"
+	doenvd "${T}/99gr"
+
+	dosym ../gr/bin/gksqt /usr/bin/gksqt
+}
diff --git a/sci-visualization/gr/gr-0.50.0.ebuild b/sci-visualization/gr/gr-0.50.0.ebuild
deleted file mode 100644
index 71d7cb7c9312..000000000000
--- a/sci-visualization/gr/gr-0.50.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Universal framework for cross-platform visualization applications"
-HOMEPAGE="http://gr-framework.org/"
-SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo ffmpeg opengl postscript qt5 tiff truetype X"
-
-DEPEND="
-	media-libs/fontconfig
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/qhull
-	sys-libs/zlib
-	cairo? ( x11-libs/cairo )
-	ffmpeg? ( media-video/ffmpeg )
-	opengl? (
-		media-libs/glfw
-		virtual/opengl
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	qt5? ( dev-qt/qtgui:5 )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_configure() {
-	use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
-	use opengl || mycmakeargs+=( -DGLFW_LIBRARY= )
-	use postscript || mycmakeargs+=( -DGS_LIBRARY= )
-	use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= )
-	use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= )
-	use tiff || mycmakeargs+=( -DTIFF_LIBRARY= )
-
-	# todo: Qt5, X11 automagic
-
-	mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr )
-	#
-	# I need to have a serious conversation with upstream.
-	# * The main consumer of this package is dev-lang/julia.
-	# * If I patch gr to install in standard locations, julia does
-	#   not find it anymore.
-	# * I can't patch julia, since the corresponding scripts are
-	#   downloaded at runtime from its package registry ...
-	#
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	find "${ED}" -name '*.a' -delete
-
-	echo "GRDIR=/usr/gr" > "${T}/99gr"
-	echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr"
-	doenvd "${T}/99gr"
-
-	dosym ../gr/bin/gksqt /usr/bin/gksqt
-}
-- 
cgit v1.2.3-65-gdbad