gentoo auto-resync : 05:05:2023 - 23:32:28

7 files changed, 143 insertions, 6 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 3f1bd1488001..3bf8c6502d22 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
index e3f534a9d8b8..46ceb54ca8c2 100644
--- a/sci-visualization/gr/Manifest
+++ b/sci-visualization/gr/Manifest
@@ -1,6 +1,6 @@
 AUX gr-0.53.0-musl.patch 797 BLAKE2B 4eb48a510b19a23cc4c82e0f81a1f9753c96f0554edecf4a4163b17be9505e8c8d0710f9c97c49dadb84fefe69cab27a3bfbb6cfe04b97b0d9a260b6e4042fe5 SHA512 5080806ed0598d404a380c3d8fe10207dd3fc1245b76992c341261f43b9727a82f7ebd85e582c606d6ccaf72eb04a57d21ccc0168e5c19b6b37cb2b265fa0018
-DIST gr-0.53.0.tar.gz 19267451 BLAKE2B bd243fac9df6222c4b9e3591adfcd1d37dd41628719bd7be7ab385402f0f97e21f3eb23df3ae5d2ed3e43df2b3d83ff66f4e0b478d717772b57dce5885a98721 SHA512 49eee39fd4abd62d6794a16eb023688a525f6906054610dccd85c1b7b0bed9b198d923834cbf661099f753ec40b383a911c295f781420aeead712c5712583c80
 DIST gr-0.72.0.tar.gz 9064921 BLAKE2B 92f531cd308c8bcec0f36fd57b1aeddfeb555ae4ceb1a394276f37ae515d1b5172ef775d0b33d6aa429ac46021194a4327646a486112032722121c01885c6bfa SHA512 cb04cff65649c4f688c07afaa6959ba08f88f6f9d0935bbd7b29bf58dab2a114609ea45d9849a1acc5bbd0feab4083d692a4364ada653dcbfe7f99e2594d9a42
-EBUILD gr-0.53.0-r2.ebuild 2094 BLAKE2B a90f89e4b6986277d5e298bbe7a021e3848b49d5b67cbf7212b6db063efe16d9019d730be9002e6ee5dbc29320ee0229c1fa5c91cf5504e30436c4bb32107da9 SHA512 57951e4a4edd1b8465c4174e0d231ac2d57cd85691dfc128a7b1c4d0efd6006d6587065e2cd0e21985dc45e679408b84673ac6e6f349f5c8f296d638b4753059
+DIST gr-0.72.4.tar.gz 9067899 BLAKE2B 827c80dbfc3483abe4af217c06549c64aa134446e831a5d7fab3906a3aac7bb23b66f8b98674220ff1b6fbd5fad60b9a8e7f7361a27370c033d9375a18f63234 SHA512 4ae1aae6854995ae58327d41930cedd96ef973ce65467f48f24d9985b27b5af2aa0eb6832a801b46e6fa71cade99117957c96738cb000306b0574b0e471692fb
 EBUILD gr-0.72.0.ebuild 2133 BLAKE2B 24fb5d37658380122e574f9df10e8f2906d238fa9655cfbf6a3f0b19c84a104a2066e53c8c5a1acc3ac8e9c83d46afec7413297f58d1e9b59ad17b05c14b080c SHA512 4df978354e3fa3cca217a22bdc75e9a92b3fe15bad3b3825c67aa05ea9f98ada927d2581b54308bf142a94c838543735a259afbf90432e496d8333e02985c99c
-MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
+EBUILD gr-0.72.4.ebuild 2289 BLAKE2B 276f7a9dac58ccf66591c518742837c1e20f4c40690c98744287553bb96d6d4b15d079a425c72465ee5330eda126ec4b5746c596ffc7ecc2b189b63be513db85 SHA512 5c29d01631d8ad9a66af9539bfd5cd41d7b7c811d761d7b2c73fb80ae8bc07be8bb3610d008da10a0669e56828da454ce35844e2e34d47817defe269094e0fe5
+MISC metadata.xml 352 BLAKE2B 9b90347aa5d1cb3fdecbedc89d93aa57e4f4796720947f77c770073eba15aa849d42a1e5e201642b13a5d13ffae6bbc76163836a9c4f790fbdf53c8d014b07d6 SHA512 8baac24ecabd0787fa823dd23667b62a90a5a156b00f0785526d82f07840de8fa7528c0277cd62df93eebcca4ec9ab851f05781ef004426ef58a0862bc2d98b0
diff --git a/sci-visualization/gr/gr-0.53.0-r2.ebuild b/sci-visualization/gr/gr-0.72.4.ebuild
index a8ba3a3bcf5e..51aaeb29fc39 100644
--- a/sci-visualization/gr/gr-0.53.0-r2.ebuild
+++ b/sci-visualization/gr/gr-0.72.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -12,7 +12,7 @@ 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"
+IUSE="agg cairo ffmpeg postscript tiff truetype"
 
 DEPEND="
 	dev-qt/qtgui:5
