fixed configure and build issues, added manual install commands

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.26.5 x86_64

3 files changed, 56 insertions, 37 deletions

diff --git a/sci-libs/udunits/ChangeLog b/sci-libs/udunits/ChangeLog
index f6df63f7c77a..68a7e355f448 100644
--- a/sci-libs/udunits/ChangeLog
+++ b/sci-libs/udunits/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/udunits
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/ChangeLog,v 1.5 2007/02/09 08:26:56 flameeyes Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/ChangeLog,v 1.6 2008/11/25 07:35:36 nerdboy Exp $
+
+  25 Nov 2008; Steve Arnold <nerdboy@gentoo.org> udunits-1.12.3.ebuild:
+  Fixed configure and build issues, added manual install commands (closes 
+  bug #246712).
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index 12a4a10af5bf..74ac02d59dc5 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -7,6 +7,6 @@ DIST udunits-1.12.1.tar.Z 365873 RMD160 fb2f0442673ca47d302782c84ce37b8da1e16535
 DIST udunits-1.12.3.tar.Z 422795 RMD160 49043f1b51b16987e7929da46f474807155d611a SHA1 ebff0ae6b753a3e51e13a679f72624d3ce60175c SHA256 3e4d310c059838ab37f44c6361f90c8213777468bf3f1dc9ae9c7692d2586bf9
 EBUILD udunits-1.12.0.ebuild 1848 RMD160 e65ac4434f42a198b8b36b50a8028c9c0d0ae6cc SHA1 b90b13b58699a1cab31358cc4b8eb5b461261f49 SHA256 3842039d7fa26490ca7a03254daffe11ed1f1dd599e4fdf9215dc26a045eed0a
 EBUILD udunits-1.12.1.ebuild 2009 RMD160 e37f69c4cdb36883449d3b8046a000cf96efee3c SHA1 d038c02ac30cb3b48c51e3ceb3a6de00fd5aa814 SHA256 122a7d72d7f0e5eadd8391c1b5f763d4d92ba679b222858067a0197ed082ceb2
-EBUILD udunits-1.12.3.ebuild 2011 RMD160 4f9fd990ba9929beab746d94fd28a73f9e7cac44 SHA1 c1402eaff95977214cb22eef6e8008228b6365b5 SHA256 3f50bc867f26525e3f25e1399f0c61e80c7f7c546b255f9b6ebc4db15423371a
-MISC ChangeLog 2546 RMD160 392ac860934b0f48192b7d5af92ceb2ffc8471fc SHA1 cee01162fbeee3532673823bddf3fcf5b695d742 SHA256 3c4f9b6502e0349ffc68a5e1f3bb2a4eb0b06e4265121c1247603dc1c8ea22a1
+EBUILD udunits-1.12.3.ebuild 2663 RMD160 abd10f4abac33ff11bf8a1783667534e7d5cb87b SHA1 d56c71fe954dc07dacd56975f25a583e140a14d2 SHA256 cbff3968a86ef716afdd1150cb7e388c6872aedc97c0aa4e39203fd9b8489d2a
+MISC ChangeLog 2708 RMD160 5aaaee16e8fb5736b7ba222547c4bdf7bb7e0ee7 SHA1 876a90222d43a4bc4a99132e98ba44635aaf2c09 SHA256 5e25dc88e52c419ff8c414da9ecc2aa3f424abc6e6d6c16c5efe26664c2d68ca
 MISC metadata.xml 583 RMD160 7e78ab354043f23ecdaca5a0300aa7a01268b536 SHA1 0683289e5912587c6c95d2985c8e93292f1241e8 SHA256 b0e23466ef6dbca44936882acc679f41e998a5c7a4771fc3fc6fcaa78d2141e3
diff --git a/sci-libs/udunits/udunits-1.12.3.ebuild b/sci-libs/udunits/udunits-1.12.3.ebuild
index 0541ec6e6c1a..1f65775dfa10 100644
--- a/sci-libs/udunits/udunits-1.12.3.ebuild
+++ b/sci-libs/udunits/udunits-1.12.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/udunits-1.12.3.ebuild,v 1.2 2005/11/28 12:04:37 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/udunits/udunits-1.12.3.ebuild,v 1.3 2008/11/25 07:35:36 nerdboy Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic fortran perl-module toolchain-funcs
 
 IUSE=""
 
@@ -23,53 +23,68 @@ RDEPEND="dev-lang/perl"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/udunits_customize.patch || die "epatch failed"
+	cd "${S}"
+	sed -i -e "s:\${prefix}/etc:/etc:g" \
+	    -i -e "s:\${prefix}/man:\${prefix}/share/man:g" \
+	    -i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):g" \
+	    configure || die "sed 1 failed"
 }
 
 src_compile() {
 	export CPPFLAGS="-Df2cFortran -D_POSIX_SOURCE"
+	export CFLAGS="${CFLAGS}"
+	export FC="${FORTRANC}"
+	export CC="$(tc-getCC)"
+	export CXX="$(tc-getCXX)"
+	export LD_MATH="-lm"
+	# This is needed for the perl shared object build
 	append-flags -fPIC
+
 	econf || die "econf failed"
 
-	cd lib
-	emake || die
-	cd ..
+	cd "${S}"/lib
+	    emake || die "emake lib failed"
+	cd "${S}"
 
-	cd perl
-	perl Makefile.PL PREFIX=${D}/usr
-	cd ..
+	cd "${S}"/perl
+	    perl-module_src_prep
+	    perl-module_src_compile
+	cd "${S}"
 
-	emake || die
-	emake test || die
+	# random compile failures with -jN (when N > 1)
+	emake -j1 || die "emake died"
 }
 
-src_install() {
-	sed "s?/usr?${D}/usr?" Makefile > Makefile.install
-	emake -f Makefile.install install
+src_test() {
+	make check || die "make test failed"
+}
 
-	dodir /etc /usr/share/man/man3 /usr/share/man/man3f
+src_install() {
+	# The configure sucks, and so do the makefiles; this pretty much
+	# needs to be done manually...
+	dobin udunits/udunits
+	dolib.a lib/libudunits.a port/misc/libudport.a
+	doman udunits/udunits.1 lib/udunits.3 perl/udunitsperl.1
 
 	insinto /etc
-	insopts -m 644
 	doins lib/udunits.dat
-
-	insinto /usr/share/man/man3
-	doins lib/udunits.3
+	insinto /usr/include
+	doins lib/{udunits.h,udunits.inc}
+	# doman still doesn't put this in the right place
 	insinto /usr/share/man/man3f
 	doins lib/udunits.3f
-
-	cd perl
-	make PREFIX=${D}/usr install INSTALLSITEMAN1DIR=${D}/usr/share/man/man1
-	cd ..
-
-	find ${D} -type f -a \( -name perllocal.pod -o -name .packlist \
-		-o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-	find ${D} -type d -depth -exec rmdir {} 2>/dev/null ';'
-
-	chmod -R u+w ${D}/*
-
-	dodoc COPYRIGHT README RELEASE_NOTES VERSION CUSTOMIZE INSTALL
+	dodoc README RELEASE_NOTES
+
+	fixlocalpod
+	cd "${S}"/perl
+	    perl-module_src_install
+	cd "${S}"
+
+	# Clean up left-over cruft...  (yes, this is still needed)
+	find "${D}" -type f -a \( -name perllocal.pod -o -name .packlist \
+	    -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+	find "${D}" -type d -depth -exec rmdir {} 2>/dev/null ';'
+	chmod -R u+w "${D}"/*
 }
 
 pkg_postinst() {