6 files changed, 120 insertions, 115 deletions
diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog
index a17b380a9859..e6f80fc863a5 100644
--- a/sci-visualization/epix/ChangeLog
+++ b/sci-visualization/epix/ChangeLog
@@ -1,6 +1,14 @@
 # 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.29 2008/11/08 18:26:46 maekke Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.30 2009/04/13 17:27:38 bicatali Exp $
+
+*epix-1.2.6 (13 Apr 2009)
+
+  13 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/epix-1.1.15-doc-gentoo.patch, +files/epix-1.2.6-doc-gentoo.patch,
+  -files/epix-doc-gentoo.patch, metadata.xml, -epix-1.2.4.ebuild,
+  +epix-1.2.6.ebuild:
+  Bump and cleaning
 
   08 Nov 2008; Markus Meier <maekke@gentoo.org> epix-1.2.5.ebuild:
   amd64/x86 stable, bug #245713
diff --git a/sci-visualization/epix/epix-1.2.4.ebuild b/sci-visualization/epix/epix-1.2.6.ebuild
index 3e832365f136..e23273760519 100644
--- a/sci-visualization/epix/epix-1.2.4.ebuild
+++ b/sci-visualization/epix/epix-1.2.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.6.ebuild,v 1.1 2009/04/13 17:27:38 bicatali Exp $
 
-inherit elisp-common flag-o-matic toolchain-funcs bash-completion
+EAPI=2
+inherit elisp-common bash-completion autotools
 
 DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
 HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html"
@@ -11,30 +12,29 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="emacs"
+IUSE="doc emacs examples"
 
 DEPEND="virtual/latex-base
 		|| ( ( dev-texlive/texlive-pstricks
-				dev-texlive/texlive-pictures
-				dev-texlive/texlive-latexextra
-				dev-tex/xcolor )
+			   dev-texlive/texlive-pictures
+			   dev-texlive/texlive-latexextra
+			   dev-tex/xcolor )
 			app-text/tetex
 			app-text/ptex )
 		emacs? ( virtual/emacs )"
-
+RDEPEND="${DEPEND}"
 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_prepare() {
+	# disable automatic install of doc and examples
+	epatch "${FILESDIR}"/${P}-doc-gentoo.patch
+	eautoreconf
 }
 
