sci-libs/libdap: Add fix for gcc-4.7, #425244; move to autotools-utils.eclass

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

4 files changed, 33 insertions, 19 deletions

diff --git a/sci-libs/libdap/ChangeLog b/sci-libs/libdap/ChangeLog
index 6f15f56aae0f..633fb49dc096 100644
--- a/sci-libs/libdap/ChangeLog
+++ b/sci-libs/libdap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/libdap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/ChangeLog,v 1.13 2012/05/24 20:09:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/ChangeLog,v 1.14 2012/07/08 17:58:37 jlec Exp $
+
+  08 Jul 2012; Justin Lecher <jlec@gentoo.org> libdap-3.11.3.ebuild,
+  +files/libdap-3.11.3-gcc-4.7.patch, metadata.xml:
+  Add fix for gcc-4.7, #425244; move to autotools-utils.eclass
 
   24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libdap-3.11.3.ebuild:
   Stable on amd64 and x86 as it works without a glitch here.
diff --git a/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch b/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch
new file mode 100644
index 000000000000..0ea034124ceb
--- /dev/null
+++ b/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch
@@ -0,0 +1,15 @@
+ ResponseBuilder.cc |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/ResponseBuilder.cc b/ResponseBuilder.cc
+index 1135678..0356172 100644
+--- a/ResponseBuilder.cc
++++ b/ResponseBuilder.cc
+@@ -41,6 +41,7 @@ static char rcsid[] not_used = { "$Id: ResponseBuilder.cc 23477 2010-09-02 21:02
+ #include <string>
+ #include <sstream>
+ #include <cstring>
++#include <unistd.h>
+ 
+ #include <uuid/uuid.h>	// used to build CID header value for data ddx
+ #include "DAS.h"
diff --git a/sci-libs/libdap/libdap-3.11.3.ebuild b/sci-libs/libdap/libdap-3.11.3.ebuild
index d60928ed0e1d..f648e33ea2cf 100644
--- a/sci-libs/libdap/libdap-3.11.3.ebuild
+++ b/sci-libs/libdap/libdap-3.11.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/libdap-3.11.3.ebuild,v 1.2 2012/05/24 20:09:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/libdap-3.11.3.ebuild,v 1.3 2012/07/08 17:58:37 jlec Exp $
 
 EAPI=4
 
-inherit base
+inherit autotools-utils
 
 DESCRIPTION="Implementation of a C++ SDK for DAP 2.0 and 3.2"
 HOMEPAGE="http://opendap.org/"
@@ -13,7 +13,7 @@ SRC_URI="http://www.opendap.org/pub/source/${P}.tar.gz"
 LICENSE="|| ( LGPL-2.1 URI )"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc test"
+IUSE="doc static-libs test"
 
 RDEPEND="
 	dev-util/cppunit
@@ -33,14 +33,11 @@ RESTRICT="test"
 # needs http connection
 # FAIL: MIMEUtilTest
 
-src_configure() {
-	econf \
-		--disable-static
-}
+PATCHES=( "${FILESDIR}"/${P}-gcc-4.7.patch )
 
 src_compile() {
-	emake
-	use doc && emake docs
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile docs
 }
 
 src_test() {
@@ -50,8 +47,6 @@ src_test() {
 }
 
 src_install() {
-	default
-	use doc && dohtml docs/html/*
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/docs/html/")
+	autotools-utils_src_install
 }
diff --git a/sci-libs/libdap/metadata.xml b/sci-libs/libdap/metadata.xml
index 4bbe0bb1adb6..3a723f48bbc0 100644
--- a/sci-libs/libdap/metadata.xml
+++ b/sci-libs/libdap/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-geosciences</herd>
-<maintainer>
-  <email>nerdboy@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>nerdboy@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 libdap is a C++ implementation of OPeNDAP which allows access to data over the 
 internet, from programs that weren't originally designed for that purpose, as 
 well as some that were.  While OPeNDAP is the original developer of the Data