@@ -21,10 +21,12 @@ DEPEND="
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/qhull:=
+	net-libs/zeromq
 	sys-libs/zlib
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXt
+	agg? ( x11-libs/agg )
 	cairo? ( x11-libs/cairo )
 	ffmpeg? ( media-video/ffmpeg:= )
 	postscript? ( app-text/ghostscript-gpl )
@@ -35,12 +37,18 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 
 PATCHES=(
-	"${FILESDIR}/${P}-musl.patch"
+	"${FILESDIR}/${PN}-0.53.0-musl.patch"
 )
 
 REQUIRED_USE="cairo? ( truetype )"
 
 src_configure() {
+	if use agg ; then
+		mycmakeargs+=( -DAGG_LIBRARY=libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 )
+	else
+		mycmakeargs+=( -DAGG_LIBRARY= )
+	fi
+
 	use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
 	use postscript || mycmakeargs+=( -DGS_LIBRARY= )
 	use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= )
diff --git a/sci-visualization/gr/metadata.xml b/sci-visualization/gr/metadata.xml
index 71a5bee94e5a..48e49d2a0db8 100644
--- a/sci-visualization/gr/metadata.xml
+++ b/sci-visualization/gr/metadata.xml
@@ -5,4 +5,7 @@
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+  <use>
+    <flag name="agg">Enable the libagg anti-grain rendering engine</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 6c8b1caf8d62..86907a75d948 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,6 +1,8 @@
 AUX gwyddion-2.60-automagic.patch 1552 BLAKE2B c106acfee1e00d8a4ade965cddab943bc79c246503fb51e53d20ba6a3b8b0a76cc433b75e867d448d7622ef190f1f54225b0f45be3860d32672397090be619d9 SHA512 50eca983c81bb14c33415e3ad69bf2e18be4a88fb674537dc335d8aa9986edb1baa962f7a4eead41d70b54828729165d413387c64696a0f4e1aa9ad49675afb0
+AUX gwyddion-2.62-automagic.patch 1527 BLAKE2B 85b5267bd011125c979cdec5885e8f61fc39bfdcac864405a5d37f26543e62f4b5762129e1537ae871dfbb109226364e66fc3576340e704b671df025986846bc SHA512 cd335f0a264679159bb4f98cdac8b37357f886b49d6d98662f2550ba0b5e5d911530c31b0238574ee1b42d6dbe8fc9ff77e3d8ce985baaabc5e58a145f057ffb
 DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675
 DIST gwyddion-2.62.tar.xz 5010676 BLAKE2B 18012dfe050753413834e8a3734ec82989f375d81ac0242a6bbaf630da1a7741e9701d3c7a8c0dc03cfde8f93de9848ae106731f057c902f44ba1caf0cd79520 SHA512 93aff13f865fab045e17bd6c7633d714c4a97980ff10093f38c35e6dd39a0ed9680185f7a81a198522b623260cf6086d40e2b6a63a1cb59bc176eadf87fb85e1
 EBUILD gwyddion-2.61.ebuild 2019 BLAKE2B 38dd714482bde308174550908b6f54c662251efd77108f42367325b8dec799dc0c97c481856d8907a3d45f00078476ae14c9807c631382ffd44018c832a369c6 SHA512 83441b1595ba5e84fcf93ccf4327937d235807f0e6c8a698eae5585d755b76ff4c4707a6879056032eb4b3f945e42c97f160c913f497c121e937dff5d90dda8d
