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

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

5 files changed, 44 insertions, 38 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/Manifest b/sci-libs/libdap/Manifest
index e368a4a97a28..25e34e0b671b 100644
--- a/sci-libs/libdap/Manifest
+++ b/sci-libs/libdap/Manifest
@@ -1,24 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST libdap-3.11.3.tar.gz 1514429 RMD160 1d254e6590d7e5f1399e97f1adb26677f4d364f5 SHA1 f4a19aaf89ff9efdf25996164a4893e3fea3fc64 SHA256 1fe14594960c1c24842ea9c3a4032cfce70b7082bbab17369b43c9a134ddac97
-EBUILD libdap-3.11.3.ebuild 1003 RMD160 e684708796ad8bfe52f6e4bd1ac59d2d74a3537d SHA1 7d2127c73a0bb37f5b8ee36e7b54896c6947ca38 SHA256 02bf2bc6fcf7a73abb8b5a7e8b5a75608ee5a61f9d4bb06dcbd871aa5f570014
-MISC ChangeLog 2365 RMD160 f2586945726dabc0b5ee15c5da6d93f1ac3dc51f SHA1 9ce427482c1d6552da4768996639af7571d23755 SHA256 ef64344ed9f5382503dc410c98ccbfee0894b1729a0b02d90a81d5bb84524375
-MISC metadata.xml 737 RMD160 c8195a9a8025b42fa6b9b002853f8e0d28f40ef3 SHA1 06f58d0f6cc5060d2ab8bfa68851b3b17cfdc9bc SHA256 8c6dcedc7fc648b0b967e2e4b35a3f1636aff200535463ecdb245cd0d9e0dcfd
+AUX libdap-3.11.3-gcc-4.7.patch 483 SHA256 6dcd6863079ea0d9fe289b6f3d813ed362ff9cadcff4b3fe92a8bfe38e402d9a SHA512 fbbe9a55998069ae1bc52c8c4b5d8cbc51f79bf72e56c687b2c7823f83cc1e1fb90af053e39f2d77f3dff6286663aeaab30cbc559c100e37eb196b86a36e0901 WHIRLPOOL 44388384c0cd357d728f760bbb993275626a1bab7ab958ab6862541232a443cbc27973e966f9d4837ed01d57cf24c1fc4a508634e970bd5bcab4b22c67ec248f
+DIST libdap-3.11.3.tar.gz 1514429 SHA256 1fe14594960c1c24842ea9c3a4032cfce70b7082bbab17369b43c9a134ddac97 SHA512 acdb54e135a153107460cad2310176b9d4a3f9b7c142eca3456ba9331f551d1855f7e6d4b7fdce6586dd266e54e23b795f903499f349d26481ca1d9abb5f52a0 WHIRLPOOL f67a56c64937610047de2cf2ea362193506fbd474aa0f1aa38a88e3c49e3e6fb3a5d8969feddc34c7560afa0b5c9e1304b5ced46ce3d37e9333094a2da289db0
+EBUILD libdap-3.11.3.ebuild 1066 SHA256 3e4aaf1730fff00eb19b7d2148b61fdfa9861fbc520eb80906d5d71693553771 SHA512 cd297756cf92416a1adba935d19acecddeb3ae6dcc859e805f9d96e8bfba267536048d588bcf2496fbc2c3b2e5a631dbfb57ef0735113295e48f112455c31f0b WHIRLPOOL c8b3519506e98ff051c1dc968a24fa8c98adfd5e4e7e9e406a2be67b0c1b326ff25f7c7f2d692011ae87e799982702037802e5243b352eac86956f64ff8b7bd3
+MISC ChangeLog 2545 SHA256 5a5e34511c03a460dd578ce1af9b2b428c46e5319675759d1de9ea9fb69dab34 SHA512 219209486ca0417b45b63a9f2304ee849e098fc3a7589a7abad2571cf0def4946ef1bff8165053e43f54a43e50d9ad84d9c004c1b980bff3ffb66c971024b21a WHIRLPOOL f328ea547b42895607b547cecc08a8cbd301c12d69fa3b324535669b6ad408202cc98689f8032aaca01cc08c5fa522449d4aa39b2b26187dcd410ad1f75858b2
+MISC metadata.xml 741 SHA256 88da0370744a72899904dc22018bec002b0cf703fd3421e92f1ce7a4bc0843ae SHA512 643f9dfaafac8a04ebab04eb886dec13cd3ec1d25c3037cd0f47dc333abd6a9e1f1089d5a300705ec4a5972cf8e8cd87931473f03ce2a8957b97413bfdf5dc68 WHIRLPOOL a83da80d8de05348280c9eea79f800da90f33b3718ae5aa3257c5af5cde271baa91ede5437a67fd03801a7f73244a3cef47a9c26e3fa364a06b72c668623ab2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBAgAGBQJPvpVnAAoJEOSiRoyO7jvos3QP/3sgAU7AS0fLlEBSCqcxwLZp
-fAaU0dTm30Rfgdch+XeT6fOlVXscHxw2HAIIPuhrc6D4TKib+Is6TK9mrhnrcf2E
-9QHOl53jdtPgeI9DymhGVtmhZtjhbRu1n+Ps8sv2qGJ54+E7Ctn03bG1bxpEapxz
-B6Gu5lW3gosq1dWO+FEvVlbUQncTvnXSaO1OvbXsn5ToQUwxn4DOn+RGh1m4drsD
-kCQxYMSMVAJGOV8ecLtoBq5fUQVivWC3aaxQwA8JhTvCDrZw7T80uHbXS2WQj5yH
-Dv3MPdhM72ewbsPuPkW9qipG1IrWWass6WbFDboycUAB2WdmGG3pEt/xK3/u2B0g
-sgLV96SFMCxV/X/pQy+6MWjzSgpWaYcM2674DxAejzt/OJgoL0xpCSpuQkKNtZNK
-5NNpcy8CoEihvw1SOuA5EDAWVsufAgrnera2wimOHB3IJwKXByKFEv0jj3TuAMiw
-I+arIygHl3/OVbtytCtBQGOiPIq7GbP2tq7T/zS8RiiaeydumQ+JSgFlL5HdTSku
-vTbay5g6XIGbpxOYZekZGy47Jzyd3jgF0gMLSoPawaOEJe6bVkHSUejqyJMptCPI
-MLynBrbDQFF9mWHqd5QnPKC4VLis+rvle6rA5LvjWy2mTzfk7UyJ+WwzybKmtbWI
-6dn8TxR655+yWwo5HXSq
-=buJA
+iEYEAREIAAYFAk/5ylIACgkQgAnW8HDreRb1iQCfUkmTwVo/1MRu+6R/U6aK2EXH
+RO4An3p6GuCA7XBVnIxco/QFZO/seo7q
+=R3zx
 -----END PGP SIGNATURE-----
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