sci-visualization/epix: Drop old; backport patch for automake-1.11.6 compatibility, #442476

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

7 files changed, 66 insertions, 94 deletions

diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog
index 3ee9ce9cd9fe..042da6c798ac 100644
--- a/sci-visualization/epix/ChangeLog
+++ b/sci-visualization/epix/ChangeLog
@@ -1,6 +1,11 @@
 # 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.43 2012/08/06 20:37:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.44 2012/11/10 09:49:50 jlec Exp $
+
+  10 Nov 2012; Justin Lecher <jlec@gentoo.org> epix-1.2.6.ebuild,
+  +files/epix-1.2.6-automake.patch, -epix-1.2.9.ebuild, epix-1.2.10.ebuild,
+  metadata.xml:
+  Drop old; backport patch for automake-1.11.6 compatibility, #442476
 
   06 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> epix-1.2.10.ebuild:
   keyword amd64-linux, x86-linux
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 6626652af206..346c82d29987 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50epix-gentoo.el 298 SHA256 5aa1fc2e45f9c544f4cfc95a803a2540a42ef766258eecbb3d166b158565d219 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3 WHIRLPOOL 424537eb3c11f7a0ea25a11ff67be94254bf5bef457b55af0e472d4110caa7a00e82fbdedb5cf0787858e9206f9d875682cc3debd912e55d951bcb4abd8ef75f
 AUX epix-1.2.10-autotools.patch 2092 SHA256 6ff9941eddf040bcd9b2667d4a39eb64a5f77583ff94277e2ddc44fdbc6241c6 SHA512 d75e8f8c4e200e27936196adc9afe6d7f3f20d3cd9f78b96abf4bb0ff51aa36621670ba2a145f9b9dceeeb5f830f593159dfbdfa294df1330e35630ed675be97 WHIRLPOOL 81dbc830dfe7d634f50f8729dd26a7c53be973bc812c5ee4a49de7b25dca3a2fcc3098f37a3f40198cb643866f0d90d1ffe0923da4425e5d7478b16a8414d6ec
+AUX epix-1.2.6-automake.patch 877 SHA256 23d6bf2576e0e16d000147b6729e78a665d221bf9b0adec03b83d497a0ebf0ac SHA512 6539c8991deba713cfddc28f4c9803d87ac7f4b61b67fda5b1713b4ebbc3aacc536077e4306c0b26747a2cc3b0bdb8e93f86c935a04f1108966098ef2fea2ec1 WHIRLPOOL 8ce833c717adbb4788ba1bf86d9392b2fb0671cfc69a3d9212d60fcc6d14b57f6361d79bd3e91abba0d6b9e688c56d8a706d6166f26ac800a70dc3c5d503c828
 AUX epix-1.2.6-doc-gentoo.patch 2613 SHA256 f0368e0a08e26051070816f24503b01b1eada43ec8e5b022643b144998f51513 SHA512 e833fa6f3eb723e230e5505d9e815ab023f0f37d792eb2190eb3898d91ef071f11020dadcb2d0c2dca492ede389e29e7412c0d71af32ad959235d86da87b3feb WHIRLPOOL 20dd1e89de4665802cb5ebacab78bad80a6b9f522560f240a2de049a17d61f7856778882cf0220970c7774c77554b8138afff6a3a1a4109a446be401d244b5d3
 AUX epix-1.2.9-autotools.patch 3201 SHA256 4f11917a828e1b3bc3fd1683ffeb39438758a66f523d75396b2b2dbc0f53c89a SHA512 5dbfcd406a4f9b4a52036b610f53a5ee58777aa89f120c2974272fbe140028bf7a0c10562892471b3ad3f1da5bcecb3f03c61e03f13452513286c0cd10407955 WHIRLPOOL d8866814ecf77b53ea46bcf0e4756dd5fe326119f98a8a79b19e48133f825705e3c3d678ffdac02bb68bfe978f4f32732cea9adecabcbd2b766d481841baf471
 DIST epix-1.2.10_withpdf.tar.bz2 1704245 SHA256 ff211a4a0b946a7bff81a1e96dadefbcccd8c7c92d04fbf739b7ff55ba534c5f SHA512 031d9f514217ff209691c2f6eed6fe91551f97443d12d7a6aff9fba8edbefda11735175ff60471f34247daf7d4d8abd1d846825ec0a93d28330799aec48deeac WHIRLPOOL 7bdc28ae2b1dd575c2b5a045c584e85ac06aacceb0ec5a06d99249c10af69c8f258eaf81b17f7853cb82a50bb2809c8769c059f5805a5b09f7f8bdacdf8fa187
