sci-mathematics/dataplot: Merge maxobvvalue into dp1patches. Move dataplot's Makefile.am and configure.ac to {configure.ac,Makefile.am}.${PV}. Add || die to doins and econf

svn path=/sunrise/; revision=6240

7 files changed, 31 insertions, 21 deletions

diff --git a/sci-mathematics/dataplot/ChangeLog b/sci-mathematics/dataplot/ChangeLog
index 7d99c2779..af0bf6996 100644
--- a/sci-mathematics/dataplot/ChangeLog
+++ b/sci-mathematics/dataplot/ChangeLog
@@ -3,6 +3,15 @@
 # $Header: $
 
   30 May 2008; Thomas Anderson (gentoofan23) <gentoofan23@gmail.com>
+  dataplot-20080225-r1.ebuild, -files/dpsrc-maxobvvalue-20080225.patch,
+  files/dpsrc-dp1patches-20080225.patch, -files/Makefile.am,
+  +files/Makefile.am.20080225, -files/configure.ac,
+  +files/configure.ac.20080225:
+  Merge maxobvvalue into dp1patches. Move dataplot's Makefile.am and
+  configure.ac to {configure.ac,Makefile.am}.${PV}. Add || die to doins and
+  econf
+
+  30 May 2008; Thomas Anderson (gentoofan23) <gentoofan23@gmail.com>
   dataplot-20080225-r1.ebuild:
   tweak fortran checks
 
diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest
index 29656f56b..92cbc0802 100644
--- a/sci-mathematics/dataplot/Manifest
+++ b/sci-mathematics/dataplot/Manifest
@@ -1,11 +1,10 @@
 AUX 90dataplot 75 RMD160 d561beb32d6b98a1809fa46a103beaa115450585 SHA1 160b11d262ee4aac6d1af48dc96af905d1724a55 SHA256 a0e547d52eca3ec872bd996712e93d550d65f66a693416ce6944504cab78df6c
-AUX Makefile.am 1246 RMD160 05e5b07336606da88381a31882f32b482e807d22 SHA1 acb5e834086dbf895e60cb75a8807dfa763f5372 SHA256 083de39fb87096dc26209b2084d04d9ead949a0c8a87f6da9dddb21899acbfef
-AUX configure.ac 2967 RMD160 7e5f8a192fba3e5e4441b912bec60e97f3c3c981 SHA1 2a8ea0e90240071cd3d80d1af88fc54266ad9a07 SHA256 a89eade674ffaf683b73537133e56df6d6ccc3093ea78c783049400a845eec85
-AUX dpsrc-dp1patches-20080225.patch 2647 RMD160 347112c6a48466e110cd897c214404bcb2446d3a SHA1 37dfc75ad47a0372407835d278f9041a25586528 SHA256 e8aa95d90a856970e33448b9077dfbb8ed6d0770dcba0d32ca7750632895b1b2
-AUX dpsrc-maxobvvalue-20080225.patch 352 RMD160 fe8d89430ec5e63b644cd4b9e5161c4065a17eaf SHA1 2c4c7baa19a3d2cac23e000043553cd58c9b0ccd SHA256 86e7971f02aaff3c1df04754ce3e56bef63352ed09625def4e1f56e49b43e6a2
+AUX Makefile.am.20080225 1246 RMD160 05e5b07336606da88381a31882f32b482e807d22 SHA1 acb5e834086dbf895e60cb75a8807dfa763f5372 SHA256 083de39fb87096dc26209b2084d04d9ead949a0c8a87f6da9dddb21899acbfef
+AUX configure.ac.20080225 2967 RMD160 7e5f8a192fba3e5e4441b912bec60e97f3c3c981 SHA1 2a8ea0e90240071cd3d80d1af88fc54266ad9a07 SHA256 a89eade674ffaf683b73537133e56df6d6ccc3093ea78c783049400a845eec85
+AUX dpsrc-dp1patches-20080225.patch 3003 RMD160 e3480165e3ce77e8f74bb8b1f20ba4beecc54d76 SHA1 16616bd81b6e91dcf3a105d97d593794711c4901 SHA256 3279e55fafa3e43700f5f7df3f8422b0f124d1e12cd356f344f85cb33a0b3551
 AUX dpsrc-patchset-20080225.patch 4587 RMD160 a582f14dbe92cb3802b641b737d726ed2d39d527 SHA1 3aa03d5d53135ca9ac1464f26a3eceae4a8a9d3a SHA256 4a1c7ca2418558a857bd7d55d0815c5caa6fbe911bd4bf320b8460aa917effbb
 DIST dplib.02_25_2008.tar.gz 5340447 RMD160 51b5892c83bb5d420f324e3dab5edec24925f728 SHA1 3a77ed5e1e49f377083a11b8a177f678284b91f2 SHA256 7f9a30ae8ab029e0eeca4fbe08e665b572ec98a05ec001a67f95e4857d2a5b05
 DIST dpsrc.02_25_2008.tar.gz 6399167 RMD160 ed14f8ceb225e86f25026916ab4934a140f602ae SHA1 f1023d99ec7d2a64611dabedfbc5ad6f16e67cf7 SHA256 794bedcc48cf444c5813f864f4bacb158474d450337279edaf7fba1055c552c6
