From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC952138350 for ; Mon, 24 Feb 2020 13:36:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8F83E0982; Mon, 24 Feb 2020 13:36:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95611E0982 for ; Mon, 24 Feb 2020 13:36:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B189534F188 for ; Mon, 24 Feb 2020 13:36:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC13B10B for ; Mon, 24 Feb 2020 13:36:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1582551386.6d042c7824487c60ab67da55b9f7cbbf2e756d4d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gwyddion/files/, sci-visualization/gwyddion/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gwyddion/Manifest sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild X-VCS-Directories: sci-visualization/gwyddion/files/ sci-visualization/gwyddion/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6d042c7824487c60ab67da55b9f7cbbf2e756d4d X-VCS-Branch: master Date: Mon, 24 Feb 2020 13:36:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 65450610-e622-4e81-82b8-f2585eca88be X-Archives-Hash: 82be6d8e124a2783aeb278f8becbc987 commit: 6d042c7824487c60ab67da55b9f7cbbf2e756d4d Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 24 13:31:42 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 24 13:36:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d042c78 sci-visualization/gwyddion: Drop 2.47-r1 Closes: https://bugs.gentoo.org/710156 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-visualization/gwyddion/Manifest | 1 - .../gwyddion/files/gwyddion-2.47-cfitsio.patch | 19 ------ sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild | 71 ---------------------- 3 files changed, 91 deletions(-) diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest index 344cbeac8b5..5e4503a7e41 100644 --- a/sci-visualization/gwyddion/Manifest +++ b/sci-visualization/gwyddion/Manifest @@ -1,2 +1 @@ -DIST gwyddion-2.47.tar.xz 3974120 BLAKE2B c9a0241fe509a2f067c16f77d2b02885505d47c3ba0f25a44449e0d5ad05ce8596784392d8f1265823577aeebbab7ad9c96a39625b01bf11da3cebeb1c6453cc SHA512 a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e diff --git a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch deleted file mode 100644 index 9380eafa905..00000000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ruN gwyddion-2.47.orig/configure.ac gwyddion-2.47/configure.ac ---- gwyddion-2.47.orig/configure.ac 2016-11-18 11:17:57.000000000 +0100 -+++ gwyddion-2.47/configure.ac 2020-01-24 04:39:18.892183563 +0100 -@@ -632,11 +632,13 @@ - ############################################################################# - # CFITSIO - # Optional. Used for FITS image import. --enable_cfitsio=yes --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.47-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild deleted file mode 100644 index 1e7286e2d11..00000000000 --- a/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome2-utils 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="doc fits fftw gnome nls opengl perl ruby sourceview xml X" - -RDEPEND=" - media-libs/libpng:0= - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libXmu - x11-libs/pango - fits? ( sci-libs/cfitsio ) - fftw? ( sci-libs/fftw:3.0= ) - gnome? ( gnome-base/gconf:2 ) - opengl? ( virtual/opengl x11-libs/gtkglext ) - perl? ( dev-lang/perl:= ) - ruby? ( dev-ruby/narray ) - sourceview? ( x11-libs/gtksourceview:2.0 ) - xml? ( dev-libs/libxml2:2 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-util/gtk-doc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.47-cfitsio.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-rpath \ - --without-kde4-thumbnailer \ - $(use_enable doc gtk-doc) \ - $(use_enable nls) \ - --disable-pygwy \ - $(use_with fits cfitsio) \ - $(use_with perl) \ - --without-python \ - $(use_with ruby) \ - $(use_with fftw fftw3) \ - $(use_with opengl gl) \ - $(use_with sourceview gtksourceview) \ - $(use_with xml libxml2) \ - $(use_with X x) -} - -pkg_postinst() { - use gnome && gnome2_gconf_install - xdg_pkg_postinst -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -}