Version bump (fixes gcc4.3 issues reported in #226965) and removed old ebuilds.

(Portage version: 2.1.4.4)

4 files changed, 67 insertions, 72 deletions

diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog
index e5dff6c0268b..3b31d6d91129 100644
--- a/sci-visualization/epix/ChangeLog
+++ b/sci-visualization/epix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/epix
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.25 2008/03/17 02:19:29 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.26 2008/06/15 10:55:27 markusle Exp $
+
+*epix-1.2.4 (15 Jun 2008)
+
+  15 Jun 2008; Markus Dittrich <markusle@gentoo.org> -epix-1.0.7.ebuild,
+  -epix-1.0.24.ebuild, +epix-1.2.4.ebuild:
+  Version bump (fixes gcc4.3 issues reported in #226965) and removed 
+  old ebuilds.
 
   17 Mar 2008; Kenneth Prugh <ken69267@gentoo.org> epix-1.2.1.ebuild:
   amd64 stable, bug #205779
diff --git a/sci-visualization/epix/epix-1.0.24.ebuild b/sci-visualization/epix/epix-1.0.24.ebuild
deleted file mode 100644
index 0a92e9e81390..000000000000
--- a/sci-visualization/epix/epix-1.0.24.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.0.24.ebuild,v 1.2 2007/06/11 08:42:11 cryos Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-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}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="virtual/tetex"
-
-RDEPEND="app-shells/bash
-		>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -e 's:doc/${PACKAGE_TARNAME}:doc/${PACKAGE_TARNAME}-${PACKAGE_VERSION}:' \
-	-i configure || die "sed on configure failed"
-
-	sed -e "s:stdout:null:" -e "s:stderr:null:" -i epix-lib.sh || \
-		die "failed to fix epix-lib"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}
diff --git a/sci-visualization/epix/epix-1.0.7.ebuild b/sci-visualization/epix/epix-1.0.7.ebuild
deleted file mode 100644
index da4ce6b6ab3e..000000000000
--- a/sci-visualization/epix/epix-1.0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.0.7.ebuild,v 1.4 2006/08/29 20:32:34 dertobi123 Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-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}_complete.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/tetex"
-
-RDEPEND="app-shells/bash
-		>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-doc-gentoo.patch
-	sed -e "s:/doc/${PN}:/doc/${P}:" -i Makefile.in doc/Makefile.in \
-		samples/Makefile.in
-}
-
-src_compile() {
-	econf || die "failed to configure"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}
diff --git a/sci-visualization/epix/epix-1.2.4.ebuild b/sci-visualization/epix/epix-1.2.4.ebuild
new file mode 100644
index 000000000000..3e832365f136
--- /dev/null
+++ b/sci-visualization/epix/epix-1.2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.4.ebuild,v 1.1 2008/06/15 10:55:27 markusle Exp $
+
+inherit elisp-common flag-o-matic toolchain-funcs bash-completion
+
+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="emacs"
+
+DEPEND="virtual/latex-base
+		|| ( ( dev-texlive/texlive-pstricks
+				dev-texlive/texlive-pictures
+				dev-texlive/texlive-latexextra
+				dev-tex/xcolor )
+			app-text/tetex
+			app-text/ptex )
+		emacs? ( virtual/emacs )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.1.17-doc-gentoo.patch
+	sed -e 's:doc/${PACKAGE_TARNAME}:doc/${PACKAGE_TARNAME}-${PACKAGE_VERSION}:' \
+	-i configure || die "sed on configure failed"
+}
+
+src_compile() {
+	econf --disable-epix-el || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	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
+	dobashcompletion bash_completions \
+		|| die "install of bash completions failed"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}