-DIST epix-1.2.6_withpdf.tar.bz2 1736850 SHA256 9c377bcf8556bd91f46322e618a8e2d607ebc64e41b2cc57483aa87f414490db
-DIST epix-1.2.9_withpdf.tar.bz2 1701229 SHA256 c8735b6f4a5732586d2ec25268ba98186ef00638943642dfcb40cae4f7887653
-EBUILD epix-1.2.10.ebuild 1606 SHA256 64f5ccd8c4e6fa0bd6712e29fdcdc6b06d62329ed510f255137ab4b8f0e5e557 SHA512 02cb27e8a65619c47a93dab77f6df83c0a9166746f4d8acad092ebede00f013a01e9e70223bbe8c8ca9e8351fbe1402c3fe5a1774a2c847393d3db6b7164f8ba WHIRLPOOL f13e33ec76545011e71442eda4a91bf6e296c129ef76d0f2c2f52f228bfff2a5b71bcab0903f114e8b66f99a64238656757521101201fbcab5e6c5c75aea8497
-EBUILD epix-1.2.6.ebuild 1725 SHA256 89d547795f5df7b2d2fab895c8fdd1613842f97838bc1f29bd9f680d18f4be2f SHA512 3783607b78b5ad68d79a06333ae1515ccdb11144709b02003cef2f505ca9dfed1c06af402183013375d0071223d3fa5bf77beb57f1884a70463f51885e492a33 WHIRLPOOL 6487db51d0eb11578f5d419367a8ef879a95bbcb312edc70d6219f47719c9b80d8eb4f8692e76f991176a2f8bac93312f40295de6139251e2af94e9097b9c9b4
-EBUILD epix-1.2.9.ebuild 1582 SHA256 278abd0e2cec01f734f23f1149a7222428505073e4d92f22a72d99d8c9edee20 SHA512 762ecc85ad9897d864635e8cd79cf274f7c493299b38fd00975cf0612373c6d65b5ffd5d68d6982e330ec636ed2c32d288f2dca0296f2874e2bd39d31c0d0963 WHIRLPOOL ed015bb0d93f064793a4eecb824433a29b98ad28331aa98d013cc47e0b3e61fd32ce34f65088693732eca451656b0eb48411ec30f13c554ea13526ed0ec73fd5
-MISC ChangeLog 8474 SHA256 1d88f3babd2ed3881592698960746b3980c0949aec3cca50f12f9a389965546f SHA512 2d7f4cf9b1e510ca17bfbf872e92f398b8cbb92a83883bda780335f8ea93964ac8570e1e7e1995bc8d308cfe99e7820950571be2ce700a8e1a7d9f9fc60cf82c WHIRLPOOL 97a319fa7c05c1a23d10d5471423e4e9bb513361076b4e576292ce496beb7fde0b71887ed79def8f759cd7568b73049c9dcf95670b485b7da3b7fc2ad4bf5a74
-MISC metadata.xml 674 SHA256 ddb3fcaa3745e042ed7ef3e79faf17ce4d6264ff48261c0e2a5466964908edae SHA512 32c00954b37144b6f63987184645eb2a3f3f6cab2757eb1566658132954c3b080e51376f7d06bf9ac4d042bada52af57a1b7da2c99b540a0d011fe8e6e9f2177 WHIRLPOOL 73b28c00d3b0e0e9522e5e33c286a1fad2d4d97e045c82dcaa69823884ad6bd4a8ccc27c9593e5aa95c51a6092fb67fa847250563e01b12a30c9012d6ae08cd9
+DIST epix-1.2.6_withpdf.tar.bz2 1736850 SHA256 9c377bcf8556bd91f46322e618a8e2d607ebc64e41b2cc57483aa87f414490db SHA512 ba0f657d892b978ca107ba1bb8271da81ba220ea7e3011a5a5ed2448a96cce251245af7c5ce4ebf18af78cee00b9511c0125f6781a0046064d646418407b402f WHIRLPOOL fd59b76313944249730b09e88a77f56fcc479371d3ea0448bdcf2dd873a58acdacda39534becfa657b57c166965f30c50864eb507ee0f6527d6d606b7b206500
+EBUILD epix-1.2.10.ebuild 1605 SHA256 72d5c3c8a72621b41f41b5da7563b7aa1296a363f452321f6eae8adb130143b8 SHA512 5c5a0a12d8a48a93f737913e0faf9429486e4cc95961ef4d80b8ce31098378bae734b2b967642e3ce85004c2e3a24ccc5c7259cfeaf37cebe1e8e322db2857e7 WHIRLPOOL 0d0a5ea6f7f249678ff7683039496dbfa7bbf12bfd959a13b4bf7453177f0eb78a1a251a29c8229c715adca8d8e68f6ac42a72bbad2c512722688ef39ad85441
+EBUILD epix-1.2.6.ebuild 1708 SHA256 00a5da6228a49358ad2301f569d23fce109505d2f3b0af3e4bfe39aef3a9cc94 SHA512 10e5993c6ba6a917522f29f11a57329550e672473862e2334b23a43b13c2e6ca2a0142292fd2ba024d449d4abb54e8beca4b649bc509da533cd8886dba475258 WHIRLPOOL fc1aaf7627ba023a2877ea69df751e252d94d0bc329577308273bd259cbdb7f966ccd9aaf80075fc1ed1a363f0f78ef5c89c2a0e1f83631daf9fcdce5ca90904
+MISC ChangeLog 8699 SHA256 5835bd8803d42c10566e780a449900c3678bd3ed861135d20e6504cbbc2b469b SHA512 30ff5968fa7a899bb2beb1fd888e0dfb34570abca47e932c585178259334d2e95ce6204197ea711756820bdf74b91d11127611cff28bd53643ebf43a25b6bb54 WHIRLPOOL d3856bb30f1c9ea1a0c6ddde2e77bdc977d769c3ec27db46e84c9a5b6fdbdb21fa52eb781e963ac8e5b21562cb73c469eebef6cba3be2e9e2299e3c7871cd84e
+MISC metadata.xml 676 SHA256 2831773b4d4b7a09a20a78b24944840343c3be17fb004d32f6238d7b0400e039 SHA512 45b6422b332e0175673d46b4ad54100b5446e6d125d4f5544b8693b943c234bc850c4026cea52f96398f0a17de775c1b2764881ad227da5ab1b48f45477ea621 WHIRLPOOL e0a7874f6f39e4aa7af58f7e429e32a3a57b80261540e4ec81dfcd66f3c96d768987539b2f8cf1bd369c3c925cfbfc4dfba4a4ccffbe7443ee4539208bb9e66b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAgKvgACgkQ1ycZbhPLE2CiNQCgrjwqHfq+oZ7QqRQFogk9Bq/g
-M9oAni2P1ae3f1fRKuFdYXmfaRWIhyt5
-=8kaW
+iEYEAREKAAYFAlCeI0EACgkQgAnW8HDreRYK9QCgt9fTEu1S+rDtFbTtqyJUOQsq
+XLMAoLL6DcQfZKuNfly37a06PVywBzLG
+=RVyj
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/epix/epix-1.2.10.ebuild b/sci-visualization/epix/epix-1.2.10.ebuild
index b8dd23cec1a9..9c703149d23b 100644
--- a/sci-visualization/epix/epix-1.2.10.ebuild
+++ b/sci-visualization/epix/epix-1.2.10.ebuild
@@ -1,20 +1,22 @@
 # 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.3 2012/08/06 20:37:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.10.ebuild,v 1.4 2012/11/10 09:49:50 jlec Exp $
 
 EAPI=4
