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

(Portage version: 2.2_rc23/cvs/Linux x86_64)

5 files changed, 26 insertions, 58 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/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
 }