Bump and cleaning

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

7 files changed, 129 insertions, 125 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/Manifest b/sci-visualization/epix/Manifest
index 95b8007a2450..5a1f999b9d82 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -2,21 +2,20 @@
 Hash: SHA1
 
 AUX 50epix-gentoo.el 298 RMD160 cf3db606d04a04c8695828c9b870df5dc425d75e SHA1 aee1c361f181625fcf34bf12fc2a8d54b8595b24 SHA256 5aa1fc2e45f9c544f4cfc95a803a2540a42ef766258eecbb3d166b158565d219
-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
+AUX epix-1.2.6-doc-gentoo.patch 2613 RMD160 51814fc3ed8fc00cdb097f2090c4cf6168408b1a SHA1 4efd409d05342e2d6ec425c1883d566f2b070b12 SHA256 f0368e0a08e26051070816f24503b01b1eada43ec8e5b022643b144998f51513
 DIST epix-1.2.1_withpdf.tar.bz2 1498603 RMD160 b46f9ac70488f4dab617b9235ec430b227dae759 SHA1 caf0e260573fe57d4fdffec32b49cf78f8842cca SHA256 c5083182b1a1c8761a76a9062b16c59f9417644e092f16b54f49336cc6417b66
-DIST epix-1.2.4_withpdf.tar.bz2 1558113 RMD160 b4d7525b93fdad78b2f51983470bc776e3d99a31 SHA1 6f5ab1661a1000e91f48075169fa708951c913bf SHA256 2054deca2aa9e63e5dd423d55fa0d62c3e42dbc17ba9f3fe658594b035a2ee54
 DIST epix-1.2.5_withpdf.tar.bz2 1559949 RMD160 9b8b3180e2cf15d58aa1e95a3d97ea1dd0dfe173 SHA1 496c09f4031b7aa9a9461603094a77984aca6744 SHA256 e48c175c5ee3fc40fb79e9549c43071b1677cf6f6dced954f3800963da99e046
+DIST epix-1.2.6_withpdf.tar.bz2 1736850 RMD160 6d47689f42ed4631338bee8b27d00fede8eb97e3 SHA1 c88b256fbcb40c1a94cc979c67eee930a6e24ed0 SHA256 9c377bcf8556bd91f46322e618a8e2d607ebc64e41b2cc57483aa87f414490db
 EBUILD epix-1.2.1.ebuild 1666 RMD160 a4a586c2ad931445c69bca0d20e3c742c1895940 SHA1 7520012546716fe1c933e12c3c5e23d63d6294c7 SHA256 f7ad803cf3319a680cfdb860a6c9935a6b8d0fea77e1751f6b1b762051afe159
-EBUILD epix-1.2.4.ebuild 1669 RMD160 f251f85fa90ec6d0150650aaa2c0d5add1e6db06 SHA1 787993d4ba7c2f1fd8fec1f6fdac9fd8f8efe3ba SHA256 93f4944cca9e1a08fb6c55316259f395040da757454d112039c01bd04ac518cc
 EBUILD epix-1.2.5.ebuild 1664 RMD160 d01cf5af75d36bb80ae4c07ab4bc605274dec79f SHA1 59368144d51c0d759f13337e2a19abfed3bcebdc SHA256 a653d4bf87ba830b30eb735289205f9dcd086a863ba92cb311cb7f6b09d57505
-MISC ChangeLog 6257 RMD160 9ff7c0bbb34f09a00c1013669dccb69119703ccf SHA1 e5edfd3c82bd302268f63437c74d829ec11f2ac2 SHA256 c5d0ad03c192231c594bf5cf1f485d10504b4a9d509322f665495e8bf455553b
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+EBUILD epix-1.2.6.ebuild 1777 RMD160 c2184cf31df80b90e418648f7b9efe2b39b57cd1 SHA1 61a9d387b549472e53b541481781fb8ca3658b72 SHA256 aff41652890d8ba97fc8f004457229b37f35f0ff9b78835f6cae6bbb5bdd65b1
+MISC ChangeLog 6525 RMD160 35c7e5547afc0f70f9456447efd94a8cc1080e9c SHA1 39dd136211d006dcdb036ae2a3d1a9f5fa08345f SHA256 e2200bc6332c7a0eb648bfe815b9c1721008069972d32d974d030475965989a5
+MISC metadata.xml 674 RMD160 b9ef5d9bd4c2a378d20e8b2abf7e49aa009d2404 SHA1 0bbed1bb0008d1dd7710b029ca04a743a0caa1e5 SHA256 ddb3fcaa3745e042ed7ef3e79faf17ce4d6264ff48261c0e2a5466964908edae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkkV2fYACgkQkKaRLQcq0GKIQwCePWiQkz9M+gPwoOzvNM8DDieW
-PZMAnRZc6MNofE8Mdz1Y8mUpkJ2nTDNJ
-=wM5q
+iEYEARECAAYFAknjdhQACgkQ1ycZbhPLE2Ad2QCeLonqfwVkkGhSwVu0LfC1WBvY
+pf8AoIf6S/QJORlzRV/xLe4kKWMnjYsM
+=vUYW
 -----END PGP SIGNATURE-----
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>