sci-chemistry/chooch autotools based build system fixed

5 files changed, 69 insertions, 14 deletions

diff --git a/sci-chemistry/chooch/ChangeLog b/sci-chemistry/chooch/ChangeLog
index 54a2fed2d..d06136ebf 100644
--- a/sci-chemistry/chooch/ChangeLog
+++ b/sci-chemistry/chooch/ChangeLog
@@ -1,7 +1,14 @@
-# ChangeLog for sci-libs/chooch
+# ChangeLog for sci-chemistry/chooch
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*chooch-5.0.2-r1 (13 May 2009)
+
+  13 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/5.0.2-Makefile.am.patch, -chooch-5.0.2.ebuild,
+  +files/5.0.2-aclocal.patch, +chooch-5.0.2-r1.ebuild:
+  fixed autotools based buildsystem
+
   12 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> ChangeLog:
   moved from sci-libs/chooch to sci-chemistry/chooch
 
diff --git a/sci-chemistry/chooch/Manifest b/sci-chemistry/chooch/Manifest
index a48a4b108..16e30c5b6 100644
--- a/sci-chemistry/chooch/Manifest
+++ b/sci-chemistry/chooch/Manifest
@@ -1,5 +1,7 @@
+AUX 5.0.2-Makefile.am.patch 1203 RMD160 e1f4748e7450dfecfcee73656182e8c2aad1358f SHA1 e80b0815ce2ae8c3502087c401a792f24c033a23 SHA256 d57b06248fd0d555a93f3d82e8aa5d3020eb348fc0931ddfddc4d5458d0dd3a2
 AUX 5.0.2-Makefile.patch 1222 RMD160 42dc4f8807a369023d802036fabea14e33239a05 SHA1 0a4e0a3558b3a1cc28d94f82b4cf09e3a1d00b45 SHA256 ba11ed4ecaafacae6442b05faffb06d4ee86a2c5f6df194f79014c7fa1c02b6c
+AUX 5.0.2-aclocal.patch 351 RMD160 307eb3e53f0ab9c760471c2d6eb848c496577470 SHA1 e33c832a0ef278ed7b0ea87d0b96cab32c20d2d7 SHA256 388554ec0ae899aa7dffc7bf0a0045e8adf78a2fdb83de044754916d63e43e57
 DIST chooch-5.0.2.tar.gz 3057641 RMD160 5eb6d2b33f58e3a0b6379713184cd0c11d3a5956 SHA1 ec6cefd5044487c79e8099329c9f6eb3061e047d SHA256 ad80d5d296bfbd2bb8f9fac930df5a4e9ba583e23b2de298209b7a6925240643
-EBUILD chooch-5.0.2.ebuild 1008 RMD160 913027cc4664e7e092f763628d8496699cd1cf76 SHA1 33c1a6dc9200f8dae591c5c6c50fc5327f821126 SHA256 08c945671251946e43f2ed1f97989c8476a40a36bcb9f8b66e774144f542a197
-MISC ChangeLog 516 RMD160 3af848e2cff758af2bfa5f03740d536cda7fc921 SHA1 e923f37ccec6dc2389489030f82c31e81744f71e SHA256 cd063a9cc9cca3b605e293f019d04d0e7d8b3a76d8ffde49d4299f61e637cfb8
+EBUILD chooch-5.0.2-r1.ebuild 1124 RMD160 9169096a7957e84613e1331cf1113b59c13529cc SHA1 edd8d41ce89551dd68354b8180044cc8d611b162 SHA256 3405475a638459b0c1c0309edbb21e8c3f90805b060988bb6c5763bea41b5719
+MISC ChangeLog 758 RMD160 46ce012a076f34ea28ad10d66f4654fa8ff6cb58 SHA1 c8ec744f10d972f90350b83283a95db127bbb9ac SHA256 3d0707564f68910a68cd71a1d6f7b68967a00a18fb260069b6752874d38db3d2
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/sci-chemistry/chooch/chooch-5.0.2.ebuild b/sci-chemistry/chooch/chooch-5.0.2-r1.ebuild
index 6392471b4..985550f04 100644
--- a/sci-chemistry/chooch/chooch-5.0.2.ebuild
+++ b/sci-chemistry/chooch/chooch-5.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs autotools
 
 DESCRIPTION="a program that will automatically determine values of the anomalous scattering factors"
 HOMEPAGE="http://www.gwyndafevans.co.uk/id2.html"
