Version bump

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

5 files changed, 142 insertions, 125 deletions

diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog
index a12b73f60655..48ac706de71d 100644
--- a/sci-visualization/epix/ChangeLog
+++ b/sci-visualization/epix/ChangeLog
@@ -1,6 +1,13 @@
 # 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.40 2012/02/19 17:04:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.41 2012/04/25 15:26:40 bicatali Exp $
+
+*epix-1.2.10 (25 Apr 2012)
+
+  25 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  files/epix-1.2.9-autotools.patch, +epix-1.2.10.ebuild,
+  +files/epix-1.2.10-autotools.patch:
+  Version bump
 
   19 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org>
   -files/epix-1.2.7-doc-gentoo.patch, -epix-1.2.8.ebuild, epix-1.2.9.ebuild,
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 9250b85618a2..1ccfe14d27b7 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 AUX 50epix-gentoo.el 298 RMD160 cf3db606d04a04c8695828c9b870df5dc425d75e SHA1 aee1c361f181625fcf34bf12fc2a8d54b8595b24 SHA256 5aa1fc2e45f9c544f4cfc95a803a2540a42ef766258eecbb3d166b158565d219
+AUX epix-1.2.10-autotools.patch 2092 RMD160 05cbe47c984ac9da7b744a835e4211e96cffd523 SHA1 0328ae38dbbe3d8cd6c26b9526accaa9a7f6e47f SHA256 6ff9941eddf040bcd9b2667d4a39eb64a5f77583ff94277e2ddc44fdbc6241c6
 AUX epix-1.2.6-doc-gentoo.patch 2613 RMD160 51814fc3ed8fc00cdb097f2090c4cf6168408b1a SHA1 4efd409d05342e2d6ec425c1883d566f2b070b12 SHA256 f0368e0a08e26051070816f24503b01b1eada43ec8e5b022643b144998f51513
-AUX epix-1.2.9-autotools.patch 7204 RMD160 96398d7f9c2ec90bc9e97a2fa476439e7fe1447b SHA1 9206d712242ceb986535ec2dc0e1ca157522d6b0 SHA256 b86483b07f00264dafa7c7703045b17bdac4a0f84222725e278616c6966967b3
+AUX epix-1.2.9-autotools.patch 3201 RMD160 f0198ac797e13984ed2f871d1c6e69d1fc098b78 SHA1 5c093ac2cf713553e9a013142a38f478712c9d60 SHA256 4f11917a828e1b3bc3fd1683ffeb39438758a66f523d75396b2b2dbc0f53c89a
+DIST epix-1.2.10_withpdf.tar.bz2 1704245 RMD160 eb0e03e21d906a7be809c485b4e6bcafa66626ac SHA1 06c0d186c72fc3a9110871670f29f6d3644b5c7b SHA256 ff211a4a0b946a7bff81a1e96dadefbcccd8c7c92d04fbf739b7ff55ba534c5f
 DIST epix-1.2.6_withpdf.tar.bz2 1736850 RMD160 6d47689f42ed4631338bee8b27d00fede8eb97e3 SHA1 c88b256fbcb40c1a94cc979c67eee930a6e24ed0 SHA256 9c377bcf8556bd91f46322e618a8e2d607ebc64e41b2cc57483aa87f414490db
 DIST epix-1.2.9_withpdf.tar.bz2 1701229 RMD160 d031eae4d2f757ed1bb5a1ae57322a0808b7a35d SHA1 1c42e0131fdde99c6bf60881bf09f20c69910877 SHA256 c8735b6f4a5732586d2ec25268ba98186ef00638943642dfcb40cae4f7887653
+EBUILD epix-1.2.10.ebuild 1575 RMD160 0ab77a5f56c53003f7eae37f6a8f72ee7c041ff4 SHA1 0501dade6b4dc0f0369b92806620151f78cfeaee SHA256 db32c98d05ea2b26108ff1cd0ba9f9c1c04ea759a61a00e17b250e47b4b449bd
 EBUILD epix-1.2.6.ebuild 1716 RMD160 7e1425040dcc1710bab7828551ec28c2cb1543c8 SHA1 22c3b7f05f170bd3148d13a1235855a17ba4e9c4 SHA256 9234c750128cb682fe5f557a3910811e1fed6f28eecfeabc1ae212183682ea4c
 EBUILD epix-1.2.9.ebuild 1573 RMD160 8171d6d53aa93dbb4a60ddbe79667afbd3259a55 SHA1 8fdc024c1c68e6a0a924aceeeeb8e4389888c139 SHA256 02a9b2f66f0c674a42681d11c920157792ffc57e7cc9230d94f7ad2f76a5774d
