Fixed SRC_URI and re-fetch tar, thanks to Valeri Sokolov, closing bug #255692. Patch not needed anymore, and install one example. Removed older version, updated description in metadata.xml

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 40 insertions, 65 deletions

diff --git a/sci-libs/szip/ChangeLog b/sci-libs/szip/ChangeLog
index 9229a3dfb4af..43d49d08589f 100644
--- a/sci-libs/szip/ChangeLog
+++ b/sci-libs/szip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/szip
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/szip/ChangeLog,v 1.14 2008/04/09 01:13:43 jer Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/szip/ChangeLog,v 1.15 2009/01/21 10:06:14 bicatali Exp $
+
+  21 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/szip-2.0-example.patch, metadata.xml, -szip-2.0.ebuild,
+  szip-2.1.ebuild:
+  Fixed SRC_URI and re-fetch tar, thanks to Valeri Sokolov, closing bug
+  #255692. Patch not needed anymore, and install one example. Removed older
+  version, updated description in metadata.xml
 
   09 Apr 2008; Jeroen Roovers <jer@gentoo.org> szip-2.1.ebuild:
   Marked ~hppa (bug #216855).
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index a3e8f8e50f95..05440f85f625 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX szip-1.1-fPIC.patch 312 RMD160 95adeb61f713d3c6af066b2d26fb9cc5793a4b17 SHA1 ee0bcb8aad039cf7b84afa104a07f28f6da94887 SHA256 e7fe3de5b68d441b90d705296fb6c1fec6a8eb2d26c57568f121d6eda3255ee0
-AUX szip-2.0-example.patch 431 RMD160 8f1ae25bd7d095deae048d7a23ba664ff857a888 SHA1 b4c4ed5ae52d2795135f6b3b28816e0681781e22 SHA256 88c568f554d78089243e030b9367f09a9eeb1508a46e67d8962b88c770ad5249
-DIST szip-2.0.tar.gz 368913 RMD160 4ab7780bc00efa39d071ac2ef92580dcd02dae6e SHA1 6d811c3a75b86e3dded2b849058a1f368aebd60e SHA256 7e89f7960f012e9bdbd79d55e324bd7991b6ab17515ce802881c9d695337be25
-DIST szip-2.1.tar.gz 395758 RMD160 8a0829741375e4d79d7ebc6ba291b3ab7d0cd7ed SHA1 749181f2333937c8321b5f61616b1ad9b1d4bf01 SHA256 90f103d6bb3d48e1ab32284d35a34411217b138d45efd830b2cb42a29c5c8d5c
+DIST szip-2.1.tar.gz 395864 RMD160 dfb3e60871f171eafc84fe502a2b836de8be7ffe SHA1 6bb0e494adce0bc4a5f0360460ee29041dedd7b4 SHA256 dfac277860e0dfb3c3163589697ed855f12aaa5902fed7c0aee872d8323de014
 DIST szip1.1.tar.gz 98774 RMD160 a54cd87a1cf6cb50323d4baa164319ff9e237388 SHA1 a75f909366e0bce60552f260ef88e26614763f2f SHA256 4eed85645a28a11ec5473db67b6e0eef01ea0e7f49695725277279cccfb7301f
 EBUILD szip-1.1-r1.ebuild 854 RMD160 2df0d5caaa457bb0607568b18659e92baaba2817 SHA1 a294fd222ad811aa0451fe0689e27592cfdcca70 SHA256 9a145eed28f01cfdaf3ac771bb376de0c59ebc11b861ce7cdeaa2850b074ba23
-EBUILD szip-2.0.ebuild 854 RMD160 e5ccdf0d7d02fe6fa44efc8a399552133d33e72c SHA1 cea4b28fbfd9601fa59cff68f2b0550d90c85ab4 SHA256 f9266431ed818c1d35f6e62fb651f6df1223cc228a89030e78112cd1a259acdb
-EBUILD szip-2.1.ebuild 759 RMD160 21d392c1f7a3dc9c499dd108242d21bec002b261 SHA1 3f4a0520d63d8e8b6966ba21325a3117361ed313 SHA256 ad93e0a6a39f69c87b21da9974853bf2005c297154e9d0f29d918f12688ee53e
-MISC ChangeLog 2133 RMD160 8adc75641ae1fe8fe4f854db4512f8c0636466f0 SHA1 53b62830ca587bc8de7ce4fe35e9ee70d91d8331 SHA256 06b6f7bf9d2cbd4798d0117f47b386ecb396d61781ac8d07d11ae5a989cad81c
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+EBUILD szip-2.1.ebuild 736 RMD160 37ddd8a426bdfadf8889a79e281be25d2eadde57 SHA1 2181516742e6b58b00ad30d79f71aca086ed9e57 SHA256 d897f6e8ad5e3390a3c43ea41b270f46794363c97fb85d11c35c11100badf340
+MISC ChangeLog 2473 RMD160 67afb974d285c43965a1b1c99853819bd53c7e33 SHA1 675802c183e26b4689481406ef0595483958120c SHA256 ef365ad233d66aa6ca2b3cc303b39f6fe2b3dd63e6a63ef9c341b6508d5f977c
+MISC metadata.xml 666 RMD160 1f0a1da2d49028718ff9fcf23801bf88eae8de32 SHA1 8854b8d2111ce36dfe05ed91f33c36bf9947fe81 SHA256 b2b8356d0d394c76c4622072c5d388cc178058a8d734d129b93afc53e4a7a1d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkl2858ACgkQ1ycZbhPLE2A/LwCggAmlKoF0J5fs0xZhwJMBiJ6R
+UxcAoIvb0AEFD82wAofzhgAKV2Hd5sF7
+=2gdp
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/szip/files/szip-2.0-example.patch b/sci-libs/szip/files/szip-2.0-example.patch
deleted file mode 100644
index fafb0a2ef3e8..000000000000
--- a/sci-libs/szip/files/szip-2.0-example.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in~	2004-11-17 20:54:41.000000000 +0000
-+++ examples/Makefile.in	2007-08-18 11:35:26.000000000 +0100
-@@ -144,7 +144,7 @@
- noinst_PROGRAMS = burst_szip example
- 
- burst_szip_SOURCES = burst_szip.c
--burst_szip_LDADD = ../test/libmcgill.la ../src/libsz.la
-+burst_szip_LDADD = ../test/libmcgill.la ../src/libsz.la -lm
- burst_szip_DEPENDENCIES = ../test/libmcgill.la ../src/libsz.la
- 
- example_SOURCES = example.c
diff --git a/sci-libs/szip/metadata.xml b/sci-libs/szip/metadata.xml
index b229aec85b8f..a1d93197140d 100644
--- a/sci-libs/szip/metadata.xml
+++ b/sci-libs/szip/metadata.xml
@@ -2,4 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription lang="en">
+  The Consultative Committee on Space Data Systems (CCSDS) has adopted
+  the extended-Rice algorithm for international standards for space
+  applications. Szip is reported to provide fast and effective
+  compression, specifically for the EOS data generated by the NASA
+  Earth Observatory System (EOS). It was originally developed at
+  University of New Mexico (UNM) and integrated with HDF4 by UNM
+  researchers and developers. It can be used for HDF 5 as well.
+</longdescription>
 </pkgmetadata>
diff --git a/sci-libs/szip/szip-2.0.ebuild b/sci-libs/szip/szip-2.0.ebuild
deleted file mode 100644
index 7a599d807e22..000000000000
--- a/sci-libs/szip/szip-2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/szip/szip-2.0.ebuild,v 1.1 2007/08/18 10:59:39 bicatali Exp $
-
-inherit eutils
-
-DESCRIPTION="Szip is an implementation of the extended-Rice lossless compression algorithm"
-HOMEPAGE="http://hdf.ncsa.uiuc.edu/HDF5/doc_resource/SZIP/"
-SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
-LICENSE="szip"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE=""
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	# fix example with adding -lm
-	cd "${S}"
-	epatch "${FILESDIR}"/szip-2.0-example.patch
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc RELEASE.txt
-}
diff --git a/sci-libs/szip/szip-2.1.ebuild b/sci-libs/szip/szip-2.1.ebuild
index 82cb4c5b60cd..c270efa492e1 100644
--- a/sci-libs/szip/szip-2.1.ebuild
+++ b/sci-libs/szip/szip-2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/szip/szip-2.1.ebuild,v 1.3 2008/04/09 01:13:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/szip/szip-2.1.ebuild,v 1.4 2009/01/21 10:06:14 bicatali Exp $
 
 inherit eutils
 
 DESCRIPTION="Implementation of the extended-Rice lossless compression algorithm"
-HOMEPAGE="http://hdf.ncsa.uiuc.edu/doc_resource/SZIP/"
-SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.hdfgroup.org/doc_resource/SZIP/"
+SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 LICENSE="szip"
 
 SLOT="0"
@@ -15,14 +15,10 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	# fix example with adding -lm
-	cd "${S}"
-	epatch "${FILESDIR}"/szip-2.0-example.patch
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc RELEASE.txt || die
+	dodoc RELEASE.txt HISTORY.txt
+	insinto /usr/share/doc/${PF}/
+	emake -C examples clean || die
+	doins -r examples
 }