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

(Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 38 insertions, 11 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/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