Version bump

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 98 insertions, 113 deletions

diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog
index 7c03ce6eff01..118bced69388 100644
--- a/sci-visualization/epix/ChangeLog
+++ b/sci-visualization/epix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/epix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.33 2010/01/20 20:03:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.34 2010/05/04 22:38:17 bicatali Exp $
+
+*epix-1.2.7 (04 May 2010)
+
+  04 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/epix-1.1.17-doc-gentoo.patch, -epix-1.2.1.ebuild,
+  -epix-1.2.5.ebuild, +epix-1.2.7.ebuild,
+  +files/epix-1.2.7-doc-gentoo.patch:
+  Version bump
 
   20 Jan 2010; Markus Meier <maekke@gentoo.org> epix-1.2.6.ebuild:
   amd64/x86 stable, bug #299845
diff --git a/sci-visualization/epix/epix-1.2.5.ebuild b/sci-visualization/epix/epix-1.2.5.ebuild
deleted file mode 100644
index 4819b62a17bd..000000000000
--- a/sci-visualization/epix/epix-1.2.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.5.ebuild,v 1.4 2009/05/30 08:58:20 ulm 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/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
-}
diff --git a/sci-visualization/epix/epix-1.2.1.ebuild b/sci-visualization/epix/epix-1.2.7.ebuild
index 26835a84a925..7c42433bc3bb 100644
--- a/sci-visualization/epix/epix-1.2.1.ebuild
+++ b/sci-visualization/epix/epix-1.2.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.1.ebuild,v 1.6 2009/05/30 08:58:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.7.ebuild,v 1.1 2010/05/04 22:38:17 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"
@@ -10,30 +11,29 @@ SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="emacs"
+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 )
+			   dev-texlive/texlive-pictures
+			   dev-texlive/texlive-latexextra
+			   dev-tex/xcolor )
 			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() {
@@ -47,6 +47,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.17-doc-gentoo.patch b/sci-visualization/epix/files/epix-1.1.17-doc-gentoo.patch
deleted file mode 100644
index f34f40f1ce5e..000000000000
--- a/sci-visualization/epix/files/epix-1.1.17-doc-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur epix-1.1.17/Makefile.in epix-1.1.17.new/Makefile.in
---- epix-1.1.17/Makefile.in	2007-09-13 20:38:09.000000000 -0400
-+++ epix-1.1.17.new/Makefile.in	2007-09-15 08:58:30.000000000 -0400
-@@ -290,7 +290,7 @@
- man_MANS = epix.1 elaps.1 flix.1 laps.1
- @NOINSTALL_LISP_FALSE@EPIX_EL = epix.el
- 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) \
-@@ -1009,9 +1009,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.1.17/doc/Makefile.in epix-1.1.17.new/doc/Makefile.in
---- epix-1.1.17/doc/Makefile.in	2007-09-13 20:38:08.000000000 -0400
-+++ epix-1.1.17.new/doc/Makefile.in	2007-09-15 08:58:51.000000000 -0400
-@@ -150,7 +150,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.7-doc-gentoo.patch b/sci-visualization/epix/files/epix-1.2.7-doc-gentoo.patch
new file mode 100644
index 000000000000..676fbb44977f
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.7-doc-gentoo.patch
@@ -0,0 +1,62 @@
+diff -Nur epix-1.2.7.orig/doc/Makefile.am epix-1.2.7/doc/Makefile.am
+--- epix-1.2.7.orig/doc/Makefile.am	2010-05-05 00:12:18.000000000 +0100
++++ epix-1.2.7/doc/Makefile.am	2010-05-05 00:15:05.000000000 +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 -Nur epix-1.2.7.orig/Makefile.am epix-1.2.7/Makefile.am
+--- epix-1.2.7.orig/Makefile.am	2010-05-05 00:12:18.000000000 +0100
++++ epix-1.2.7/Makefile.am	2010-05-05 00:15:48.000000000 +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) \
+diff -Nur epix-1.2.7.orig/samples/Makefile.am epix-1.2.7/samples/Makefile.am
+--- epix-1.2.7.orig/samples/Makefile.am	2010-05-05 00:12:18.000000000 +0100
++++ epix-1.2.7/samples/Makefile.am	2010-05-05 00:16:39.000000000 +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