-MISC ChangeLog 8013 RMD160 c2613c5511c366de0305de8b34ed21d51b479bde SHA1 34f44a411ef09a00861014568c945ee5d63c06af SHA256 c300adcd13406a4443e8b8057c2b5a558105ee53366243bdd6247f67b3d7b048
+MISC ChangeLog 8207 RMD160 d678fd542884b608df008400c0032cdf0a9f686a SHA1 86cb108a4340d1015beb45002ada2991ff7c9fe4 SHA256 2d07224335423d6a5599715c994f4ff0121aa0bb0b868e93637263417b840352
 MISC metadata.xml 674 RMD160 b9ef5d9bd4c2a378d20e8b2abf7e49aa009d2404 SHA1 0bbed1bb0008d1dd7710b029ca04a743a0caa1e5 SHA256 ddb3fcaa3745e042ed7ef3e79faf17ce4d6264ff48261c0e2a5466964908edae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9BK6kACgkQ1ycZbhPLE2BtAQCfRXUToDgmkz2JHqiEC7XmqQI3
-UmgAnj7406cDQv30NeTQ99sg3NvE+Nh9
-=oofp
+iEYEARECAAYFAk+YF7gACgkQ1ycZbhPLE2ADeACeKFqifJJvR6xob+tMbXqx2KcJ
+rrwAn0tji/Kb4JBTxeH0xbRBHMN4VrHr
+=sgTb
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/epix/epix-1.2.10.ebuild b/sci-visualization/epix/epix-1.2.10.ebuild
new file mode 100644
index 000000000000..aa6c3a9c24fe
--- /dev/null
+++ b/sci-visualization/epix/epix-1.2.10.ebuild
@@ -0,0 +1,64 @@
+# 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.1 2012/04/25 15:26:40 bicatali Exp $
+
+EAPI=4
+inherit elisp-common bash-completion-r1 autotools
+
+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.10-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.10-autotools.patch b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
new file mode 100644
index 000000000000..a7b815b0e444
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
@@ -0,0 +1,62 @@
+diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am
+--- epix-1.2.10.orig/doc/Makefile.am	2012-04-25 05:01:04.000000000 +0100
++++ epix-1.2.10/doc/Makefile.am	2012-04-25 05:01:27.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.10.orig/Makefile.am epix-1.2.10/Makefile.am
+--- epix-1.2.10.orig/Makefile.am	2012-04-25 05:01:04.000000000 +0100
++++ epix-1.2.10/Makefile.am	2012-04-25 05:01:27.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.10.orig/samples/Makefile.am epix-1.2.10/samples/Makefile.am
+--- epix-1.2.10.orig/samples/Makefile.am	2012-04-25 05:01:04.000000000 +0100
++++ epix-1.2.10/samples/Makefile.am	2012-04-25 05:01:27.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
diff --git a/sci-visualization/epix/files/epix-1.2.9-autotools.patch b/sci-visualization/epix/files/epix-1.2.9-autotools.patch
index 05b40d2810f1..ebceb98dc309 100644
--- a/sci-visualization/epix/files/epix-1.2.9-autotools.patch
+++ b/sci-visualization/epix/files/epix-1.2.9-autotools.patch
@@ -80,125 +80,6 @@ diff -Nur epix-1.2.9.orig/Makefile.am epix-1.2.9/Makefile.am
  
  uninstall-local:
  	-rm -rf $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