+
 inherit elisp-common bash-completion-r1 autotools eutils
 
 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"
+LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs examples"
 
-DEPEND="virtual/latex-base
+DEPEND="
+	virtual/latex-base
 	dev-texlive/texlive-pstricks
 	dev-texlive/texlive-pictures
 	dev-texlive/texlive-latexextra
@@ -30,7 +32,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-epix-el
 }
 
diff --git a/sci-visualization/epix/epix-1.2.6.ebuild b/sci-visualization/epix/epix-1.2.6.ebuild
index 8a15ae60a163..b1549e877690 100644
--- a/sci-visualization/epix/epix-1.2.6.ebuild
+++ b/sci-visualization/epix/epix-1.2.6.ebuild
@@ -1,31 +1,35 @@
 # 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.6.ebuild,v 1.6 2012/05/21 19:24:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.6.ebuild,v 1.7 2012/11/10 09:49:50 jlec Exp $
 
 EAPI=2
-inherit elisp-common bash-completion autotools eutils
+
+inherit elisp-common bash-completion-r1 autotools eutils
 
 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"
+LICENSE="GPL-2"
 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 )"
+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() {
 	# disable automatic install of doc and examples
-	epatch "${FILESDIR}"/${P}-doc-gentoo.patch
+	epatch \
+		"${FILESDIR}"/${P}-doc-gentoo.patch \
+		"${FILESDIR}"/${P}-automake.patch
 	eautoreconf
 }
 
