* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/epix/, sci-visualization/epix/files/
@ 2021-06-10 12:52 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2021-06-10 12:52 UTC (permalink / raw
To: gentoo-commits
commit: f2d8e84ad472beb88a84a17058702f3b1ba0c70b
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 10 12:51:44 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 12:51:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d8e84a
sci-visualization/epix: add 1.2.19 and EAPI bump
Closes: https://bugs.gentoo.org/790524
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-visualization/epix/Manifest | 1 +
sci-visualization/epix/epix-1.2.19.ebuild | 70 +++++++++++++++++++
.../epix/files/epix-1.2.19-autotools.patch | 78 ++++++++++++++++++++++
3 files changed, 149 insertions(+)
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index a31bf1db68b..bbfa0f1195c 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1 +1,2 @@
DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
+DIST epix-1.2.19_withpdf.tar.bz2 1757443 BLAKE2B 4c7d78f27d355e078ebbe81f9c5d9b1d342f4f04d5f91260460d0559bfb7fc8204668072c06c8d493eb739c492b2935bffd24cb77cd554cd863734b7d84ff6e1 SHA512 b51821256ccaf9957562964b1342ee1656d1d8456081869797d8c704df3098d2643135767987b0673aa64a16703cb2e21deea4aef7d1598e67b9661b98245cda
diff --git a/sci-visualization/epix/epix-1.2.19.ebuild b/sci-visualization/epix/epix-1.2.19.ebuild
new file mode 100644
index 00000000000..9324913332a
--- /dev/null
+++ b/sci-visualization/epix/epix-1.2.19.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common bash-completion-r1 autotools
+
+DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
+HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
+SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc emacs examples"
+
+DEPEND="
+ virtual/latex-base
+ dev-texlive/texlive-pstricks
+ dev-texlive/texlive-pictures
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-latexrecommended
+ emacs? ( >=app-editors/emacs-23.1:* )"
+RDEPEND="${DEPEND}"
+SITEFILE=50${PN}-gentoo.el
+
+PATCHES=(
+ "${FILESDIR}/${P}-autotools.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --disable-epix-el
+}
+
+src_install() {
+ default
+ if use emacs; then
+ # do compilation here as the make install target will
+ # create the .el file
+ elisp-compile *.el || die "elisp-compile failed!"
+ elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+ newbashcomp bash_completions epix
+ bashcomp_alias epix flix elaps laps
+ if use doc; then
+ dodoc doc/*gz
+ docompress -x /usr/share/doc/${PF}/manual{.pdf,.ps,_src.tar}.gz
+ fi
+ if use examples; then
+ cd samples || die
+ docinto examples
+ dodoc *.xp *.flx *c *h README
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/sci-visualization/epix/files/epix-1.2.19-autotools.patch b/sci-visualization/epix/files/epix-1.2.19-autotools.patch
new file mode 100644
index 00000000000..403d65444f9
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.19-autotools.patch
@@ -0,0 +1,78 @@
+diff --git a/Makefile.am b/Makefile.am
+index 382230e..a0ff51d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -86,11 +86,6 @@ epix elaps flix laps: %: %.in epix.el
+ -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local
+ chmod a+x $@ $@-local
+
+-# libepix.a
+-libepix.a: $(libepix_a_OBJECTS)
+- ar -ru libepix.a $(libepix_a_OBJECTS)
+- $(RANLIB) libepix.a
+-
+ # object file dependencies
+ $(libepix_a_LIBADD): %.o: %.cc %.h
+
+diff --git a/configure.ac b/configure.ac
+index 9089c35..2d5fe60 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,7 @@ AM_MAINTAINER_MODE
+ dnl Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_LN_S
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index c888b9a..4789c0a 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ # Makefile.am for ePiX v1.x "doc" directory
+ #
+
+-EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
++EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
+
+ %.eepic: %.xp
+ ../epix-local $(EPIXFLAGS) $<
+@@ -13,13 +13,13 @@ EEPICS = $(XPS:.xp=.eepic)
+ CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \
+ *.idx *.ilg *.ind \
+ manual_src.tar manual.pdf manual.ps \
+- manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp
++ manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp
+
+ MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \
+ *.idx *.ilg *.ind
+
+ ## Targets ##
+-doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz
++doc_DATA =
+
+ info_TEXINFOS = epix.texi
+
+@@ -42,7 +42,6 @@ manual.ps.gz: manual-stamp
+
+ #PDF
+ manual.pdf.gz: manual-stamp
+- gzip -9 -c manual.pdf > manual.pdf.gz
+
+ epix.info: manual-stamp epix.texi
+ makeinfo epix.texi
+diff --git a/samples/Makefile.am b/samples/Makefile.am
+index 38bb5cd..7cd7cd4 100644
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -7,7 +7,7 @@ FLX = $(wildcard *.flx)
+ CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
+
+ ## Targets ##
+-doc_DATA = sample_src.tar.gz
++doc_DATA =
+
+
+ # tar up tex, xp, and eepic files
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/epix/, sci-visualization/epix/files/
@ 2021-08-03 13:18 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-08-03 13:18 UTC (permalink / raw
To: gentoo-commits
commit: a254a34c239511c3b6d5ab6a8b331128345e9c6e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 3 12:50:34 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 13:00:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a254a34c
sci-visualization/epix: Drop 1.2.11-r3, EAPI5--
Closes: https://bugs.gentoo.org/790524
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-visualization/epix/Manifest | 1 -
sci-visualization/epix/epix-1.2.11-r3.ebuild | 65 -----------------
.../epix/files/epix-1.2.10-autotools.patch | 85 ----------------------
3 files changed, 151 deletions(-)
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index bbfa0f1195c..24a058d107b 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,2 +1 @@
-DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
DIST epix-1.2.19_withpdf.tar.bz2 1757443 BLAKE2B 4c7d78f27d355e078ebbe81f9c5d9b1d342f4f04d5f91260460d0559bfb7fc8204668072c06c8d493eb739c492b2935bffd24cb77cd554cd863734b7d84ff6e1 SHA512 b51821256ccaf9957562964b1342ee1656d1d8456081869797d8c704df3098d2643135767987b0673aa64a16703cb2e21deea4aef7d1598e67b9661b98245cda
diff --git a/sci-visualization/epix/epix-1.2.11-r3.ebuild b/sci-visualization/epix/epix-1.2.11-r3.ebuild
deleted file mode 100644
index 74786288552..00000000000
--- a/sci-visualization/epix/epix-1.2.11-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp-common bash-completion-r1 autotools epatch
-
-DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
-HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
-SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs examples"
-
-DEPEND="
- virtual/latex-base
- dev-texlive/texlive-pstricks
- dev-texlive/texlive-pictures
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-latexrecommended
- emacs? ( >=app-editors/emacs-23.1:* )"
-RDEPEND="${DEPEND}"
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.2.10-autotools.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --disable-epix-el
-}
-
-src_install() {
- default
- if use emacs; then
- # do compilation here as the make install target will
- # create the .el file
- elisp-compile *.el || die "elisp-compile failed!"
- elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- newbashcomp bash_completions epix
- bashcomp_alias epix flix elaps laps
- if use doc; then
- dodoc doc/*gz
- fi
- if use examples; then
- cd samples || die
- docinto examples
- dodoc *.xp *.flx *c *h README
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/epix/files/epix-1.2.10-autotools.patch b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
deleted file mode 100644
index 03f93cd26c9..00000000000
--- a/sci-visualization/epix/files/epix-1.2.10-autotools.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Nur epix-1.2.10.orig/configure.ac epix-1.2.10/configure.ac
---- epix-1.2.10.orig/configure.ac 2012-11-29 21:04:20.411280150 -0800
-+++ epix-1.2.10/configure.ac 2012-11-29 21:14:00.462163755 -0800
-@@ -9,6 +9,7 @@
- dnl Checks for programs.
- AC_PROG_CXX
- AC_PROG_LN_S
-+AM_PROG_AR
- AC_PROG_RANLIB
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
-diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am
---- epix-1.2.10.orig/doc/Makefile.am 2012-11-29 21:04:20.414280167 -0800
-+++ epix-1.2.10/doc/Makefile.am 2012-11-29 21:04:30.491329674 -0800
-@@ -1,7 +1,7 @@
- # Makefile.am for ePiX v1.x "doc" directory
- #
-
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
-
- %.eepic: %.xp
- ../epix-local $(EPIXFLAGS) $<
-@@ -13,13 +13,13 @@
- CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \
- *.fdx *.flg *.fnd *.idx *.ilg *.ind \
- epix.info epix.info.bz2 manual_src.tar manual.pdf manual.ps \
-- manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp
-+ manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp
-
- MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \
- *.fdx *.flg *.fnd *.idx *.ilg *.ind
-
- ## Targets ##
--doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz
-+doc_DATA =
-
- info_TEXINFOS = epix.texi
-
-@@ -42,8 +42,7 @@
- gzip -9 -c manual.ps > manual.ps.gz
-
- #PDF
--manual.pdf.gz: manual-stamp
-- gzip -9 -c manual.pdf > manual.pdf.gz
-+manual.pdf: manual-stamp
-
- epix.info: manual-stamp epix.texi
- makeinfo epix.texi 2>&1 >/dev/null
-diff -Nur epix-1.2.10.orig/Makefile.am epix-1.2.10/Makefile.am
---- epix-1.2.10.orig/Makefile.am 2012-11-29 21:04:20.415280173 -0800
-+++ epix-1.2.10/Makefile.am 2012-11-29 21:05:52.489734436 -0800
-@@ -56,7 +56,7 @@
-
- EPIX_CONFFILES = bash_completions $(EPIX_EL)
-
--EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
- README THANKS VERSION
-
- EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
-@@ -85,11 +85,6 @@
- -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local
- chmod a+x $@ $@-local
-
--# libepix.a
--libepix.a: $(libepix_a_OBJECTS)
-- ar -ru libepix.a $(libepix_a_OBJECTS)
-- $(RANLIB) libepix.a
--
- # object file dependencies
- $(libepix_a_LIBADD): %.o: %.cc %.h
-
-diff -Nur epix-1.2.10.orig/samples/Makefile.am epix-1.2.10/samples/Makefile.am
---- epix-1.2.10.orig/samples/Makefile.am 2012-11-29 21:04:20.416280179 -0800
-+++ epix-1.2.10/samples/Makefile.am 2012-11-29 21:04:30.491329674 -0800
-@@ -7,7 +7,7 @@
- CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
-
- ## Targets ##
--doc_DATA = sample_src.tar.gz
-+doc_DATA =
-
-
- # tar up tex, xp, and eepic files
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-03 13:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-03 13:18 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/epix/, sci-visualization/epix/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-06-10 12:52 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox