public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/
Date: Sun, 14 May 2023 10:29:13 +0000 (UTC)	[thread overview]
Message-ID: <1684060070.0bfba004e7ce52ca5071702176c7cd63b3d5093b.asturm@gentoo> (raw)

commit:     0bfba004e7ce52ca5071702176c7cd63b3d5093b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 07:25:45 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 10:27:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bfba004

sci-visualization/gle: drop 4.2.5-r4

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-visualization/gle/Manifest                     |   1 -
 sci-visualization/gle/files/gle-4.2.5-c++14.patch  |  27 ------
 .../gle/files/gle-4.2.5-jpeg-9c.patch              |  22 -----
 .../gle/files/gle-4.2.5-parallel.patch             |  20 ----
 sci-visualization/gle/gle-4.2.5-r4.ebuild          | 103 ---------------------
 5 files changed, 173 deletions(-)

diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 711e164a9042..725aa0b89bfe 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,6 +1,5 @@
 DIST gle-4.3.3.tar.gz 1788614 BLAKE2B 3f608a8dad32d02b06808d5b2cfe4a2beb2c076c74e2972be2e94fe56bf24190b9cc7c69f45f1b02d399354f827c43722029871d6355bc0e4abe003f71b2bf82 SHA512 191dde025828f3376c7241e0580fcd459c743fe947f69cc3be1345b43c1d2587852a0d002dfdab7d8b7b45fd30e6bf4e8a4b5c73bcc2f3ce2fd08aa41d799b03
 DIST gle-c++17.patch.gz 18738 BLAKE2B e0d91aedf2121897336be72d8ad5878be95cf15982b38efb2fda86605d6e0f01b792013a9ab6407692254e5c074630daede05bcf97f349541dd979b21eb2ff15 SHA512 3bc4e335577f94eafd140cd64f2ada1926b1679c113de1f0bb0dd1afed67210470340470b19d89dae4ae1ef433f05120332a465711afb4e637e3cf0c6db68ace
-DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
 DIST gle-library.tar.gz 1073620 BLAKE2B 051f9584dbf3195c7598ae54b12ab8d373e8054e8ff4c3d1dfed70319c29c5cb8bb1f0baff127768bcf9e36e4f52be3b3238e786e1598d1cdfbd6d1af6d6bdd3 SHA512 af6a46f2bd945714679eb9d8ca4c70ca9a741cf6652590eb3a8d9422059f49ce3d2c33418c37899bd54f9e0bc0085ae82ffd2f2b84b77879e2f2d09a0026d12a
 DIST gle-manual.pdf.gz 1878050 BLAKE2B 6ebd3c0214ab8aee3e5a32d1e1cdf1c001cd09325c80a506a1e41f4eb3ec8869b75083c741a5cf8b2f3faf1d2cb0c6cfeca835daa284263598f749109904cc11 SHA512 7cc796626fa19541558004250a4a5b206ead7ba704c76fd948693aca144e70926b8213ee8b062841bffedc631eb39a255d69387bbee4a5acc7edc6d093e3113f
 DIST gle-mode.el.gz 7359 BLAKE2B bcbc61651f87f3ee1d079fc0a0de38788523a5ee33f56087b89f4e15b9ef5ee4010cf47679c38da3dfae1954ddbfee4728d10c0af6530f645ff63ab2b219da09 SHA512 c8d291c23f53346d8a44b7d95d737da88c6ec0af597fb8298a564a5567a9e9a0db658d14c3cb43157d58614e65cf2293eaeb01528a7a49722a2da07e16f940e1

diff --git a/sci-visualization/gle/files/gle-4.2.5-c++14.patch b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
deleted file mode 100644
index b548816ae065..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-c++14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r -U2 gle-graphics-4.2.5.orig/src/gle/fitcf.h gle-graphics-4.2.5/src/gle/fitcf.h
---- gle-graphics-4.2.5.orig/src/gle/fitcf.h	2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gle/fitcf.h	2018-01-13 13:57:23.140749391 +0700
-@@ -182,8 +182,8 @@
- typedef struct Namelist Namelist;
- 
--#define abs(x) ((x) >= 0 ? (x) : -(x))
-+/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/
- #define dabs(x) (doublereal)abs(x)
--#define min(a,b) ((a) <= (b) ? (a) : (b))
--#define max(a,b) ((a) >= (b) ? (a) : (b))
-+/*#define min(a,b) ((a) <= (b) ? (a) : (b))*/
-+/*#define max(a,b) ((a) >= (b) ? (a) : (b))*/
- #define dmin(a,b) (doublereal)min(a,b)
- #define dmax(a,b) (doublereal)max(a,b)
-diff -r -U2 gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp
---- gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp	2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp	2018-01-13 14:08:08.169722265 +0700
-@@ -49,7 +49,7 @@
- #include "f2c.h"
- #else
--#include "f2c.h"
- #include <stdio.h>
- #include <math.h>
-+#include "f2c.h"
- #endif
- 

