gentoo auto-resync : 29:04:2023 - 23:15:57

4 files changed, 93 insertions, 2 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index df1f4e4012ee..a1c1a4b8db20 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 57a96d244996..6c8b1caf8d62 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,4 +1,6 @@
 AUX gwyddion-2.60-automagic.patch 1552 BLAKE2B c106acfee1e00d8a4ade965cddab943bc79c246503fb51e53d20ba6a3b8b0a76cc433b75e867d448d7622ef190f1f54225b0f45be3860d32672397090be619d9 SHA512 50eca983c81bb14c33415e3ad69bf2e18be4a88fb674537dc335d8aa9986edb1baa962f7a4eead41d70b54828729165d413387c64696a0f4e1aa9ad49675afb0
 DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675
-EBUILD gwyddion-2.61.ebuild 2016 BLAKE2B 56c1f0b306d4462a7f770b805323bc91a93705203d5a223f94e1ee84e16490ca8ac0597042c8298c9d5ce12dd3962deceb233a1b628d3dccdb21616245bf5ca9 SHA512 d11a23dd452521dd2b920582455a46ed0d91683598bf83e3f3351dcc6b1b4f39367ab59bc4018beffa1de822c38029c8179898b75673e40a525b2d1847813fdf
+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.ebuild 2021 BLAKE2B fafb06a9681beace78a1ec87eb1db2fa43ea05e8422dec20c31d08dc1177a7bf96793e64c8fd2195bac48661d2931558985e0309c6d961a42df91778c3cfd1fd SHA512 65dd348786e930cf3677a7f5ae6d217879c65c9e9ec5ba0e58836dfb29dfa03355ece3486fe15ab018ec5c55379d199b1ebd45a0621d1982f6ce61fe9c08f9e5
 MISC metadata.xml 1154 BLAKE2B f5b963012cfc1842557eb4a678d9f1d3dbbefd08ea53e37306b747dd41336fe04418f97487e909a5c58eac4c97dc694a8be90be7b16079449be5269e869549a5 SHA512 612def01f5ce5f6681525c129abe4f58507aac92dc61d1d5ccdb1f95cd7625c5b79beda9eabc9ebf3e76808eeacbebd92ddb4e74476eace966d4ef4c32a68f67
diff --git a/sci-visualization/gwyddion/gwyddion-2.61.ebuild b/sci-visualization/gwyddion/gwyddion-2.61.ebuild
index 13072246764f..0f40e3061f4d 100644
--- a/sci-visualization/gwyddion/gwyddion-2.61.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.61.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	bzip2? ( app-arch/bzip2 )
 	fits? ( sci-libs/cfitsio[bzip2?] )
 	jansson? ( dev-libs/jansson )
-	hdf5? ( sci-libs/hdf5[zlib?] )
+	hdf5? ( sci-libs/hdf5[hl,zlib?] )
 	openexr? ( media-libs/openexr:= )
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-ruby/narray )
diff --git a/sci-visualization/gwyddion/gwyddion-2.62.ebuild b/sci-visualization/gwyddion/gwyddion-2.62.ebuild
new file mode 100644
index 000000000000..8342a2ef0ea8
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.62.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.60-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
+}