-diff -Nur epix-1.2.9.orig/Makefile.am~ epix-1.2.9/Makefile.am~
---- epix-1.2.9.orig/Makefile.am~	1970-01-01 01:00:00.000000000 +0100
-+++ epix-1.2.9/Makefile.am~	2012-02-19 16:46:02.000000000 +0000
-@@ -0,0 +1,115 @@
-+## epix-1.x Makefile.am for top-level directory
-+##
-+## Process this file with automake to produce Makefile.in
-+
-+#if BUILD_CONTRIB
-+  # Must be in this order!
-+#  MAYBE_DIRS = contrib contrib/doc
-+#endif
-+
-+# SUBDIRS = . samples doc $(MAYBE_DIRS)
-+SUBDIRS = . samples doc
-+
-+# Now stuff for this directory specifically
-+
-+bin_SCRIPTS = epix elaps flix laps
-+
-+pkglib_LIBRARIES = libepix.a
-+pkglib_DATA = epix-lib.sh
-+include_HEADERS = epix.h
-+
-+libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \
-+	arrow_data.cc arrow_style.cc axis.cc camera.cc circle.cc clipping.cc \
-+	Color_Base.cc Color.cc Color_CMY.cc Color_CMYK.cc Color_Gray.cc \
-+	Color_Neutral.cc Color_RGB.cc Color_Sep.cc Color_Utils.cc \
-+	cropping.cc curves.cc \
-+	data_bins.cc data_file.cc data_mask.cc domain.cc \
-+	eepic.cc facet.cc format.cc frac.cc frame.cc functions.cc \
-+	geometry.cc glyph.cc halfspace.cc hatching.cc \
-+	intersections.cc interval.cc label_data.cc label_style.cc \
-+	legend.cc legend_item.cc legend_tile.cc \
-+	length.cc lens.cc markers.cc marker_style.cc \
-+	mask_diamond.cc mask_ellipse.cc mask_rectangle.cc \
-+	paint_style.cc pairs.cc path.cc path_data.cc \
-+	path_style.cc pen_arrow.cc pen_data.cc pen_fill.cc pen_line.cc \
-+	picture.cc picture_data.cc plane.cc plots.cc pst.cc \
-+	screen.cc screen_crop.cc screen_data.cc screen_mask.cc \
-+	segment.cc spline.cc sphere.cc state.cc surface.cc tikz.cc tile.cc \
-+	triples.cc utils.cc verbatim.cc
-+#	polygon.cc 
-+
-+libepix_a_HDRS = $(libepix_a_CXXSOURCES:.cc=.h) constants.h \
-+	crop_algorithms.h deriv.h edge_data.h enums.h errors.h \
-+	map.h plot_algorithms.h spline_data.h
-+
-+libepix_a_SOURCES = $(libepix_a_CXXSOURCES) $(libepix_a_HDRS)
-+
-+libepix_a_LIBADD = $(libepix_a_CXXSOURCES:.cc=.o)
-+
-+pkginclude_HEADERS = $(libepix_a_HDRS)
-+
-+man_MANS = epix.1 elaps.1 flix.1 laps.1
-+
-+if ENABLE_EPIX_EL
-+  EPIX_EL = epix.el
-+endif
-+
-+EPIX_CONFFILES = bash_completions $(EPIX_EL)
-+
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
-+	README THANKS VERSION
-+
-+EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
-+	$(pkgdata_DATA)
-+
-+CLEANFILES = *~ $(libepix_a_OBJECTS) $(bin_SCRIPTS) $(bin_SCRIPTS:=-local) \
-+	epix.h epix.1 epix.el
-+
-+# Headers
-+epix.h: $(libepix_a_HDRS)
-+	./make_header
-+
-+# Scripts; we create local variants which will work during the build process
-+epix elaps flix laps: %: %.in epix.el
-+	sed -e 's%^#! /bin/bash%#! $(BASH_PATH)%;' \
-+	    -e 's%@bindir\@%$(bindir)%;' \
-+	    -e 's%@pkglibdir\@%$(pkglibdir)%;' \
-+	    -e 's%@includedir\@%$(includedir)%;' \
-+	    -e 's%@RUNTIME_COMPILER\@%$(RUNTIME_COMPILER)%;' $< > $@
-+	sed -e 's%^#! /bin/bash%#! $(BASH_PATH)%;' \
-+	    -e 's%@bindir\@%$(CURDIR)%;' \
-+	    -e 's%@pkglibdir\@%$(CURDIR)%;' \
-+	    -e 's%@includedir\@%$(CURDIR)%;' \
-+	    -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local
-+	chmod a+x $@ $@-local
-+
-+# libepix.a
-+libepix.a: $(libepix_a_OBJECTS)
-+	ar -ru libepix.a $(libepix_a_OBJECTS)
-+	$(RANLIB) libepix.a
-+
-+# object file dependencies
-+$(libepix_a_LIBADD): %.o: %.cc %.h
-+
-+# Manpage
-+epix.1: epix.1.in
-+	sed -e 's%@docdir\@%$(docdir)%;' $< > $@
-+
-+#  emacs mode
-+epix.el: epix.el.in
-+	sed -e 's%@infodir\@%$(infodir)%;' $< > $@
-+
-+# 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
-+
-+# 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
-+
-+uninstall-local:
-+	-rm -rf $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
-+	-rmdir $(DESTDIR)$(docdir)
 diff -Nur epix-1.2.9.orig/samples/Makefile.am epix-1.2.9/samples/Makefile.am
 --- epix-1.2.9.orig/samples/Makefile.am	2008-07-01 03:55:14.000000000 +0100
 +++ epix-1.2.9/samples/Makefile.am	2012-02-19 16:46:02.123782104 +0000