Link with LDFLAGS, 335387; removed old

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

5 files changed, 40 insertions, 65 deletions

diff --git a/sci-misc/ncview/ChangeLog b/sci-misc/ncview/ChangeLog
index 08313b3f293a..0f78f4cf2643 100644
--- a/sci-misc/ncview/ChangeLog
+++ b/sci-misc/ncview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/ncview
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ChangeLog,v 1.16 2009/12/14 19:12:55 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ChangeLog,v 1.17 2011/03/26 17:25:45 jlec Exp $
+
+  26 Mar 2011; Justin Lecher <jlec@gentoo.org> -ncview-1.93c.ebuild,
+  ncview-1.93g.ebuild, +files/ncview-1.93g-ldflags.patch:
+  Link with LDFLAGS, 335387; removed old
 
   14 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> ncview-1.93g.ebuild:
   Fixed ppm support and share/lib issues. Thanks Zak Kipling, bug #272266
diff --git a/sci-misc/ncview/Manifest b/sci-misc/ncview/Manifest
index b2c5979d9a02..db1dae8d7a03 100644
--- a/sci-misc/ncview/Manifest
+++ b/sci-misc/ncview/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ncview-1.93c.tar.gz 1645918 RMD160 5451fdc915a07c66509ea2ef7771dd6863b4fe45 SHA1 a59cedf61b9d48985a5896469c7320c8dfffd6f3 SHA256 e180ab469f8aa403febaf4278386a7cfc7d00830dce4db094fc039eebd77944f
+AUX ncview-1.93g-ldflags.patch 659 RMD160 94dd7a0f3b9c99625c1cf2ac9dd3d8861260fca8 SHA1 c0467391dceceb803075b12dade3d04c89a06a7d SHA256 e9ac1e6818c4e62d6e1e34e948c4e2d39f8095bdc0ef5419add6c2a403b44df1
 DIST ncview-1.93g.tar.gz 1689171 RMD160 036f2b6851085243dedadb6d47292b0467ce1426 SHA1 193b1e51d6ad7257bc4050493b708d5c12c16419 SHA256 62b18fcc805712ced26834e15cb228f2b7b5cb60c4330dbc39071fc823326450
-EBUILD ncview-1.93c.ebuild 1386 RMD160 7e1cf919d6ed73265bedd139a5dcaa6d117dc131 SHA1 9ebfe1ab4fb47d83865ff10bae15f131a918b7fc SHA256 f5db691f0934a7ed7c1e5c1afc69268eadb0cbe0bc34464cfd6549966a406244
-EBUILD ncview-1.93g.ebuild 1572 RMD160 2806d59bbefacb583f605d3a9067e6cfaad6b548 SHA1 c56a015b915ed4f01d2d63f1e6404b75b0bbf592 SHA256 daac8e98ba340519f4422644e65563d3803afc9ac74a0b29f821f3215bba8bb2
-MISC ChangeLog 2922 RMD160 023a318f099a86a45c70e1500cd063b3aad009c4 SHA1 64f7e782ddd287e8a74e5a82bb36ba6859372cc8 SHA256 628af22b2d6218c5d97809eda272377673a9afe77c59ed65b4642895a008149a
+EBUILD ncview-1.93g.ebuild 1631 RMD160 d285570e79aa36f49f0229318201d9f7b63f623f SHA1 371bfdbad38bf14fd372d623563ef4382e18294d SHA256 4cb73a262c59b74b57f31b2cfaa390815d0b9131d4700ed5bfb1967f69d6cbdd
+MISC ChangeLog 3087 RMD160 9c9012cbd3daf70ff3a08bd537cdfaed954f211e SHA1 7e7813c1a813f56c58b3afaa20afe28f82e96f17 SHA256 f3790dc3c4067c6633268ea53e73338ab1b86c24f4c3b701d9e5f3c83751dff0
 MISC metadata.xml 585 RMD160 59f4ebe01b2404ab4597f2712f0a294977a024d5 SHA1 49bcd46f00a22965017afbe991a0c3269400c2f9 SHA256 2be8f1037f02884e34899086b86e5bb2c26e40c0b30fea15a8953d60cbbe0be6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAksml2oACgkQ1ycZbhPLE2AdJQCggBRz90GEgoll5VPt41Cy4uiN