-EBUILD dataplot-20080225-r1.ebuild 2490 RMD160 bf29f68e1950ac09a640bb3245b30843203c8506 SHA1 6e0483ef0fbf9b9816233b5c345e5c4365907c7b SHA256 c8bd89db19fa316759834e4799310cbf59facdca72806f883f0098883e4d81f4
-MISC ChangeLog 3012 RMD160 e06dc9a59f31f797bb3c332f0c17a210ac484461 SHA1 7e18853a3b717763a56941ab76f4b5b92ba3428f SHA256 db039d91f06811c7d97a51c8c424db19f642643b184195615d5fcfd356eff86d
+EBUILD dataplot-20080225-r1.ebuild 2546 RMD160 0996ba92325816d3ec48c25bcf0dd248f5ac5813 SHA1 f57136e9792d3fa61c07064117a072a8087cfaa6 SHA256 2e5b783e35689352ca6f7f7b8a5d77c0938872707023d89f4fb440f6d0ce242d
+MISC ChangeLog 3452 RMD160 9c59ecc3b8c133d01428db868a688c93e47bfdbf SHA1 cc08dd0f9e741fff66cf81c78e15586036665479 SHA256 58021b676bd57a2be1bc653f228406d2f6a877b6089d88f83219601bf0a6be82
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sci-mathematics/dataplot/dataplot-20080225-r1.ebuild b/sci-mathematics/dataplot/dataplot-20080225-r1.ebuild
index 4f68faab0..f10213a62 100644
--- a/sci-mathematics/dataplot/dataplot-20080225-r1.ebuild
+++ b/sci-mathematics/dataplot/dataplot-20080225-r1.ebuild
@@ -52,10 +52,10 @@ src_unpack() {
 	mv dp1_linux.f dp1_linux.f.in
 	mv dp1_linux_64.f dp1_linux_64.f.in
 	epatch "${FILESDIR}"/dpsrc-patchset-${PV}.patch
-	epatch "${FILESDIR}"/dpsrc-maxobvvalue-${PV}.patch
 	epatch "${FILESDIR}"/dpsrc-dp1patches-${PV}.patch
 
-	cp "${FILESDIR}"/{Makefile.am,configure.ac} "${S}"
+	cp "${FILESDIR}"/Makefile.am.${PV} "${S}"/Makefile.am
+	cp "${FILESDIR}"/configure.ac.${PV} "${S}"/configure.ac
 
 	mkdir "${S_AUX}" && cd "${S_AUX}"
 	unpack ${MY_P_AUX}.tar.gz
@@ -67,7 +67,7 @@ src_compile() {
 	econf $(use_enable gd) \
 		$(use_enable gs) \
 		$(use_enable opengl) \
-		$(use_enable X)
+		$(use_enable X) || die "Econf failed"
 
 	emake || die "Make failed"
 }
@@ -80,7 +80,8 @@ src_install() {
 		doins -r "${S_AUX}"/data/* || die "Installing examples failed"
 	fi
 	insinto /usr/share/dataplot
-	doins "${S_AUX}"/dpmesf.tex "${S_AUX}"/dpsysf.tex "${S_AUX}"/dplogf.tex
+	doins "${S_AUX}"/dpmesf.tex "${S_AUX}"/dpsysf.tex "${S_AUX}"/dplogf.tex || \
+	die "Doins failed."
 	doenvd "${FILESDIR}"/90${PN}
 }
 
diff --git a/sci-mathematics/dataplot/files/Makefile.am b/sci-mathematics/dataplot/files/Makefile.am.20080225
index 29dd418b2..29dd418b2 100644
--- a/sci-mathematics/dataplot/files/Makefile.am
+++ b/sci-mathematics/dataplot/files/Makefile.am.20080225
diff --git a/sci-mathematics/dataplot/files/configure.ac b/sci-mathematics/dataplot/files/configure.ac.20080225
index 1051b9dbd..1051b9dbd 100644
--- a/sci-mathematics/dataplot/files/configure.ac
+++ b/sci-mathematics/dataplot/files/configure.ac.20080225
diff --git a/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch b/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch
index 16e14eb7e..3c7cdeb4c 100644
--- a/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch
+++ b/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch
@@ -74,3 +74,15 @@
  CCCCC JUNE 1996.  FOR UNIX SYSTEMS, CHECK FOR EXISTENCE OF
  CCCCC "HOME" ENVIRONMENT VARIABLE.  READ DPLOGF FROM USER'S HOME
  CCCCC DIRECTORY IF FOUND.  OTHERWISE, CURRENT DIRECTORY.
+--- dpsrc-orig/DPCOPA.INC.in    2008-02-24 12:52:09.000000000 -0500
++++ dpsrc/DPCOPA.INC.in 2008-04-28 14:16:02.000000000 -0400
+@@ -64,7 +64,7 @@
+ CCCCC PARAMETER (MAXOBW=82000)
+ CCCCC PARAMETER (MAXPOP=16400)
+ C
+-      PARAMETER (MAXOBV=100000)
++      PARAMETER (MAXOBV=@MAXOBV@)
+       PARAMETER (MAXOBW=10*MAXOBV)
+       PARAMETER (MAXPOP=2*MAXOBV)
+ C
+
diff --git a/sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch b/sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch
deleted file mode 100644
index ddf8544ca..000000000
--- a/sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dpsrc-orig/DPCOPA.INC.in	2008-02-24 12:52:09.000000000 -0500
-+++ dpsrc/DPCOPA.INC.in	2008-04-28 14:16:02.000000000 -0400
-@@ -64,7 +64,7 @@
- CCCCC PARAMETER (MAXOBW=82000)
- CCCCC PARAMETER (MAXPOP=16400)
- C
--      PARAMETER (MAXOBV=100000)
-+      PARAMETER (MAXOBV=@MAXOBV@)
-       PARAMETER (MAXOBW=10*MAXOBV)
-       PARAMETER (MAXPOP=2*MAXOBV)
- C