From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/, sci-visualization/gwyddion/files/
Date: Fri, 4 Oct 2024 21:40:49 +0000 (UTC) [thread overview]
Message-ID: <1728078003.3863c632ba11af0ced1938fbca44abc60dba6635.asturm@gentoo> (raw)
commit: 3863c632ba11af0ced1938fbca44abc60dba6635
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 17:40:49 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 21:40:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3863c632
sci-visualization/gwyddion: drop 2.61-r1, 2.62-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-visualization/gwyddion/Manifest | 1 -
.../gwyddion/files/gwyddion-2.60-automagic.patch | 35 ---------
sci-visualization/gwyddion/gwyddion-2.61-r1.ebuild | 89 ----------------------
sci-visualization/gwyddion/gwyddion-2.62-r2.ebuild | 89 ----------------------
4 files changed, 214 deletions(-)
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 53fcf98561ed..f202ec7c8a41 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,2 +1 @@
-DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675
DIST gwyddion-2.62.tar.xz 5010676 BLAKE2B 18012dfe050753413834e8a3734ec82989f375d81ac0242a6bbaf630da1a7741e9701d3c7a8c0dc03cfde8f93de9848ae106731f057c902f44ba1caf0cd79520 SHA512 93aff13f865fab045e17bd6c7633d714c4a97980ff10093f38c35e6dd39a0ed9680185f7a81a198522b623260cf6086d40e2b6a63a1cb59bc176eadf87fb85e1
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch
deleted file mode 100644
index ac68ac0a2861..000000000000
--- a/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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" && "x$have_cxx" != "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.61-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.61-r1.ebuild
deleted file mode 100644
index 1c242c79a51f..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.61-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 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
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.62-r2.ebuild b/sci-visualization/gwyddion/gwyddion-2.62-r2.ebuild
deleted file mode 100644
index 96d176c56a7e..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.62-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 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
-}
next reply other threads:[~2024-10-04 21:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-04 21:40 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-05 21:12 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/, sci-visualization/gwyddion/files/ Andreas K. Hüttel
2022-08-30 18:26 Andreas Sturmlechner
2020-01-28 0:09 Andreas K. Hüttel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1728078003.3863c632ba11af0ced1938fbca44abc60dba6635.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox