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 A6C33139085 for ; Mon, 2 Jan 2017 22:09:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 058C0E0D63; Mon, 2 Jan 2017 22:09:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB199E0D63 for ; Mon, 2 Jan 2017 22:09:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D320634108B for ; Mon, 2 Jan 2017 22:09:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E303F261B for ; Mon, 2 Jan 2017 22:09:12 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1483394945.83cda917ea4d29220b464980c85edd006c17bc4b.jlec@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.25-libpng15.patch sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch sci-visualization/gwyddion/gwyddion-2.39.ebuild X-VCS-Directories: sci-visualization/gwyddion/ sci-visualization/gwyddion/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 83cda917ea4d29220b464980c85edd006c17bc4b X-VCS-Branch: master Date: Mon, 2 Jan 2017 22:09:12 +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-Archives-Salt: 495cd3a4-ef42-4b49-ac81-e6c179738457 X-Archives-Hash: 95bbb67f717211e12e83af09bfb18856 commit: 83cda917ea4d29220b464980c85edd006c17bc4b Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 2 21:49:57 2017 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 2 22:09:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83cda917 sci-visualization/gwyddion: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 Signed-off-by: Justin Lecher gentoo.org> sci-visualization/gwyddion/Manifest | 1 - .../gwyddion/files/gwyddion-2.25-libpng15.patch | 10 --- .../gwyddion/files/gwyddion-2.30-BGRA.patch | 22 ------ .../gwyddion-2.30-color-button-debris-crash.patch | 37 --------- sci-visualization/gwyddion/gwyddion-2.39.ebuild | 90 ---------------------- 5 files changed, 160 deletions(-) diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest index 5d8336b..0a88a1a 100644 --- a/sci-visualization/gwyddion/Manifest +++ b/sci-visualization/gwyddion/Manifest @@ -1,2 +1 @@ -DIST gwyddion-2.39.tar.xz 3130844 SHA256 f2346a706fa097e9186339f7e10b7837b20ce403b44bc7a85bc78b6b78a506d2 SHA512 5b9631c9eeb71a10d0be3533585eb61e8d27bc1147a1f3cf1ca333020271b579025ce752d302bd9474f1b3ed8c55ce679ac6a75bfb4a1093adef0727b824d435 WHIRLPOOL 90262b86d1bb01b6fdf5a67b447dc1177a523df368fbd040a87d7261e071844b86624dd6bb303c8a32302d16e5f7cb11e5f0744b2808e4f6d467cd27652efe23 DIST gwyddion-2.44.tar.xz 3517624 SHA256 e7ee7545770a276e78fdff1b51e547d5d0ba39b94995da91e0d6797122b7eda5 SHA512 c80a0e4e9dde2f669763629d34dacc0015770c4704a10fc820f4d8e75b4f4275852162653f0c6c52674ed76162861af860de6741466d939066bfea3fb584d2ff WHIRLPOOL 56f78efb477da520a65473ce6be9eff88897198e8a80e5971a2280755fdc61925405c0a464572cf7887689746d140eefc855562569919bc17e057f472ac0b597 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch b/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch deleted file mode 100644 index f13eaa9..00000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.25-libpng15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/file/pixmap.c -+++ modules/file/pixmap.c -@@ -39,6 +39,7 @@ - #include - - #ifdef HAVE_PNG -+#include - #include - #endif - diff --git a/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch b/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch deleted file mode 100644 index c3b5912..00000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.30-BGRA.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: libgwydgets/gwy3dview.c -=================================================================== ---- libgwydgets/gwy3dview.c (revision 13961) -+++ libgwydgets/gwy3dview.c (working copy) -@@ -48,7 +48,6 @@ - #include - #endif - #endif --#endif - - #ifndef GL_BGRA - #ifdef GL_BGRA_EXT -@@ -57,6 +56,7 @@ - #error FIXME: GL_BGRA is not available, should work around it. - #endif - #endif -+#endif - - #include - #include - - diff --git a/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch b/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch deleted file mode 100644 index e6ceedf..00000000 --- a/sci-visualization/gwyddion/files/gwyddion-2.30-color-button-debris-crash.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: modules/file/pixmap.c -=================================================================== ---- modules/file/pixmap.c (revision 13902) -+++ modules/file/pixmap.c (revision 13903) -@@ -2933,8 +2933,6 @@ - gwy_rgba_to_gdk_color(&controls->args->inset_color, &gdkcolor); - - dialog = gtk_color_selection_dialog_new(_("Change Inset Color")); -- if (gtk_major_version == 2 && gtk_minor_version < 10) -- - selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel; - gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector), - &gdkcolor); -Index: libgwydgets/gwygraphareadialog.c -=================================================================== ---- libgwydgets/gwygraphareadialog.c (revision 13902) -+++ libgwydgets/gwygraphareadialog.c (revision 13903) -@@ -383,7 +383,6 @@ - dialog->color_dialog = selector; - dialog->old_color = cmodel->color; - -- if (gtk_major_version == 2 && gtk_minor_version < 10) - colorsel = GTK_COLOR_SELECTION_DIALOG(selector)->colorsel; - g_signal_connect(selector, "response", - G_CALLBACK(colorsel_response_cb), dialog); -Index: libgwydgets/gwydgetutils.c -=================================================================== ---- libgwydgets/gwydgetutils.c (revision 13902) -+++ libgwydgets/gwydgetutils.c (revision 13903) -@@ -561,7 +561,6 @@ - dialog = gtk_color_selection_dialog_new(dialog_title - ? dialog_title - : _("Change Mask Color")); -- if (gtk_major_version == 2 && gtk_minor_version < 10) - selector = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel; - gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(selector), - &gdkcolor); diff --git a/sci-visualization/gwyddion/gwyddion-2.39.ebuild b/sci-visualization/gwyddion/gwyddion-2.39.ebuild deleted file mode 100644 index 818e984..00000000 --- a/sci-visualization/gwyddion/gwyddion-2.39.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils fdo-mime gnome2-utils python-single-r1 - -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 kde nls opengl perl python 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 ) - kde? ( kde-frameworks/kdelibs:4 ) - opengl? ( virtual/opengl x11-libs/gtkglext ) - perl? ( dev-lang/perl ) - python? ( - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - ) - ruby? ( dev-ruby/narray ) - sourceview? ( x11-libs/gtksourceview:2.0 ) - xml? ( dev-libs/libxml2:2 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-util/gtk-doc ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -MAKEOPTS+=" V=1" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myeconfargs=( - --disable-rpath - $(use_enable doc gtk-doc) - $(use_enable nls) - $(use_enable python pygwy) - $(use_enable fits cfitsio) - $(use_with perl) - $(use_with python) - $(use_with ruby) - $(use_with fftw fftw3) - $(use_with opengl gl) \ - $(use_with sourceview gtksourceview) - $(use_with xml libxml2) - $(use_with X x) - $(use_with kde kde4-thumbnailer) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - use python && dodoc modules/pygwy/README.pygwy -} - -pkg_postinst() { - use gnome && gnome2_gconf_install - fdo-mime_desktop_database_update -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -} - -pkg_postrm() { - fdo-mime_desktop_database_update -}