From c7c1520b30331949773f0006dc2d08f7a4502712 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Tue, 27 Apr 2010 10:06:52 +0000 Subject: [PATCH] Version bump. Drop old. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-libs/libdap/ChangeLog | 12 ++++- sci-libs/libdap/Manifest | 20 +++---- sci-libs/libdap/files/3.10.0-fix_tests.patch | 11 ++++ .../libdap/files/libdap-3.9.2-gcc-4.4.patch | 26 --------- sci-libs/libdap/libdap-3.10.0.ebuild | 50 +++++++++++++++++ sci-libs/libdap/libdap-3.8.2.ebuild | 44 --------------- sci-libs/libdap/libdap-3.9.2.ebuild | 53 ------------------- sci-libs/libdap/libdap-3.9.3.ebuild | 46 ---------------- 8 files changed, 79 insertions(+), 183 deletions(-) create mode 100644 sci-libs/libdap/files/3.10.0-fix_tests.patch delete mode 100644 sci-libs/libdap/files/libdap-3.9.2-gcc-4.4.patch create mode 100644 sci-libs/libdap/libdap-3.10.0.ebuild delete mode 100644 sci-libs/libdap/libdap-3.8.2.ebuild delete mode 100644 sci-libs/libdap/libdap-3.9.2.ebuild delete mode 100644 sci-libs/libdap/libdap-3.9.3.ebuild diff --git a/sci-libs/libdap/ChangeLog b/sci-libs/libdap/ChangeLog index 8562f8b692ff..6e4c378f35de 100644 --- a/sci-libs/libdap/ChangeLog +++ b/sci-libs/libdap/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-libs/libdap -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/ChangeLog,v 1.6 2009/12/07 06:27:24 bicatali Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/ChangeLog,v 1.7 2010/04/27 10:06:52 scarabeus Exp $ + +*libdap-3.10.0 (27 Apr 2010) + + 27 Apr 2010; Tomáš Chvátal + +files/3.10.0-fix_tests.patch, -libdap-3.8.2.ebuild, -libdap-3.9.2.ebuild, + -files/libdap-3.9.2-gcc-4.4.patch, -libdap-3.9.3.ebuild, + +libdap-3.10.0.ebuild: + Version bump. Drop old. *libdap-3.9.3 (07 Dec 2009) diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest index 071c8abdfa43..bd3ccc3dabc7 100644 --- a/sci-libs/libdap/Manifest +++ b/sci-libs/libdap/Manifest @@ -1,19 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX libdap-3.9.2-gcc-4.4.patch 605 RMD160 4eabd0237987fe4ccae4a08adb2742782f8a8e93 SHA1 e1a6e3c2cc4509f98a40408f783efe63f7094717 SHA256 7a5a8fe8d2654938ad52a0f5799f178647bc5b37771b51c816cc719f9f564d9f -DIST libdap-3.8.2.tar.gz 1322446 RMD160 ec7d65d4d9c8c10db398bad1123b8ce47196a20f SHA1 c5174882a3e494be0d7010421212747fd03ae4c6 SHA256 232facc362b7e801607cd3da0df1f58d20034bf5acb2591ada87ad6e340ef1db -DIST libdap-3.9.2.tar.gz 1344265 RMD160 17fd35fd1e81b6ab3d84a4401583f510820d5601 SHA1 38460059cf85b5ceec377be8b97e3202047b3696 SHA256 5e925c274128a4d220e7d6afeaa37132d0b98e0bf30c680c7cb8cca2b9b3f5ed -DIST libdap-3.9.3.tar.gz 1352334 RMD160 00ce5e54479ebf0fe32c7e6312a83005b32406aa SHA1 4c528e3e488f19a5c718169c8ece28c6f7228cfe SHA256 353b075f043d8ec4fd756331df06d50ee2e3a23d5b31edfd4908f6730f64284e -EBUILD libdap-3.8.2.ebuild 1120 RMD160 785cbccf52fc587ed5ef86be5ea80c7f8d53e40f SHA1 10a583f0ca7bc41523d1342d9f267c0a284c1fc2 SHA256 72a35a3cc2a41a0d86431791a3cc2fdfa8b40c314b97b8983816c647061591c3 -EBUILD libdap-3.9.2.ebuild 1237 RMD160 7f84aef2dce5bf212153084aedbf6e577fabe68d SHA1 fcd097ec5a5ca3b34d27be7a172011f0fbb9c0e3 SHA256 16f2036fc525e73ee4ec826e3299920262364df3dab1a60a17ca186744378d29 -EBUILD libdap-3.9.3.ebuild 1048 RMD160 8b68ab9ccd527a45977627521ee2f1082c6c3fc2 SHA1 5804c29c72aa838d6db5f1907018b607db5a0f47 SHA256 74b8294a3680687385707d885b926183db4be0275bc77351976ca755a999e86b -MISC ChangeLog 1237 RMD160 25b54f9d827fc2a54d822ee8de4e06e29ccc8033 SHA1 45b965707975f3373b92a095aa2e6de3ebfc99b0 SHA256 a9a66fe96ec4e9ee8a9865d7c4c566cc7b93213ebcd96fee494ae4b3b66f92b5 +AUX 3.10.0-fix_tests.patch 395 RMD160 d647479ae6381680ee3fd32c79eab7a56bddd8ef SHA1 693495f8467dbc46ec440bca91628e76bd64f5ac SHA256 859841d36bbf8f3b208bda05ff716142c6b4cdeab770421e5dd18c05f381908f +DIST libdap-3.10.0.tar.gz 1516612 RMD160 c7b9397e9925eba8f1e6b4a687817fddc0c62d6b SHA1 410754b42d6896562aef301098dc33ab2397d226 SHA256 b27d85fc551db07c54564442a7385618fa7fbf28d851f6130088923d13948603 +EBUILD libdap-3.10.0.ebuild 995 RMD160 1c1b9a4df32b7aa0fcbd50541169f22334975782 SHA1 9ec1fa8cd0f2e4162d382d355a29765d27bcfd87 SHA256 0d0243d959bab88e98a8dd43317a3eb32d2d9f83ae36b1dd29f1b6174bed50d6 +MISC ChangeLog 1511 RMD160 ac47ee7dde41521baa9b1b58c2101fe38de54c58 SHA1 1a4f63e15e68aef04f58a07089c833753be92a99 SHA256 e31930b500e8e26c53c435f86aa8cef54bc3b1c0eecebb8e0690f2145153c971 MISC metadata.xml 737 RMD160 c8195a9a8025b42fa6b9b002853f8e0d28f40ef3 SHA1 06f58d0f6cc5060d2ab8bfa68851b3b17cfdc9bc SHA256 8c6dcedc7fc648b0b967e2e4b35a3f1636aff200535463ecdb245cd0d9e0dcfd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkscqa4ACgkQ1ycZbhPLE2D8LgCgnRWeoFvN5gLeNc6EJEXweiUS -GmAAoKZf2Y2oD3p8cmKDbFmqNUgI1+K/ -=QuZL +iEYEARECAAYFAkvWt0AACgkQHB6c3gNBRYcBdwCgkxOrK4gqv+9czGuznNxevOgr +E/oAnRPhI7Q3GQMNhxGuaMvqQpQVbAM8 +=vrYI -----END PGP SIGNATURE----- diff --git a/sci-libs/libdap/files/3.10.0-fix_tests.patch b/sci-libs/libdap/files/3.10.0-fix_tests.patch new file mode 100644 index 000000000000..a9025853338b --- /dev/null +++ b/sci-libs/libdap/files/3.10.0-fix_tests.patch @@ -0,0 +1,11 @@ +diff -urN libdap-3.10.0.old//unit-tests/RCReaderTest.cc libdap-3.10.0//unit-tests/RCReaderTest.cc +--- libdap-3.10.0.old//unit-tests/RCReaderTest.cc 2010-02-02 18:45:05.000000000 +0100 ++++ libdap-3.10.0//unit-tests/RCReaderTest.cc 2010-04-27 12:00:16.000000000 +0200 +@@ -31,6 +31,7 @@ + #include + #endif + ++#include + #include + #include + #include diff --git a/sci-libs/libdap/files/libdap-3.9.2-gcc-4.4.patch b/sci-libs/libdap/files/libdap-3.9.2-gcc-4.4.patch deleted file mode 100644 index ac7e856c41c0..000000000000 --- a/sci-libs/libdap/files/libdap-3.9.2-gcc-4.4.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- util_mit.cc.orig 2009-07-18 11:29:06.529751581 -0700 -+++ util_mit.cc 2009-07-18 11:30:08.898000932 -0700 -@@ -34,6 +34,7 @@ - }; - - #include -+#include - #include - #include - #include -@@ -59,13 +60,13 @@ - - namespace libdap { - --static char * months[12] = -+static const char * months[12] = - { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" - }; - - #ifndef HAVE_STRFTIME --static char * wkdays[7] = -+static const char * wkdays[7] = - { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" - }; diff --git a/sci-libs/libdap/libdap-3.10.0.ebuild b/sci-libs/libdap/libdap-3.10.0.ebuild new file mode 100644 index 000000000000..aebd761f1126 --- /dev/null +++ b/sci-libs/libdap/libdap-3.10.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/libdap-3.10.0.ebuild,v 1.1 2010/04/27 10:06:52 scarabeus Exp $ + +EAPI="3" + +inherit base + +DESCRIPTION="Implementation of a C++ SDK for DAP 2.0 and 3.2" +HOMEPAGE="http://opendap.org/" +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" + +RDEPEND=" + dev-util/cppunit + dev-libs/libxml2 + net-misc/curl + sys-libs/zlib +" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +PATCHES=( "${FILESDIR}/${PV}-fix_tests.patch" ) + +RESTRICT="test" +# needs http connection +# FAIL: MIMEUtilTest + +src_compile() { + base_src_compile + if use doc; then + emake docs || die "make docs failed" + fi +} + +src_test() { + cd "${S}"/unit-tests + emake check || die +} + +src_install() { + base_src_install + dodoc README NEWS README.dodsrc || die + use doc && { dohtml docs/html/* || die ; } +} diff --git a/sci-libs/libdap/libdap-3.8.2.ebuild b/sci-libs/libdap/libdap-3.8.2.ebuild deleted file mode 100644 index f9bac6170d63..000000000000 --- a/sci-libs/libdap/libdap-3.8.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/libdap-3.8.2.ebuild,v 1.3 2009/05/03 03:30:29 nerdboy Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A C++ SDK which contains an implementation of DAP 2.0 and 3.2, both Client- and Server-side support." -HOMEPAGE="http://opendap.org/index.html" -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" - -RDEPEND="dev-util/cppunit - dev-util/dejagnu" - -DEPEND="${RDEPEND} - >=sys-libs/zlib-1.1.4 - >=dev-libs/libxml2-2.5.7 - >=net-misc/curl-7.12.0 - doc? ( app-doc/doxygen )" - -src_compile() { - local myconf="--disable-dependency-tracking" - econf ${myconf} || die "econf failed" - emake -j1 || die "emake failed" - - if use doc; then - make docs || die "make docs failed" - fi -} - -src_test() { - cd "${S}"/unit-tests && make check -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc README NEWS README.dodsrc README.AIS - use doc && dohtml docs/html/* -} diff --git a/sci-libs/libdap/libdap-3.9.2.ebuild b/sci-libs/libdap/libdap-3.9.2.ebuild deleted file mode 100644 index ceac7e6cdaa4..000000000000 --- a/sci-libs/libdap/libdap-3.9.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/libdap-3.9.2.ebuild,v 1.5 2009/07/18 18:53:12 nerdboy Exp $ - -inherit autotools eutils flag-o-matic - -DESCRIPTION="A C++ SDK which contains an implementation of DAP 2.0 and 3.2, both Client- and Server-side support." -HOMEPAGE="http://opendap.org/index.html" -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" - -RDEPEND="dev-util/cppunit - dev-util/dejagnu" - -DEPEND="${RDEPEND} - >=sys-libs/zlib-1.1.4 - >=dev-libs/libxml2-2.5.7 - >=net-misc/curl-7.12.0 - doc? ( app-doc/doxygen )" - -src_unpack() { - unpack ${A} - cd "${S}" - eaclocal - eautoreconf - - epatch "${FILESDIR}"/${P}-gcc-4.4.patch -} - -src_compile() { - local myconf="--disable-dependency-tracking" - econf ${myconf} || die "econf failed" - emake -j1 || die "emake failed" - - if use doc; then - make docs || die "make docs failed" - fi -} - -src_test() { - cd "${S}"/unit-tests && make check -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc README NEWS README.dodsrc README.AIS - use doc && dohtml docs/html/* -} diff --git a/sci-libs/libdap/libdap-3.9.3.ebuild b/sci-libs/libdap/libdap-3.9.3.ebuild deleted file mode 100644 index 7b72d717f9a2..000000000000 --- a/sci-libs/libdap/libdap-3.9.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libdap/libdap-3.9.3.ebuild,v 1.1 2009/12/07 06:27:24 bicatali Exp $ - -EAPI=2 -inherit autotools eutils flag-o-matic - -DESCRIPTION="Implementation of a C++ SDK for DAP 2.0 and 3.2" -HOMEPAGE="http://opendap.org/" -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" - -RDEPEND="dev-util/cppunit - dev-util/dejagnu" - -DEPEND="${RDEPEND} - >=sys-libs/zlib-1.1.4 - >=dev-libs/libxml2-2.5.7 - >=net-misc/curl-7.12.0 - doc? ( app-doc/doxygen )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.9.2-gcc-4.4.patch -} - -src_compile() { - emake || die "emake failed" - if use doc; then - emake docs || die "make docs failed" - fi -} - -src_test() { - cd "${S}"/unit-tests - emake check -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README NEWS README.dodsrc README.AIS - use doc && dohtml docs/html/* -} -- 2.26.2