added --with-x, possibly fixing bug #205257

Package-Manager: portage-2.1.4_rc14

5 files changed, 25 insertions, 75 deletions

diff --git a/sci-misc/ncview/ChangeLog b/sci-misc/ncview/ChangeLog
index 5d8fccce3ce8..ab6bf44fe587 100644
--- a/sci-misc/ncview/ChangeLog
+++ b/sci-misc/ncview/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-misc/ncview
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ChangeLog,v 1.10 2007/08/20 13:40:40 bicatali Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ChangeLog,v 1.11 2008/01/11 09:51:39 bicatali Exp $
+
+  11 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> -ncview-1.93b.ebuild,
+  ncview-1.93c.ebuild:
+  added --with-x, possibly fixing bug #205257
+
+  11 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> -ncview-1.93b.ebuild,
+  ncview-1.93c.ebuild:
+  Added libICE dependency (bug #205257), removed older version.
 
 *ncview-1.93c (20 Aug 2007)
 
diff --git a/sci-misc/ncview/Manifest b/sci-misc/ncview/Manifest
index 869d0e6907af..666bf105639c 100644
--- a/sci-misc/ncview/Manifest
+++ b/sci-misc/ncview/Manifest
@@ -1,34 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ncview-1.93b.tar.gz 1633213 RMD160 681d125fe691b87b94aa6f2bddce3a82530d37a8 SHA1 2b4d420b5431ec9e124e5d9472b9fe7cdbc7960f SHA256 cff92766da744b6dd042320049c999252854e51ae7020cb4faf8049d25fa4718
 DIST ncview-1.93c.tar.gz 1645918 RMD160 5451fdc915a07c66509ea2ef7771dd6863b4fe45 SHA1 a59cedf61b9d48985a5896469c7320c8dfffd6f3 SHA256 e180ab469f8aa403febaf4278386a7cfc7d00830dce4db094fc039eebd77944f
-EBUILD ncview-1.93b.ebuild 1314 RMD160 7fd592895f45cf2b6ecbd746c6d3d240b68d2c2e SHA1 4879ae3ab86eb61dd33620f02c64b545bd1bfa94 SHA256 687e48f680639ea372767f724b0dce3ce1242c5fa72d0e3a31e15c3637252fb2
-MD5 3881e3204760be3ce12c2b93eee9274f ncview-1.93b.ebuild 1314
-RMD160 7fd592895f45cf2b6ecbd746c6d3d240b68d2c2e ncview-1.93b.ebuild 1314
-SHA256 687e48f680639ea372767f724b0dce3ce1242c5fa72d0e3a31e15c3637252fb2 ncview-1.93b.ebuild 1314
-EBUILD ncview-1.93c.ebuild 1313 RMD160 5f6aaac1a28433621050d4c5c35b941d8d7ad8a8 SHA1 278110394a7596ee6a80de0a9936cb87e2ec619c SHA256 11e7c2d1631cf942f5b2844ab7781bf2b0f4ac276e5631fb00212857613b7728
-MD5 36d7e94300f90c9fda4977ffc3de7413 ncview-1.93c.ebuild 1313
-RMD160 5f6aaac1a28433621050d4c5c35b941d8d7ad8a8 ncview-1.93c.ebuild 1313
-SHA256 11e7c2d1631cf942f5b2844ab7781bf2b0f4ac276e5631fb00212857613b7728 ncview-1.93c.ebuild 1313
-MISC ChangeLog 2105 RMD160 99a393131656a296eb51658e237ee47608e3c172 SHA1 080b2175a817cccac19ae37d6d677ea6df876539 SHA256 7f61a3ae2df0587486ab1e4b203a67bd097a53ceafb255c1e003062cb33f5a06
-MD5 5c26adad27660f16ad58ef6fc8392f59 ChangeLog 2105
-RMD160 99a393131656a296eb51658e237ee47608e3c172 ChangeLog 2105
-SHA256 7f61a3ae2df0587486ab1e4b203a67bd097a53ceafb255c1e003062cb33f5a06 ChangeLog 2105
+EBUILD ncview-1.93c.ebuild 1326 RMD160 8abf511ce8f4b4b5460105258cd54043a13d01de SHA1 f78a2bd997421f4404516de10e345f869e1e7fac SHA256 88dc143d45e71788ee3e43ded8e52f84f996aee37597c3e25df96811914092de
+MD5 c34ecc96161429ca78f601f25ce03e29 ncview-1.93c.ebuild 1326
+RMD160 8abf511ce8f4b4b5460105258cd54043a13d01de ncview-1.93c.ebuild 1326
+SHA256 88dc143d45e71788ee3e43ded8e52f84f996aee37597c3e25df96811914092de ncview-1.93c.ebuild 1326
+MISC ChangeLog 2417 RMD160 3feb17cdecf3d02516272f4dd545c57a0db2b5cf SHA1 a39c5c72cd0f1459fe596f69af6aa362ad31058a SHA256 fe9a3f8f85e63d1dcffc17dacbf4619dc9a713282ea5a351a95247b5356d96da
+MD5 921bc2ba163e8f4a488955399250b72f ChangeLog 2417
+RMD160 3feb17cdecf3d02516272f4dd545c57a0db2b5cf ChangeLog 2417
+SHA256 fe9a3f8f85e63d1dcffc17dacbf4619dc9a713282ea5a351a95247b5356d96da ChangeLog 2417
 MISC metadata.xml 503 RMD160 1b0a2c0c327644adc1ef708526d4ee364df2bb0c SHA1 357f9f79c5e3d6c756cab98dde8b621a60176b1f SHA256 24ff70c70c86250765c52acfacc929f18de742eb3ff2d919bf74ccff32ce4a6c
 MD5 f7ce915bee359c2ef1fc3aebabea8a75 metadata.xml 503
 RMD160 1b0a2c0c327644adc1ef708526d4ee364df2bb0c metadata.xml 503
 SHA256 24ff70c70c86250765c52acfacc929f18de742eb3ff2d919bf74ccff32ce4a6c metadata.xml 503
-MD5 b66b6b8bb904d7db6953396bf03aa7ea files/digest-ncview-1.93b 241
-RMD160 27ac1a2caafe27db49f325961a234cda5e35ffb1 files/digest-ncview-1.93b 241
-SHA256 6cd43d23b22c913c0f20a0c801aae12437e26fd03a215042713f13a5682a4774 files/digest-ncview-1.93b 241
 MD5 a0cf2c03537b41069fe4323baa0ab7e6 files/digest-ncview-1.93c 241
 RMD160 2133bdefcb7c00ae9dd11775c50ef1f2bceebc37 files/digest-ncview-1.93c 241
 SHA256 1e251d62be52d7b0e41eaa34be08d0d0604ebb241eea013164a63d813ed0be6f files/digest-ncview-1.93c 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGyZnl1ycZbhPLE2ARAhqnAJ9Wq9yJcau/P+Z2V2eWAfiALavnCQCeLKao
-Aq3dODc7v4rw+AWb0Z+h0Ko=
-=4cgN
+iD8DBQFHhzxd1ycZbhPLE2ARAp4rAJ9H3/CddUk3ldQhvggc7kde2pbQjwCgjgh/
+pVFWWs9T1ZqZgF1wZVdtAqQ=
+=M1t4
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/ncview/files/digest-ncview-1.93b b/sci-misc/ncview/files/digest-ncview-1.93b
deleted file mode 100644
index 70d805bd8ca8..000000000000
--- a/sci-misc/ncview/files/digest-ncview-1.93b
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 48c99b2eda1bbc86d7fbe648977f1844 ncview-1.93b.tar.gz 1633213
-RMD160 681d125fe691b87b94aa6f2bddce3a82530d37a8 ncview-1.93b.tar.gz 1633213
-SHA256 cff92766da744b6dd042320049c999252854e51ae7020cb4faf8049d25fa4718 ncview-1.93b.tar.gz 1633213
diff --git a/sci-misc/ncview/ncview-1.93b.ebuild b/sci-misc/ncview/ncview-1.93b.ebuild
deleted file mode 100644
index 00f1afbe8be6..000000000000
--- a/sci-misc/ncview/ncview-1.93b.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ncview-1.93b.ebuild,v 1.3 2007/07/22 06:56:34 dberkholz Exp $
-
-inherit multilib
-
-DESCRIPTION="X-based viewer for netCDF files"
-SRC_URI="ftp://cirrus.ucsd.edu/pub/ncview/${P}.tar.gz"
-HOMEPAGE="http://meteora.ucsd.edu/~pierce/ncview_home_page.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="udunits"
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-DEPEND="sci-libs/netcdf
-	media-libs/netpbm
-	x11-libs/libXaw
-	udunits? ( sci-libs/udunits )"
-
-src_compile() {
-	# force netpbm (could be a use flag, but worth it?)
-	econf \
-		--with-libppm \
-		$(use_with udunits) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	local appdef=/usr/share/X11/app-defaults
-	dodir ${appdef}
-	dodir /usr/share/${PN}
-	# fix when root installs it.
-	sed -i \
-		-e "s:/usr/lib/X11/app-defaults:${D}${appdef}:g" \
-		install-appdef || die "sed failed"
-	emake \
-		DESTDIR="${D}" \
-		BINDIR="${D}/usr/bin" \
-		MANDIR="${D}/usr/share/man/man1" \
-		NCVIEW_LIB_DIR="${D}/usr/share/${PN}" \
-		XAPPLRESDIR="${D}/usr/share/X11/app-defaults" \
-		install || "emake install failed"
-	insinto /usr/share/${PN}
-	doins *.ncmap nc_overlay* || die "doins failed"
-	dodoc README README_WISH_LIST RELEASE_NOTES
-}
diff --git a/sci-misc/ncview/ncview-1.93c.ebuild b/sci-misc/ncview/ncview-1.93c.ebuild
index 53eab31a1305..47e58b3ac187 100644
--- a/sci-misc/ncview/ncview-1.93c.ebuild
+++ b/sci-misc/ncview/ncview-1.93c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ncview-1.93c.ebuild,v 1.1 2007/08/20 13:40:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ncview-1.93c.ebuild,v 1.2 2008/01/11 09:51:39 bicatali Exp $
 
 inherit multilib
 
@@ -21,6 +21,7 @@ DEPEND="sci-libs/netcdf
 src_compile() {
 	# force netpbm (could be a use flag, but worth it?)
 	econf \
+		--with-x \
 		--with-libppm \
 		$(use_with udunits) \
 		|| die "econf failed"