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

Package-Manager: portage-2.1.4.4

5 files changed, 70 insertions, 77 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/Manifest b/sci-visualization/epix/Manifest
index 5d3ebd0def2d..8676e1bc504c 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -2,13 +2,11 @@ AUX 50epix-gentoo.el 298 RMD160 cf3db606d04a04c8695828c9b870df5dc425d75e SHA1 ae
 AUX epix-1.1.15-doc-gentoo.patch 1696 RMD160 74679636dffd8a924b98774dcc4e387299e60ec9 SHA1 860c3cc158a1f64e227f92f5992316acc9fe1bc4 SHA256 bc1d232eabedc0d94de4835769a609e08bdc81e23c121a7e06c0aa3f14188993
 AUX epix-1.1.17-doc-gentoo.patch 1664 RMD160 5eb0795eec9b65bc1cad663a61cf609e0544cffc SHA1 46c3b9a10611d2ca89a828f161d98183ecf05af6 SHA256 d03dc2a572be64117df7d0cde14afa7f90e05172b85fda4d938f21721e23c08b
 AUX epix-doc-gentoo.patch 2802 RMD160 0598b276ec7d316cae7da513642069a3d6e96410 SHA1 2c4a4825445d8647503a8b44b5a0477f16480238 SHA256 263ecb5894cff45dd20ac769184578bad40dd5bc496dae97cafa3a73fe50a326
-DIST epix-1.0.24.tar.bz2 636271 RMD160 3be9f0b0048018cb5e2c4a3fa3f3fc17bab64afb SHA1 8dc8509f84dd3a128563e0b4ff62c2f2f992e613 SHA256 943ca33df2dd7406bd69da4096119053af337554dc55e7ab2c9480e449898f7e
-DIST epix-1.0.7_complete.tar.bz2 273787 RMD160 db2f5db97af679d013060f8061e9b5262038f824 SHA1 51d3e1cc74e0a8cd6a4d897f0f3b06c8bdabff98 SHA256 97f20c2be145c9794ea57955215f6d9245a6d7d0afe45908c90f3ec1ed42e41d
 DIST epix-1.2.1_withpdf.tar.bz2 1498603 RMD160 b46f9ac70488f4dab617b9235ec430b227dae759 SHA1 caf0e260573fe57d4fdffec32b49cf78f8842cca SHA256 c5083182b1a1c8761a76a9062b16c59f9417644e092f16b54f49336cc6417b66
 DIST epix-1.2.2_withpdf.tar.bz2 1516297 RMD160 1ac1d91f60d79d2d0a8720e9018e63f07281ce2d SHA1 487278c8ed108ed4257f196f10324d7d697674ce SHA256 bb6c1e452030e535add7babc4274622f1eca36eaf044d21fb7e94bce0b612863
-EBUILD epix-1.0.24.ebuild 935 RMD160 c17f814abec29834973fb345dacac7aebb52fe62 SHA1 4c86a2858c212aeae8e41cc6c80bc0733aefd649 SHA256 c200f05cb4c5b9bbd030845694f7a7607e1b87a0377246a466f285a5a02453e2
-EBUILD epix-1.0.7.ebuild 944 RMD160 0655fdc6c29cebfda0a18aaebad61def4559074e SHA1 7ddfcf9da67980c16a6f5efadea183b4aaec8de9 SHA256 1fe79ac5d323dd93ac90cdfb6da1abf903c39d294b49e344468dfe9f63a84b00
+DIST epix-1.2.4_withpdf.tar.bz2 1558113 RMD160 b4d7525b93fdad78b2f51983470bc776e3d99a31 SHA1 6f5ab1661a1000e91f48075169fa708951c913bf SHA256 2054deca2aa9e63e5dd423d55fa0d62c3e42dbc17ba9f3fe658594b035a2ee54
 EBUILD epix-1.2.1.ebuild 1666 RMD160 a4a586c2ad931445c69bca0d20e3c742c1895940 SHA1 7520012546716fe1c933e12c3c5e23d63d6294c7 SHA256 f7ad803cf3319a680cfdb860a6c9935a6b8d0fea77e1751f6b1b762051afe159
 EBUILD epix-1.2.2.ebuild 1669 RMD160 a80afcaf3b1c1c88512e6ceb97a186d55e2c44fc SHA1 321af83f58f4c80bb9776261bd32dee74edb5ce8 SHA256 d2b8f493e6dd352929ecedeb34c4eca25363661e78b5868cd6e382996adb228e
-MISC ChangeLog 5675 RMD160 a65f739d170d000aa7ee83dfa34cfbae2b79895f SHA1 cef42fb65e2788f1ffa92575728991415ae3eb2b SHA256 b26fc74aa01c5780ae7ba09d86a7d6f9bfcdec447d30364ccbf44ccce072e6bd
+EBUILD epix-1.2.4.ebuild 1669 RMD160 f251f85fa90ec6d0150650aaa2c0d5add1e6db06 SHA1 787993d4ba7c2f1fd8fec1f6fdac9fd8f8efe3ba SHA256 93f4944cca9e1a08fb6c55316259f395040da757454d112039c01bd04ac518cc
+MISC ChangeLog 5904 RMD160 c56b20e52ca60efb62c0241e8820c7e88f656dd6 SHA1 621715b7cc8f4d65b139000ab05e00def0fe80eb SHA256 13a915ebf3bb94cbd0e991e71a405934fc413d0fe66d357a656eac6df9f12951
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
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
+}