[gentoo-commits] proj/sci:master commit in: sci-physics/mc-tester/files/, sci-physics/mc-tester/

[Justin Lecher]

commit:     39aa9892238b3fc59b194b9a1a5b5b47e4079dac
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Wed Nov 20 22:15:07 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 22:15:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=39aa9892

sci-physics/mc-tester: ebuild improvements, thanks to jlec

---
 .../mc-tester/files/mc-tester-1.25.0-compare.sh.patch      | 12 +++++++++++-
 sci-physics/mc-tester/mc-tester-1.25.0.ebuild              | 14 ++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/sci-physics/mc-tester/files/mc-tester-1.25.0-compare.sh.patch b/sci-physics/mc-tester/files/mc-tester-1.25.0-compare.sh.patch
index 3cf0e30..180dcb0 100644
--- a/sci-physics/mc-tester/files/mc-tester-1.25.0-compare.sh.patch
+++ b/sci-physics/mc-tester/files/mc-tester-1.25.0-compare.sh.patch
@@ -1,6 +1,6 @@
 --- analyze/compare.sh
 +++ analyze/compare.sh
-@@ -6,13 +6,13 @@
+@@ -6,13 +6,14 @@
  #----------------------------------
  # Change these variables
  #----------------------------------
@@ -15,6 +15,16 @@
  
 -MCTESTER_ANALYZE_DIR=${MCTESTER_DIR}/analyze
 +MCTESTER_ANALYZE_DIR=${MCTESTER_DIR}/libexec/mc-tester/analyze
++MCTESTER_DATA_DIR=${MCTESTER_DIR}/share/mc-tester
  export MC_TESTER_LIBS_DIR=${MCTESTER_DIR}/lib
  
  WORKING_DIR=`pwd`
+@@ -24,7 +25,7 @@
+ cd $WORKING_DIR
+ 
+ #copy base .tex file needed for booklet and create
+-cp ${MCTESTER_ANALYZE_DIR}/tester.tex ./ 
++cp ${MCTESTER_DATA_DIR}/tester.tex ./ 
+ latex tester.tex
+ latex tester.tex 
+ latex tester.tex 

diff --git a/sci-physics/mc-tester/mc-tester-1.25.0.ebuild b/sci-physics/mc-tester/mc-tester-1.25.0.ebuild
index 80fb6bc..43f835d 100644
--- a/sci-physics/mc-tester/mc-tester-1.25.0.ebuild
+++ b/sci-physics/mc-tester/mc-tester-1.25.0.ebuild
@@ -32,22 +32,24 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--with-root="/usr" \
+		--with-root="${EPREFIX}/usr" \
 		--without-Pythia8 \
-		$(use_with hepmc HepMC "/usr")
+		$(use_with hepmc HepMC "${EPREFIX}/usr")
 }
 
 src_compile() {
 	emake
-	use doc && cd doc && make || die
+	use doc && cd doc && emake
 }
 
 src_install() {
 	emake PREFIX="${D}/usr" install
-	exeinto /usr/bin
-	newexe analyze/compare.sh mc-tester-compare
+	newbin analyze/compare.sh mc-tester-compare
+
 	insinto /usr/libexec/${PN}/analyze
-	doins analyze/*.C analyze/*.tex
+	doins analyze/*.C
+	insinto /usr/share/${PN}
+	doins analyze/*.tex
 
 	if use doc; then
 		dohtml doc/doxygenDocs/html/*