@@ -44,8 +48,7 @@ src_install() {
 		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"
+	dobashcomp bash_completions
 	if use doc; then
 		insinto /usr/share/doc/${PF}
 		doins doc/*gz || die
diff --git a/sci-visualization/epix/epix-1.2.9.ebuild b/sci-visualization/epix/epix-1.2.9.ebuild
deleted file mode 100644
index fe5d3696fbdf..000000000000
--- a/sci-visualization/epix/epix-1.2.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.9.ebuild,v 1.4 2012/05/21 19:24:17 xarthisius Exp $
-
-EAPI=4
-inherit elisp-common bash-completion-r1 autotools eutils
-
-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.9-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.6-automake.patch b/sci-visualization/epix/files/epix-1.2.6-automake.patch
new file mode 100644
index 000000000000..80e9fb2b3566
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.6-automake.patch
@@ -0,0 +1,27 @@
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 366c582..2edbfe0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -15,7 +15,7 @@ SUBDIRS = . samples doc
+ bin_SCRIPTS = epix elaps flix laps
+ 
+ pkglib_LIBRARIES = libepix.a
+-pkglib_DATA = epix-lib.sh
++pkgdata_DATA = epix-lib.sh
+ include_HEADERS = epix.h
+ 
+ libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \
+@@ -107,8 +107,8 @@ install-data-local:
+ 	$(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
++install-exec-local: install-pkgdataDATA
++	chmod a-x $(DESTDIR)$(pkgdatadir)/epix-lib.sh
+ 
+ uninstall-local:
+ 	-rm -rf $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
diff --git a/sci-visualization/epix/metadata.xml b/sci-visualization/epix/metadata.xml
index 99968f74811f..f946cb30e669 100644
--- a/sci-visualization/epix/metadata.xml
+++ b/sci-visualization/epix/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<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