-obYAn3FsxTpsnorBHDYzwV+AUCEV0jGL
-=dPx+
+iEYEARECAAYFAk2OIZ4ACgkQgAnW8HDreRb+bwCfc6nFpDFmHjFz98mOSRSLmi5/
+l8EAnAgCIm3OXbsWhCDGgq0h5/kjFYoH
+=5TDP
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/ncview/files/ncview-1.93g-ldflags.patch b/sci-misc/ncview/files/ncview-1.93g-ldflags.patch
new file mode 100644
index 000000000000..c3fe2f739027
--- /dev/null
+++ b/sci-misc/ncview/files/ncview-1.93g-ldflags.patch
@@ -0,0 +1,16 @@
+ ncview-1.93g/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ncview-1.93g/Makefile.in b/ncview-1.93g/Makefile.in
+index 2171c1b..2737b14 100644
+--- a/ncview-1.93g/Makefile.in
++++ b/ncview-1.93g/Makefile.in
+@@ -115,7 +115,7 @@ clean::
+ 	-rm ncview ncview.exe $(OBJS) Makefile config.cache config.log config.status
+ 
+ ncview: $(OBJS)
+-	@CC@ $(MYCFLAGS) -o ncview $(OBJS) $(LDOPTIONS) $(OTHERLIBDIRS)	\
++	@CC@ $(LDFLAGS) $(MYCFLAGS) -o ncview $(OBJS) $(LDOPTIONS) $(OTHERLIBDIRS)	\
+ 		@X_LIBS@ $(NETCDFLIB) $(UDUNITSLIB) $(XAWLIB) $(XMULIB) \
+ 		$(PPMLIB) \
+ 		@X_PRE_LIBS@ $(XTOOLLIB) $(XEXTLIB) $(XLIB) @X_EXTRA_LIBS@ -lm
diff --git a/sci-misc/ncview/ncview-1.93c.ebuild b/sci-misc/ncview/ncview-1.93c.ebuild
deleted file mode 100644
index 77bb3af01c71..000000000000
--- a/sci-misc/ncview/ncview-1.93c.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.4 2008/06/29 08:02:03 tove 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 \
-		--x-libraries=/usr/$(get_libdir) \
-		--x-include=/usr/include \
-		--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 || die "emake install failed"
-	insinto /usr/share/${PN}
-	doins *.ncmap nc_overlay* || die "doins failed"
-	dodoc README README_WISH_LIST RELEASE_NOTES || die
-}
diff --git a/sci-misc/ncview/ncview-1.93g.ebuild b/sci-misc/ncview/ncview-1.93g.ebuild
index f31e200a82a7..1b7a0870fe3f 100644
--- a/sci-misc/ncview/ncview-1.93g.ebuild
+++ b/sci-misc/ncview/ncview-1.93g.ebuild
@@ -1,25 +1,31 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ncview-1.93g.ebuild,v 1.2 2009/12/14 19:12:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ncview-1.93g.ebuild,v 1.3 2011/03/26 17:25:45 jlec Exp $
 
 EAPI=2
+
 inherit eutils flag-o-matic
 
 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"
+SRC_URI="ftp://cirrus.ucsd.edu/pub/ncview/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="udunits"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="sci-libs/netcdf
+DEPEND="
 	media-libs/netpbm
+	sci-libs/netcdf
 	x11-libs/libXaw
 	udunits? ( sci-libs/udunits )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
 src_configure() {
 	# Makefile doesn't actually respect --with-ppm_incdir
 	append-flags -I/usr/include/netpbm