diff --git a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
deleted file mode 100644
index c5dd2205dc43..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/647626
-
---- a/src/gle/gle-poppler.cpp
-+++ b/src/gle/gle-poppler.cpp
-@@ -194,7 +194,7 @@
- boolean gle_jpeg_empty_output_buffer(j_compress_ptr cinfo) {
- 	gle_jpeg_term_destination(cinfo);
- 	gle_jpeg_init_destination(cinfo);
--	return true;
-+	return TRUE;
- }
- 
- void gle_jpeg_memory_dest(j_compress_ptr cinfo, JOCTET* buffer, GLEWriteFuncAndClosure writeCallback) {
-@@ -237,7 +237,7 @@
-     	cinfo.in_color_space = JCS_RGB;
-     }
-     jpeg_set_defaults(&cinfo);
--    jpeg_start_compress(&cinfo, true);
-+    jpeg_start_compress(&cinfo, TRUE);
-     JSAMPROW row = new JSAMPLE[cinfo.input_components * width];
-     JSAMPROW row_pointer[1];
-     row_pointer[0] = row;

diff --git a/sci-visualization/gle/files/gle-4.2.5-parallel.patch b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
deleted file mode 100644
index eeca1f5946ba..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-parallel.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -U2 gle-graphics-4.2.5.orig/src/gui/MakefileAC.in gle-graphics-4.2.5/src/gui/MakefileAC.in
---- gle-graphics-4.2.5.orig/src/gui/MakefileAC.in	2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gui/MakefileAC.in	2018-01-13 14:23:09.066684378 +0700
-@@ -83,12 +83,12 @@
- 	$(QMAKE_PROG) $(QMAKE_OPTS)
- 
--domake:
--	$(MAKE_PROG)
-+domake: Makefile
-+	$(MAKE)
- 
--repmake:
-+repmake: Makefile
- 	perl ../../platform/autopackage/qt-replace.pl Makefile
- 
- doclean:
--	-$(MAKE_PROG) clean
-+	-$(MAKE) clean
- 	-@$(RM) qgle install_qgle_name_mac Makefile
- 	-@$(RMDIR) moc

diff --git a/sci-visualization/gle/gle-4.2.5-r4.ebuild b/sci-visualization/gle/gle-4.2.5-r4.ebuild
deleted file mode 100644
index 88e3c6d80dd6..000000000000
--- a/sci-visualization/gle/gle-4.2.5-r4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic
-
-MY_P=${PN}-graphics-${PV}
-
-DESCRIPTION="Graphics Layout Engine"
-HOMEPAGE="https://glx.sourceforge.net"
-SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2 emacs? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs jpeg png tiff vim-syntax X"
-
-DEPEND="
-	sys-libs/ncurses:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:= )
-	tiff? ( media-libs/tiff:= )
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-	virtual/latex-base
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-BDEPEND="doc? ( dev-texlive/texlive-latexextra )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallel.patch
-	"${FILESDIR}"/${P}-c++14.patch
-	"${FILESDIR}"/${P}-jpeg-9c.patch
-)
-
-src_prepare() {
-	default
-	eaclocal
-	eautoconf
-}
-
-src_configure() {
-	# CPPFLAGS are understood as C++ flags
-	append-cppflags ${CXXFLAGS}
-	append-cppflags -std=c++14
-	econf \
-		--without-rpath \
-		--without-qt \
-		--with-manip \
-		$(use_with X x) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff)
-}
-
-src_compile() {
-	emake
-	use doc && emake -j1 doc
-
-	if use emacs; then
-		cd contrib/editors/highlighting || die
-		mv ${PN}-emacs.el ${PN}-mode.el || die
-		elisp-compile ${PN}-mode.el
-	fi
-}
-
-src_install() {
-	# -jN failed to install some data files
-	emake -j1 DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/gle-graphics || die
-	dodoc README.txt
-
-	use doc && dodoc build/doc/gle-manual.pdf
-
-	if use emacs; then
-		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el
-	fi
-
-	if use vim-syntax ; then
-		dodir /usr/share/vim/vimfiles/{ftplugins,indent,syntax}
-		cd contrib/editors/highlighting/vim || die
-		chmod 644 ftplugin/* indent/* syntax/* || die
-		insinto /usr/share/vim/vimfiles
-		doins -r ftplugin indent syntax
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


             reply	other threads:[~2023-05-14 10:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-14 10:29 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-22  8:39 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/ Andrey Grozin
2023-08-21 12:43 Andrey Grozin
2022-12-24  6:23 Andrey Grozin
2019-04-11 20:49 David Seifert
2018-01-13  8:15 Andrey Grozin

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=1684060070.0bfba004e7ce52ca5071702176c7cd63b3d5093b.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