-src_compile() {
-	econf --disable-epix-el || die "configure failed"
-	emake || die "compile failed"
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-epix-el
 }
 
 src_install() {
@@ -48,6 +48,15 @@ src_install() {
 	fi
 	dobashcompletion bash_completions \
 		|| die "install of bash completions failed"
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/*gz || die
+	fi
+	if use examples; then
+		cd samples
+		insinto /usr/share/doc/${PF}/examples
+		doins *.xp *.flx *c *h README || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/sci-visualization/epix/files/epix-1.1.15-doc-gentoo.patch b/sci-visualization/epix/files/epix-1.1.15-doc-gentoo.patch
deleted file mode 100644
index e76799388414..000000000000
--- a/sci-visualization/epix/files/epix-1.1.15-doc-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur epix-1.1.15/Makefile.in epix-1.1.15.new/Makefile.in
---- epix-1.1.15/Makefile.in	2007-08-31 11:35:04.000000000 -0400
-+++ epix-1.1.15.new/Makefile.in	2007-09-09 09:59:07.000000000 -0400
-@@ -300,7 +300,7 @@
- libepix_a_LIBADD = $(libepix_a_CXXSOURCES:.cc=.o)
- man_MANS = epix.1 elaps.1 flix.1 laps.1
- EPIX_CONFFILES = bash_completions epix.el
--EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog INSTALL NEWS POST-INSTALL \
- 	README THANKS VERSION
- 
- EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
-@@ -999,9 +999,8 @@
- # Extra things to install
- install-data-local: epix.el
- 	@echo; echo "Installing notes and configuration files"
--	./mkinstalldirs $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
--	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)/notes
--	$(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config
-+	./mkinstalldirs $(DESTDIR)$(docdir) 
-+	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)
- 
- # This is being installed by install-exec, but should not be executable
- install-exec-local: install-pkglibDATA
-diff -Naur epix-1.1.15/doc/Makefile.in epix-1.1.15.new/doc/Makefile.in
---- epix-1.1.15/doc/Makefile.in	2007-08-31 11:35:03.000000000 -0400
-+++ epix-1.1.15.new/doc/Makefile.in	2007-09-09 09:57:57.000000000 -0400
-@@ -148,7 +148,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
- XPS := $(wildcard *.xp)
- EEPICS = $(XPS:.xp=.eepic)
- CLEANFILES = *~ *.aux *.dvi *.log *.out *.idx *.ilg *.ind *.toc \
diff --git a/sci-visualization/epix/files/epix-1.2.6-doc-gentoo.patch b/sci-visualization/epix/files/epix-1.2.6-doc-gentoo.patch
new file mode 100644
index 000000000000..ce0ec81fb71a
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.6-doc-gentoo.patch
@@ -0,0 +1,74 @@
+diff -Nura epix-1.2.6.orig/doc/Makefile.am epix-1.2.6/doc/Makefile.am
+--- epix-1.2.6.orig/doc/Makefile.am	2009-02-16 02:16:58.000000000 +0000
++++ epix-1.2.6/doc/Makefile.am	2009-04-13 18:11:18.310702097 +0100
+@@ -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 -Nura epix-1.2.6.orig/Makefile.am epix-1.2.6/Makefile.am
+--- epix-1.2.6.orig/Makefile.am	2008-07-01 03:48:22.000000000 +0100
++++ epix-1.2.6/Makefile.am	2009-04-13 17:58:15.273913638 +0100
+@@ -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) \
+@@ -102,9 +102,8 @@
+ # Extra things to install
+ install-data-local:
+ 	@echo; echo "Installing notes and configuration files"
+-	./mkinstalldirs $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
+-	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)/notes
+-	$(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config
++	./mkinstalldirs $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)
+ 
+ # This is being installed by install-exec, but should not be executable
+ install-exec-local: install-pkglibDATA
+diff -Nura epix-1.2.6.orig/samples/Makefile.am epix-1.2.6/samples/Makefile.am
+--- epix-1.2.6.orig/samples/Makefile.am	2008-07-01 03:55:14.000000000 +0100
++++ epix-1.2.6/samples/Makefile.am	2009-04-13 18:11:31.096963306 +0100
+@@ -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
diff --git a/sci-visualization/epix/files/epix-doc-gentoo.patch b/sci-visualization/epix/files/epix-doc-gentoo.patch
deleted file mode 100644
index d10060faf557..000000000000
--- a/sci-visualization/epix/files/epix-doc-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur epix-1.0.7-old/Makefile.in epix-1.0.7/Makefile.in
---- epix-1.0.7-old/Makefile.in	2006-05-19 17:33:19.000000000 -0400
-+++ epix-1.0.7/Makefile.in	2006-06-06 17:44:06.000000000 -0400
-@@ -242,7 +242,7 @@
- #
- man_MANS = epix.1 elaps.1 flix.1 laps.1
- EPIX_CONFFILES = bash_completions epix.ebuild epix.el epix.spec
--EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
- 	README README-changes README-porting THANKS VERSION
- 
- EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES)
-@@ -889,9 +889,8 @@
- # Extra things to install
- install-data-local:
- 	@echo; echo "Installing notes and configuration files"
--	./mkinstalldirs $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
--	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)/notes
--	$(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config
-+	./mkinstalldirs $(DESTDIR)$(docdir) 
-+	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)
- 
- # This is being installed by install-exec, but should not be executable
- install-exec-local: install-pkglibDATA
-diff -Naur epix-1.0.7-old/contrib/doc/Makefile.in epix-1.0.7/contrib/doc/Makefile.in
---- epix-1.0.7-old/contrib/doc/Makefile.in	2006-05-19 17:33:18.000000000 -0400
-+++ epix-1.0.7/contrib/doc/Makefile.in	2006-06-06 17:45:36.000000000 -0400
-@@ -145,7 +145,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- docdir = $(datadir)/doc/epix
--EPIXFLAGS = --no-defaults -I.. -I../.. -L.. -L../.. -lepixext -lepix -v
-+EPIXFLAGS = --no-defaults -I.. -I../.. -L.. -L../.. -lepixext -lepix -q
- XPS := $(wildcard *.cc)
- EEPICS = $(XPS:.cc=.eepic)
- CLEANFILES = *~ *.dvi *.log contrib_src.tar contrib_src.tar.gz \
-diff -Naur epix-1.0.7-old/doc/Makefile.in epix-1.0.7/doc/Makefile.in
---- epix-1.0.7-old/doc/Makefile.in	2006-05-19 17:33:19.000000000 -0400
-+++ epix-1.0.7/doc/Makefile.in	2006-06-06 17:45:12.000000000 -0400
-@@ -145,7 +145,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- docdir = $(datadir)/doc/epix
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
- XPS := $(wildcard *.xp)
- EEPICS = $(XPS:.xp=.eepic)
- CLEANFILES = *~ *.dvi *.log *.out *.ilg *.idx \
-diff -Naur epix-1.0.7-old/samples/Makefile.in epix-1.0.7/samples/Makefile.in
---- epix-1.0.7-old/samples/Makefile.in	2006-05-19 17:33:19.000000000 -0400
-+++ epix-1.0.7/samples/Makefile.in	2006-06-06 17:44:06.000000000 -0400
-@@ -145,7 +145,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- docdir = $(datadir)/doc/epix
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
- XPS := $(wildcard *.xp)
- EEPICS = $(XPS:.xp=.eepic)
- CLEANFILES = *~ *.dvi *.log *.out *.ilg sample_src.tar sample.pdf sample.ps \
diff --git a/sci-visualization/epix/metadata.xml b/sci-visualization/epix/metadata.xml
index b229aec85b8f..99968f74811f 100644
--- a/sci-visualization/epix/metadata.xml
+++ b/sci-visualization/epix/metadata.xml
@@ -2,4 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <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
+  environment containing PSTricks, tikz, or eepic macros, or as vector
+  (EPS or PDF) image files. The user interface resembles that of
+  LaTeX: You prepare a human-readable scene description in a text
+  editor, then compile the input file into a picture.
+  use ePiX, however. 
+</longdescription>
 </pkgmetadata>