+EBUILD gwyddion-2.62-r1.ebuild 2021 BLAKE2B 409f48953f2606f72928cbf66d8bec77ea82fd2df50f32c1952f08024b561231442e46b8eca06fc3ee626962a0261fba7a433fd879cdc5bbea0e6fe63dedfa52 SHA512 d0546c8282aab928235f102f7c3add0ca0ae675ee15e82e088e1ff200b43c414bb8dbc1b3da45d9bb2114fba59ef4b89af21d9467e0494dbc863c9f77d84d1b7
 EBUILD gwyddion-2.62.ebuild 2021 BLAKE2B fafb06a9681beace78a1ec87eb1db2fa43ea05e8422dec20c31d08dc1177a7bf96793e64c8fd2195bac48661d2931558985e0309c6d961a42df91778c3cfd1fd SHA512 65dd348786e930cf3677a7f5ae6d217879c65c9e9ec5ba0e58836dfb29dfa03355ece3486fe15ab018ec5c55379d199b1ebd45a0621d1982f6ce61fe9c08f9e5
 MISC metadata.xml 1154 BLAKE2B f5b963012cfc1842557eb4a678d9f1d3dbbefd08ea53e37306b747dd41336fe04418f97487e909a5c58eac4c97dc694a8be90be7b16079449be5269e869549a5 SHA512 612def01f5ce5f6681525c129abe4f58507aac92dc61d1d5ccdb1f95cd7625c5b79beda9eabc9ebf3e76808eeacbebd92ddb4e74476eace966d4ef4c32a68f67
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.62-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.62-automagic.patch
new file mode 100644
index 000000000000..67259e8e77c5
--- /dev/null
+++ b/sci-visualization/gwyddion/files/gwyddion-2.62-automagic.patch
@@ -0,0 +1,35 @@
+diff --git a/configure.ac b/configure.ac
+index 5a7465a..cc5a54d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -660,11 +660,13 @@ AM_CONDITIONAL([HAVE_CXX],[test "x$have_cxx" != xno])
+ #############################################################################
+ # OpenEXR 2.x+
+ # Optional.  Used for HDR greyscale OpenEXR pixmap import/export.
+-enable_exr=$have_cxx
+-PKG_CHECK_MODULES(EXR, [OpenEXR >= 2.0],
++GWY_WITH([exr],,[build with OpenEXR support])
++if test "x$enable_exr" != "xno"; then
++  PKG_CHECK_MODULES(EXR, [OpenEXR],
+                   [AC_DEFINE(HAVE_EXR,1,
+                             [Define if we have the OpenEXR 2.x+ package.])],
+                   [enable_exr=no])
++fi
+ AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno])
+ 
+ #############################################################################
+@@ -679,10 +681,13 @@ AM_CONDITIONAL([HAVE_HDF5],[test "x$enable_hdf5" != xno])
+ #############################################################################
+ # CFITSIO
+ # Optional.  Used for FITS image import.
+-PKG_CHECK_MODULES(CFITSIO, [cfitsio],
++GWY_WITH([cfitsio],,[build with cfitsio support])
++if test "x$enable_cfitsio" != "xno"; then
++  PKG_CHECK_MODULES(CFITSIO, [cfitsio],
+                   [AC_DEFINE(HAVE_CFITSIO,1,
+                             [Define if we have the cfitsio package.])],
+                   [enable_cfitsio=no])
++fi
+ AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno])
+ 
+ #############################################################################
diff --git a/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild
new file mode 100644
index 000000000000..f3fb8344665c
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.62-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
+HOMEPAGE="http://gwyddion.net/"
+SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
+
+RDEPEND="
+	>=dev-libs/glib-2.32
+	dev-libs/libzip
+	media-libs/libpng:0=
+	>=sci-libs/fftw-3.1:3.0=[openmp?]
+	virtual/libiconv
+	virtual/libintl
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libXmu
+	x11-libs/pango
+	bzip2? ( app-arch/bzip2 )
+	fits? ( sci-libs/cfitsio[bzip2?] )
+	jansson? ( dev-libs/jansson )
+	hdf5? ( sci-libs/hdf5[hl,zlib?] )
+	openexr? ( media-libs/openexr:= )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-ruby/narray )
+	unique? ( dev-libs/libunique:3 )
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.62-automagic.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+# There are python bindings (--enable-pygwy) but they are py2 only
+# 3D opengl rendering requires deprecated GTK-2 x11-libs/gtkglext
+src_configure() {
+	# hack for bug 741840
+	use doc && export GTK_DOC_PATH=/usr/share/gtk-doc
+
+	econf \
+		--disable-rpath \
+		--without-kde4-thumbnailer \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openmp) \
+		$(use_enable nls) \
+		--disable-pygwy \
+		--without-python \
+		$(use_with bzip2) \
+		$(use_with fits cfitsio) \
+		$(use_with hdf5) \
+		$(use_with jansson) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with openexr exr) \
+		--without-gl \
+		$(use_with sourceview gtksourceview) \
+		$(use_with unique) \
+		$(use_with xml libxml2) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		--with-zip=libzip
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}