Removed old. Keyword amd64-linux x86-linux

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

4 files changed, 9 insertions, 83 deletions

diff --git a/sci-misc/ncview/ChangeLog b/sci-misc/ncview/ChangeLog
index f37014c22b5d..bac8e6a07f1e 100644
--- a/sci-misc/ncview/ChangeLog
+++ b/sci-misc/ncview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/ncview
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ChangeLog,v 1.18 2011/08/06 16:34:07 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ChangeLog,v 1.19 2012/08/04 18:24:48 bicatali Exp $
+
+  04 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/ncview-1.93g-ldflags.patch, -ncview-1.93g.ebuild, ncview-2.1.1.ebuild:
+  Removed old. Keyword amd64-linux x86-linux
 
 *ncview-2.1.1 (06 Aug 2011)
 
diff --git a/sci-misc/ncview/files/ncview-1.93g-ldflags.patch b/sci-misc/ncview/files/ncview-1.93g-ldflags.patch
deleted file mode 100644
index c3fe2f739027..000000000000
--- a/sci-misc/ncview/files/ncview-1.93g-ldflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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.93g.ebuild b/sci-misc/ncview/ncview-1.93g.ebuild
deleted file mode 100644
index 1b7a0870fe3f..000000000000
--- a/sci-misc/ncview/ncview-1.93g.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.3 2011/03/26 17:25:45 jlec Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="X-based viewer for netCDF files"
-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="~amd64 ~ppc ~x86"
-
-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
-	# force netpbm (could be a use flag, but worth it?)
-	econf \
-		--x-libraries=/usr/$(get_libdir) \
-		--x-include=/usr/include \
-		--with-ppm_incdir=/usr/include/netpbm \
-		$(use_with udunits)
-}
-
-src_compile() {
-	emake NCVIEW_LIB_DIR="/usr/share/${PN}" || 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-2.1.1.ebuild b/sci-misc/ncview/ncview-2.1.1.ebuild
index 93047ad042ef..d1cb99c6abd8 100644
--- a/sci-misc/ncview/ncview-2.1.1.ebuild
+++ b/sci-misc/ncview/ncview-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ncview-2.1.1.ebuild,v 1.1 2011/08/06 16:34:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/ncview/ncview-2.1.1.ebuild,v 1.2 2012/08/04 18:24:48 bicatali Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://cirrus.ucsd.edu/pub/ncview/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="media-libs/libpng
 	>=sci-libs/netcdf-4.1[hdf5]