diff options
| -rw-r--r-- | sci-visualization/epix/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-visualization/epix/epix-1.2.10.ebuild | 10 | ||||
| -rw-r--r-- | sci-visualization/epix/epix-1.2.6.ebuild | 27 | ||||
| -rw-r--r-- | sci-visualization/epix/epix-1.2.9.ebuild | 64 | ||||
| -rw-r--r-- | sci-visualization/epix/files/epix-1.2.6-automake.patch | 27 | ||||
| -rw-r--r-- | sci-visualization/epix/metadata.xml | 4 |
6 files changed, 56 insertions, 83 deletions
diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog index 3ee9ce9cd9fe..042da6c798ac 100644 --- a/sci-visualization/epix/ChangeLog +++ b/sci-visualization/epix/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-visualization/epix # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.43 2012/08/06 20:37:06 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.44 2012/11/10 09:49:50 jlec Exp $ + + 10 Nov 2012; Justin Lecher <jlec@gentoo.org> epix-1.2.6.ebuild, + +files/epix-1.2.6-automake.patch, -epix-1.2.9.ebuild, epix-1.2.10.ebuild, + metadata.xml: + Drop old; backport patch for automake-1.11.6 compatibility, #442476 06 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> epix-1.2.10.ebuild: keyword amd64-linux, x86-linux diff --git a/sci-visualization/epix/epix-1.2.10.ebuild b/sci-visualization/epix/epix-1.2.10.ebuild index b8dd23cec1a9..9c703149d23b 100644 --- a/sci-visualization/epix/epix-1.2.10.ebuild +++ b/sci-visualization/epix/epix-1.2.10.ebuild @@ -1,20 +1,22 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.10.ebuild,v 1.3 2012/08/06 20:37:06 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.10.ebuild,v 1.4 2012/11/10 09:49:50 jlec Exp $ EAPI=4 + inherit elisp-common bash-completion-r1 autotools eutils DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)" HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html" SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2" -LICENSE="GPL-2" SLOT="0" +LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc emacs examples" -DEPEND="virtual/latex-base +DEPEND=" + virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra @@ -30,7 +32,7 @@ src_prepare() { src_configure() { econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --disable-epix-el } diff --git a/sci-visualization/epix/epix-1.2.6.ebuild b/sci-visualization/epix/epix-1.2.6.ebuild index 8a15ae60a163..b1549e877690 100644 --- a/sci-visualization/epix/epix-1.2.6.ebuild +++ b/sci-visualization/epix/epix-1.2.6.ebuild @@ -1,31 +1,35 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.6.ebuild,v 1.6 2012/05/21 19:24:17 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.6.ebuild,v 1.7 2012/11/10 09:49:50 jlec Exp $ EAPI=2 -inherit elisp-common bash-completion autotools eutils + +inherit elisp-common bash-completion-r1 autotools eutils DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)" HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html" SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2" -LICENSE="GPL-2" SLOT="0" +LICENSE="GPL-2" KEYWORDS="amd64 ppc x86" IUSE="doc emacs examples" -DEPEND="virtual/latex-base - dev-texlive/texlive-pstricks - dev-texlive/texlive-pictures - dev-texlive/texlive-latexextra - dev-tex/xcolor - emacs? ( virtual/emacs )" +DEPEND=" + virtual/latex-base + dev-texlive/texlive-pstricks + dev-texlive/texlive-pictures + dev-texlive/texlive-latexextra + dev-tex/xcolor + emacs? ( virtual/emacs )" RDEPEND="${DEPEND}" SITEFILE=50${PN}-gentoo.el src_prepare() { # disable automatic install of doc and examples - epatch "${FILESDIR}"/${P}-doc-gentoo.patch + epatch \ + "${FILESDIR}"/${P}-doc-gentoo.patch \ + "${FILESDIR}"/${P}-automake.patch eautoreconf } @@ -44,8 +48,7 @@ src_install() { elisp-install ${PN} *.elc *.el || die "elisp-install failed!" elisp-site-file-install "${FILESDIR}/${SITEFILE}" fi - dobashcompletion bash_completions \ - || die "install of bash completions failed" + dobashcomp bash_completions if use doc; then insinto /usr/share/doc/${PF} doins doc/*gz || die diff --git a/sci-visualization/epix/epix-1.2.9.ebuild b/sci-visualization/epix/epix-1.2.9.ebuild deleted file mode 100644 index fe5d3696fbdf..000000000000 --- a/sci-visualization/epix/epix-1.2.9.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.9.ebuild,v 1.4 2012/05/21 19:24:17 xarthisius Exp $ - -EAPI=4 -inherit elisp-common bash-completion-r1 autotools eutils - -DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)" -HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html" -SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc emacs examples" - -DEPEND="virtual/latex-base - dev-texlive/texlive-pstricks - dev-texlive/texlive-pictures - dev-texlive/texlive-latexextra - dev-tex/xcolor - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND}" -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.2.9-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 - dobashcomp bash_completions - if use doc; then - insinto /usr/share/doc/${PF} - doins doc/*gz - fi - if use examples; then - cd samples - insinto /usr/share/doc/${PF}/examples - doins *.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.6-automake.patch b/sci-visualization/epix/files/epix-1.2.6-automake.patch new file mode 100644 index 000000000000..80e9fb2b3566 --- /dev/null +++ b/sci-visualization/epix/files/epix-1.2.6-automake.patch @@ -0,0 +1,27 @@ + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 366c582..2edbfe0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -15,7 +15,7 @@ SUBDIRS = . samples doc + bin_SCRIPTS = epix elaps flix laps + + pkglib_LIBRARIES = libepix.a +-pkglib_DATA = epix-lib.sh ++pkgdata_DATA = epix-lib.sh + include_HEADERS = epix.h + + libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \ +@@ -107,8 +107,8 @@ install-data-local: + $(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config + + # This is being installed by install-exec, but should not be executable +-install-exec-local: install-pkglibDATA +- chmod a-x $(DESTDIR)$(pkglibdir)/epix-lib.sh ++install-exec-local: install-pkgdataDATA ++ chmod a-x $(DESTDIR)$(pkgdatadir)/epix-lib.sh + + uninstall-local: + -rm -rf $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config diff --git a/sci-visualization/epix/metadata.xml b/sci-visualization/epix/metadata.xml index 99968f74811f..f946cb30e669 100644 --- a/sci-visualization/epix/metadata.xml +++ b/sci-visualization/epix/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci</herd> -<longdescription lang="en"> + <herd>sci</herd> + <longdescription lang="en"> ePiX creates mathematically accurate figures, plots, and movies using easy-to-learn syntax. The output is expressly suitable for use with LaTeX; figures may be written in a LaTeX picture |