Link with LDFLAGS, 335387; removed old

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

4 files changed, 33 insertions, 57 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/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