gentoo resync : 20.03.2022

5 files changed, 36 insertions, 101 deletions

diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
index 3af43c081c76..d9404db9a1fd 100644
--- a/sci-visualization/gr/Manifest
+++ b/sci-visualization/gr/Manifest
@@ -1,6 +1,4 @@
-AUX gr-0.50.0-qt-5.15.patch 652 BLAKE2B 0d945a678acf7e457ca848da770f442caa0e64dba984c073cf394903f08548e668935d4333f574429f93f415e2b74a225573f9aa0da594bd9358c79ca4fb94c2 SHA512 fc85ff4227c257cffe05925095d54451793f899013f9123bf5cc480ea2bb5e267a5067b862feebb000cee9a34781c283ad83fc8adee3b5ec9689d12c37699a5e
-DIST gr-0.50.0.tar.gz 8612608 BLAKE2B 70f4a3c6ce1dac8556646a1632667e6e464a5048f3c44fb689709e3e8218e8d7375db6ff8ce73e11dbeda559fb27c83b7f2b42f0ab518df9b464c8443748c30e SHA512 34ca077ae729e6eda0e5df7046811c77d717f3ef0e34203d6ab3a7f4b67b3aa058a68b9b2d7d78adc8b2f0830a0298778198a6499bd3d6e5697e4b7270cb648a
+AUX gr-0.53.0-musl.patch 797 BLAKE2B 4eb48a510b19a23cc4c82e0f81a1f9753c96f0554edecf4a4163b17be9505e8c8d0710f9c97c49dadb84fefe69cab27a3bfbb6cfe04b97b0d9a260b6e4042fe5 SHA512 5080806ed0598d404a380c3d8fe10207dd3fc1245b76992c341261f43b9727a82f7ebd85e582c606d6ccaf72eb04a57d21ccc0168e5c19b6b37cb2b265fa0018
 DIST gr-0.53.0.tar.gz 19267451 BLAKE2B bd243fac9df6222c4b9e3591adfcd1d37dd41628719bd7be7ab385402f0f97e21f3eb23df3ae5d2ed3e43df2b3d83ff66f4e0b478d717772b57dce5885a98721 SHA512 49eee39fd4abd62d6794a16eb023688a525f6906054610dccd85c1b7b0bed9b198d923834cbf661099f753ec40b383a911c295f781420aeead712c5712583c80
-EBUILD gr-0.50.0-r2.ebuild 1984 BLAKE2B b6f1531d964c7b12633307e7400a555f420d62eb1f3e57fd621eaaf3efb9f6794f2924503a90e17f92271be3615982d6aaa6070aaf3464e06a717e5e4f478ce0 SHA512 62916f101a242364486e08e1721ed7ee425384df24587dfed7c1e5953280dc4fe9a71dd0c6af0bac401cfdd2336700c341ce42885c457b3f90c189bd32bc1041
-EBUILD gr-0.53.0.ebuild 1937 BLAKE2B eb7718c932a535565fb7d45aadcc03a541aa81ba8fd26b97f578cca449336ab5fc816b87f5ec06bd0adf2595091581e51cf85c2d1d0c126b1860c951833bffa2 SHA512 fe855727e6fe3dc6a6d752f99d47a0e299bccc0dbeae7f7c6f13022178a5f33a42e71958b865942817d3a9148434786accf595e98ee5bfb9bd92ee678a850d93
+EBUILD gr-0.53.0.ebuild 1981 BLAKE2B 3f74cd9b478f1d937a488a8febc649067a74156b56eb62e2370a53e558e1f63ab1d4516e830c13bac76b4b1506b4984ae2a2d6ffcaf1435f4ce9593068899fc8 SHA512 98bd663e09702c336d7f8bb45ff67a9cb7a4e39af90c31f42bbe263e18980a8de47197c7330475a3fcfae9e936e47f231cf7c760bfd870953770fd3829d0bf92
 MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
diff --git a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch
deleted file mode 100644
index 800492350cc6..000000000000
--- a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 20204e37d8411b19b69a7ee5c776035c07f7175d Mon Sep 17 00:00:00 2001
-From: Sutou Kouhei <kou@clear-code.com>
-Date: Sun, 31 May 2020 11:56:51 +0900
-Subject: [PATCH] Include QPainterPath explicitly for Qt 5.15.0
-
----
- lib/gks/plugin/qt5plugin.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/gks/plugin/qt5plugin.cxx b/lib/gks/plugin/qt5plugin.cxx
-index de9cd3d2..301d7fb9 100644
---- a/lib/gks/plugin/qt5plugin.cxx
-+++ b/lib/gks/plugin/qt5plugin.cxx
-@@ -6,6 +6,7 @@
- 
- #include <QtWidgets/QWidget>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QImage>
- #include <QtGui/QGuiApplication>
- #include <QtGui/QScreen>
diff --git a/sci-visualization/gr/files/gr-0.53.0-musl.patch b/sci-visualization/gr/files/gr-0.53.0-musl.patch
new file mode 100644
index 000000000000..5b7f55828583
--- /dev/null
+++ b/sci-visualization/gr/files/gr-0.53.0-musl.patch
@@ -0,0 +1,29 @@
+From 205a70fdbd69d7877994e7aea5cec6eab79236b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 26 Feb 2022 19:38:20 +0100
+Subject: [PATCH] Fix build with musl libc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ lib/gks/io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/gks/io.c b/lib/gks/io.c
+index 669dd81f..50fde2c4 100644
+--- a/lib/gks/io.c
++++ b/lib/gks/io.c
+@@ -11,7 +11,7 @@
+ #include <io.h>
+ #endif
+ 
+-#if defined(cray) || defined(__SVR4) || defined(_WIN32)
++#if defined(cray) || defined(__SVR4) || defined(_WIN32) || !defined(__GLIBC__)
+ #include <fcntl.h>
+ #else
+ #include <sys/file.h>
+-- 
+2.34.1
+
diff --git a/sci-visualization/gr/gr-0.50.0-r2.ebuild b/sci-visualization/gr/gr-0.50.0-r2.ebuild
deleted file mode 100644
index 07a5b52c9081..000000000000
--- a/sci-visualization/gr/gr-0.50.0-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2019-2021 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="https://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"
-
-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
-	x11-libs/libX11
-	x11-libs/libXt
-	cairo? ( x11-libs/cairo )
-	ffmpeg? ( media-video/ffmpeg:= )
-	postscript? ( app-text/ghostscript-gpl )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype )
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-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"
-
-	[[ -f "${ED}/usr/gr/bin/gksqt" ]] && dosym ../gr/bin/gksqt /usr/bin/gksqt
-
-	elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell,"
-	elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first."
-}
diff --git a/sci-visualization/gr/gr-0.53.0.ebuild b/sci-visualization/gr/gr-0.53.0.ebuild
index dbdaaca1611b..c46b776f0a07 100644
--- a/sci-visualization/gr/gr-0.53.0.ebuild
+++ b/sci-visualization/gr/gr-0.53.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-musl.patch"
+)
+
 src_configure() {
 	use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
 	use postscript || mycmakeargs+=( -DGS_LIBRARY= )