@@ -25,26 +25,31 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}"/${PN}/${P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-Makefile.patch
-	sed "s:GENTOO_LIBDIR:$(get_libdir):g" -i Makefile
+	epatch "${FILESDIR}"/${PV}-Makefile.am.patch
+	epatch "${FILESDIR}"/${PV}-aclocal.patch
+	AT_M4DIR="${S}" eautoreconf
 }
 
 src_configure() {
-# configure is broken
-:
+	econf \
+		--with-pgplot-prefix="/usr" \
+		--with-cgraph-prefix="/usr" \
+		--with-gsl-prefix="/usr" \
+		--disable-gsltest || \
+		die
 }
 
 src_compile() {
-	emake -j1 \
-		CC=$(tc-getCC) \
+	emake \
 		all || die
 }
 
 src_install() {
-	dobin ${PN} ${PN}-pg || die "no bins installed"
+	emake DESTDIR="${D}" install || die "installation failed"
 	dodoc doc/${PN}.pdf || die "nothing to read"
-	doman man/${PN}.1 || die
 
-	insinto /usr/share/${PN}
-	use exmaples && doins -r examples
+	if	use examples; then
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
 }
diff --git a/sci-chemistry/chooch/files/5.0.2-Makefile.am.patch b/sci-chemistry/chooch/files/5.0.2-Makefile.am.patch
new file mode 100644
index 000000000..ca6bcafb1
--- /dev/null
+++ b/sci-chemistry/chooch/files/5.0.2-Makefile.am.patch
@@ -0,0 +1,30 @@
+--- Makefile.am	2004-10-20 14:47:12.000000000 +0200
++++ Makefile.am.new	2009-05-13 12:14:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS = chooch
++bin_PROGRAMS = chooch chooch-pg
+ 
+ chooch_SOURCES = main.c      fluread.c printbanner.c minmax.c  spline.c \
+         mucal.c     fdprime.c smooth.c      fits.c    normalize.c \
+@@ -12,4 +12,8 @@
+ 
+ chooch_LDADD = $(GSL_LIBS) $(PGPLOT_LIBS) $(CGRAPH_LIBS)
+ 
++chooch_pg_CFLAGS = -DPGPLOT $(GSL_CFLAGS) $(PGPLOT_CFLAGS) $(CGRAPH_CFLAGS)
++
++chooch_pg_LDADD = $(GSL_LIBS) $(PGPLOT_LIBS) $(CGRAPH_LIBS)
++
+ man_MANS = man/chooch.1
+--- Makefile.am	2009-05-13 12:16:05.000000000 +0200
++++ Makefile.am.new	2009-05-13 12:18:33.000000000 +0200
+@@ -1,5 +1,10 @@
+ bin_PROGRAMS = chooch chooch-pg
+ 
++chooch_pg_SOURCES = main.c      fluread.c printbanner.c minmax.c  spline.c \
++        mucal.c     fdprime.c smooth.c      fits.c    normalize.c \
++        checks.c    usage.c   integrate.c   psplot.c  selwavel.c \
++        copyright.c toplot.c  license.c
++
+ chooch_SOURCES = main.c      fluread.c printbanner.c minmax.c  spline.c \
+         mucal.c     fdprime.c smooth.c      fits.c    normalize.c \
+         checks.c    usage.c   integrate.c   psplot.c  selwavel.c \
diff --git a/sci-chemistry/chooch/files/5.0.2-aclocal.patch b/sci-chemistry/chooch/files/5.0.2-aclocal.patch
new file mode 100644
index 000000000..84dbaed9b
--- /dev/null
+++ b/sci-chemistry/chooch/files/5.0.2-aclocal.patch
@@ -0,0 +1,11 @@
+--- pgplot.m4	2004-10-18 13:13:21.000000000 +0200
++++ pgplot.m4.new	2009-05-13 11:52:43.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ if test "x$pgplot_prefix" != x ; then
+   PGPLOT_CFLAGS="-I$pgplot_prefix/include"
+-  PGPLOT_LIBS="-L$pgplot_prefix/lib -lpgplot"
++  PGPLOT_LIBS="-L$pgplot_prefix/lib -lpgplot -lcpgplot"
+ fi
+ 
+ AC_MSG_CHECKING([for libpgplot])