Respect AR (bug #443136) and rename bash-completion file

Package-Manager: portage-2.2.01.21313-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 52 insertions, 15 deletions

diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog
index 6869b0c94af8..8cf766be7e60 100644
--- a/sci-visualization/epix/ChangeLog
+++ b/sci-visualization/epix/ChangeLog
@@ -1,6 +1,10 @@
 # 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.46 2012/11/14 19:07:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.47 2012/11/30 05:17:41 bicatali Exp $
+
+  30 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> epix-1.2.10.ebuild,
+  files/epix-1.2.10-autotools.patch, metadata.xml:
+  Respect AR (bug #443136) and rename bash-completion file
 
   14 Nov 2012; Agostino Sarubbo <ago@gentoo.org> epix-1.2.10.ebuild:
   Stable for amd64, wrt bug #442570
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index c57f10f4d194..e0016c13475b 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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.10-autotools.patch 2701 SHA256 164802fb1083bc3e420925965788aad593a460d0e2f0cdd103654ded6c898f9f SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac WHIRLPOOL b7f6dc508d8f1753aeed2ccda427cfd95f0b135fed5e33d1593304560a91d6545dff96295b7acac30c76ff95bca0b11e7b2c7c1a21e8ff139e9d4394b74ab72b
 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 SHA512 ba0f657d892b978ca107ba1bb8271da81ba220ea7e3011a5a5ed2448a96cce251245af7c5ce4ebf18af78cee00b9511c0125f6781a0046064d646418407b402f WHIRLPOOL fd59b76313944249730b09e88a77f56fcc479371d3ea0448bdcf2dd873a58acdacda39534becfa657b57c166965f30c50864eb507ee0f6527d6d606b7b206500
-EBUILD epix-1.2.10.ebuild 1602 SHA256 6751faa2325243c4e45d8301d80da49cef4f0113af77765d02daa6fa4670648c SHA512 e18dc976615cfa361e258a19455271cc6ce3ebae7a356f5fa006bd8a860c70ca57a3e348e23ef76202bb9fb009c3f13914829f4c79ed67510ea92d0abdf28061 WHIRLPOOL 4a524acb8ef9d3fb15116ea2a62551d94dc520b70510a570d8f3cf3f6c81f1198194ffb50dff1d7b422ade64bfd9c86bd5bd1a37ba43190e210eb12ec5ead7dc
+EBUILD epix-1.2.10.ebuild 1613 SHA256 8568960399d37c0bf4740425d3550106ce95c74caf910f03870d7f66cfa64a84 SHA512 0b0a906610b17a0aa8f34baa74f76e54a281951b9ffca4d3dcdefcf2bf7612e4ec8e05f54a9a9c588c2583bf82c92fcffe72e9a7148ec91a3ec5f9b622e8473b WHIRLPOOL f8385cd171189e865342e03f0dae2776b99b39b9e49c84a0dd7aeeed9f62808905432c4bb531f26e5f849a32d8caf5d7556d717e195317136a34af5850667e60
 EBUILD epix-1.2.6.ebuild 1708 SHA256 00a5da6228a49358ad2301f569d23fce109505d2f3b0af3e4bfe39aef3a9cc94 SHA512 10e5993c6ba6a917522f29f11a57329550e672473862e2334b23a43b13c2e6ca2a0142292fd2ba024d449d4abb54e8beca4b649bc509da533cd8886dba475258 WHIRLPOOL fc1aaf7627ba023a2877ea69df751e252d94d0bc329577308273bd259cbdb7f966ccd9aaf80075fc1ed1a363f0f78ef5c89c2a0e1f83631daf9fcdce5ca90904
-MISC ChangeLog 8906 SHA256 8de9d45471ac44d2ad0d2c8e5980a1857cf091b828477c2594c1ce3acd0e7839 SHA512 173a1eef985f73449f377a8de58c2961a4e92fb79ebeef8517000ca204804b1cc8e7d2e9048c3c02a0117d38cbffdf8f9e53f80a954a14d95f6950d645836569 WHIRLPOOL c3d49376c89761da68fc13a73fa4b33f4fb5631ec4453aa4cf175c4be855915b08203060f66fbc67a7a4fd11b27d420e10a203383ba21ae8e4d2acac2151e406
-MISC metadata.xml 676 SHA256 2831773b4d4b7a09a20a78b24944840343c3be17fb004d32f6238d7b0400e039 SHA512 45b6422b332e0175673d46b4ad54100b5446e6d125d4f5544b8693b943c234bc850c4026cea52f96398f0a17de775c1b2764881ad227da5ab1b48f45477ea621 WHIRLPOOL e0a7874f6f39e4aa7af58f7e429e32a3a57b80261540e4ec81dfcd66f3c96d768987539b2f8cf1bd369c3c925cfbfc4dfba4a4ccffbe7443ee4539208bb9e66b
+MISC ChangeLog 9097 SHA256 1a250a25cdfe7aaeccf56ea3127f150a64d5c13ff391b219ef5b3f15c5c32104 SHA512 c2c17fa91661cbf754b017f1b5147ca80e1a08d855294dc548940533d63cb8c81db30b18594451205698d43b14565a0f41fbf1424ef37667fdfb592f66510d65 WHIRLPOOL 80d3cff16e561f0f9a18791b125dd39ec0dacadd1c8c678db76e43a0f109a2f42fffd18cad9176b54a4a288b26f14a259de50f022aa06a88fad7e49a2c398545
+MISC metadata.xml 674 SHA256 ddb3fcaa3745e042ed7ef3e79faf17ce4d6264ff48261c0e2a5466964908edae SHA512 32c00954b37144b6f63987184645eb2a3f3f6cab2757eb1566658132954c3b080e51376f7d06bf9ac4d042bada52af57a1b7da2c99b540a0d011fe8e6e9f2177 WHIRLPOOL 73b28c00d3b0e0e9522e5e33c286a1fad2d4d97e045c82dcaa69823884ad6bd4a8ccc27c9593e5aa95c51a6092fb67fa847250563e01b12a30c9012d6ae08cd9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC4QXYACgkQ1ycZbhPLE2B+vwCglWUQNa3cFlTmJf1XGVzIcfzt
+q/kAoIvfqW1cuGh8Nw/DGaifoN7JBnuf
+=ZL7j
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/epix/epix-1.2.10.ebuild b/sci-visualization/epix/epix-1.2.10.ebuild
index 77fd058f240d..78905243c7fc 100644
--- a/sci-visualization/epix/epix-1.2.10.ebuild
+++ b/sci-visualization/epix/epix-1.2.10.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2012/11/14 19:07:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.10.ebuild,v 1.7 2012/11/30 05:17:41 bicatali Exp $
 
 EAPI=4
 
@@ -45,7 +45,7 @@ src_install() {
 		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
-	dobashcomp bash_completions
+	newbashcomp bash_completions epix
 	if use doc; then
 		insinto /usr/share/doc/${PF}
 		doins doc/*gz
diff --git a/sci-visualization/epix/files/epix-1.2.10-autotools.patch b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
index a7b815b0e444..03f93cd26c9c 100644
--- a/sci-visualization/epix/files/epix-1.2.10-autotools.patch
+++ b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
@@ -1,6 +1,17 @@
+diff -Nur epix-1.2.10.orig/configure.ac epix-1.2.10/configure.ac
+--- epix-1.2.10.orig/configure.ac	2012-11-29 21:04:20.411280150 -0800
++++ epix-1.2.10/configure.ac	2012-11-29 21:14:00.462163755 -0800
+@@ -9,6 +9,7 @@
+ dnl Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_LN_S
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
 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
+--- epix-1.2.10.orig/doc/Makefile.am	2012-11-29 21:04:20.414280167 -0800
++++ epix-1.2.10/doc/Makefile.am	2012-11-29 21:04:30.491329674 -0800
 @@ -1,7 +1,7 @@
  # Makefile.am for ePiX v1.x "doc" directory
  #
@@ -37,8 +48,8 @@ diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am
  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
+--- epix-1.2.10.orig/Makefile.am	2012-11-29 21:04:20.415280173 -0800
++++ epix-1.2.10/Makefile.am	2012-11-29 21:05:52.489734436 -0800
 @@ -56,7 +56,7 @@
  
  EPIX_CONFFILES = bash_completions $(EPIX_EL)
@@ -48,9 +59,21 @@ diff -Nur epix-1.2.10.orig/Makefile.am epix-1.2.10/Makefile.am
  	README THANKS VERSION
  
  EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
+@@ -85,11 +85,6 @@
+ 	    -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
+ 
 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
+--- epix-1.2.10.orig/samples/Makefile.am	2012-11-29 21:04:20.416280179 -0800
++++ epix-1.2.10/samples/Makefile.am	2012-11-29 21:04:30.491329674 -0800
 @@ -7,7 +7,7 @@
  CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
  
diff --git a/sci-visualization/epix/metadata.xml b/sci-visualization/epix/metadata.xml
index f946cb30e669..99968f74811f 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