Version bump

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

6 files changed, 106 insertions, 123 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/Manifest b/sci-visualization/epix/Manifest
index d0c0c8c65448..059df8ee60c4 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA1
 
 AUX 50epix-gentoo.el 298 RMD160 cf3db606d04a04c8695828c9b870df5dc425d75e SHA1 aee1c361f181625fcf34bf12fc2a8d54b8595b24 SHA256 5aa1fc2e45f9c544f4cfc95a803a2540a42ef766258eecbb3d166b158565d219
-AUX epix-1.1.17-doc-gentoo.patch 1664 RMD160 5eb0795eec9b65bc1cad663a61cf609e0544cffc SHA1 46c3b9a10611d2ca89a828f161d98183ecf05af6 SHA256 d03dc2a572be64117df7d0cde14afa7f90e05172b85fda4d938f21721e23c08b
 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.5_withpdf.tar.bz2 1559949 RMD160 9b8b3180e2cf15d58aa1e95a3d97ea1dd0dfe173 SHA1 496c09f4031b7aa9a9461603094a77984aca6744 SHA256 e48c175c5ee3fc40fb79e9549c43071b1677cf6f6dced954f3800963da99e046
+AUX epix-1.2.7-doc-gentoo.patch 2080 RMD160 0386998057f1e48ae87a7f71f329331594d34b51 SHA1 ebc901bef5d48cf245dd569c579564717bbf94d8 SHA256 1c378083d1bbedb9a27ea7d2b94c04b4a4cdb0c3e3c9b2e02b72fcf1f6a2ad02
 DIST epix-1.2.6_withpdf.tar.bz2 1736850 RMD160 6d47689f42ed4631338bee8b27d00fede8eb97e3 SHA1 c88b256fbcb40c1a94cc979c67eee930a6e24ed0 SHA256 9c377bcf8556bd91f46322e618a8e2d607ebc64e41b2cc57483aa87f414490db
-EBUILD epix-1.2.1.ebuild 1643 RMD160 961b10046537508fdb865101145ebca10576bec4 SHA1 cb82d4da596eec8501c44d4bb4409b25777c19c9 SHA256 4f9896059571e1f45e435eea90e29f50f75eaebe4f5d509a0dd1ad6ae6b750aa
-EBUILD epix-1.2.5.ebuild 1643 RMD160 a5ce5fcd7c752d5b9d18928393402e12913fa13f SHA1 3e33154799d89ba01313497a1a23c10cb5d8488e SHA256 7c149b01fb8016eaf80f649727c82a0e9d863962ade0e8af755a807de0506dca
+DIST epix-1.2.7_withpdf.tar.bz2 1724599 RMD160 b14482c69fd42472f632b0cd5728556f09e4d1f4 SHA1 a75572ad1f35e97015b4d64d46ce5b67beda5431 SHA256 5d99d4c38992cbd248fb3629083f845e30a9abf5c4fcdfd68b18425ba0ade906
 EBUILD epix-1.2.6.ebuild 1754 RMD160 bca9b9ea25409897fd902046c22a34a89cac74f3 SHA1 ca5c962e65211d5d9fdfdc74e6ca262b1f48b5f9 SHA256 fbd47e8770fd1fc1097a9554cdb276eb757f0acd9b5d9fa55a8b5f3837f4e5b7
-MISC ChangeLog 6864 RMD160 e6a2ae258205fc8f60f8ed7d01b7c102c5528a54 SHA1 d68b4fd7ca5abd97f3fae6621ada37b2d2b1c5c7 SHA256 a4e14b31b03db8970f7027f87800d4c9d6aa54e8f9fe8e6b43faff04525c74bb
+EBUILD epix-1.2.7.ebuild 1759 RMD160 0d4fb964b1a0c2c09b88178859fe6afd62475cec SHA1 1db212356ced80f9a6e336f99fc8ec23926ca0d1 SHA256 eb7a45e77a74ccf00eba2538075ae57abea7486d0a13df3ea3ad197dc59c916d
+MISC ChangeLog 7103 RMD160 33e685bf9bf3dbf73b07ccb6edb6897260b8d3df SHA1 0aee3c047eefbf093b6a0c70bd6ad4ea6cfc4bbd SHA256 919a035608e8474832bd087a366de20b6ae0dd15657bc2879adab7884c6bd4e5
 MISC metadata.xml 674 RMD160 b9ef5d9bd4c2a378d20e8b2abf7e49aa009d2404 SHA1 0bbed1bb0008d1dd7710b029ca04a743a0caa1e5 SHA256 ddb3fcaa3745e042ed7ef3e79faf17ce4d6264ff48261c0e2a5466964908edae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktXYW4ACgkQkKaRLQcq0GJfrwCgr+nwngY4Utmxgt/TGWDKT7rh
-d30AniOONVal7l2PIypH1fQlJP+ayySC
-=9L6b
+iEYEARECAAYFAkvgrCAACgkQ1ycZbhPLE2D1xwCbBPwYsI2QPAGeHPQceVUAKxpD
+yDUAmgNT8JnkavOcNt5A/YByduUd9/Gc
+=puIH
 -----END PGP SIGNATURE-----
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