commit:     ac9bca29572c3f1dcd99bf21256782b95c89b6fa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  5 12:11:46 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 12:25:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9bca29

sci-geosciences/cdat-lite: Remove last-rited pkg, #601192

 profiles/package.mask                              |   6 -
 sci-geosciences/cdat-lite/Manifest                 |   1 -
 sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild |  44 -------
 .../cdat-lite/files/cdat-lite-6.0_rc2-QA.patch     | 132 ---------------------
 sci-geosciences/cdat-lite/metadata.xml             |   5 -
 5 files changed, 188 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index d889c3547c1..68d618eeeb7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -388,12 +388,6 @@ sys-block/afacli
 
 # Michał Górny <[email protected]> (05 Jun 2017)
 # (on behalf of Treecleaner project)
-# Unmaintained in Gentoo. Reported not to work. Uses old wxPython.
-# Removal in 30 days. Bug #601192.
-sci-geosciences/cdat-lite
-
-# Michał Górny <[email protected]> (05 Jun 2017)
-# (on behalf of Treecleaner project)
 # Unmaintained in Gentoo. Multiple bugs, including a security
 # vulnerability. Removal in 30 days. Bug #581960.
 net-irc/atheme-services

diff --git a/sci-geosciences/cdat-lite/Manifest 
b/sci-geosciences/cdat-lite/Manifest
deleted file mode 100644
index 9de625d4076..00000000000
--- a/sci-geosciences/cdat-lite/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cdat_lite-6.0rc2.tar.gz 3563402 SHA256 
6cbfdf9b47fdbc189ca7d2819dafb6cf958116e0f6077b325c375a0ddfab2a95 SHA512 
bf6bc00305d29adbb2608865a56e2fe36dde56f4d7a0e63266549ce5e74120be602ac16c3e1c02bc9216e7c613ad92697f6a61a4b02158e1bf46e178d841a90f
 WHIRLPOOL 
9cbb784402713231c89b37eb69969ed1431848d38973eb1d3682c260509ae892c35c97a96f386713e9ff30e0d51fbe9197073aa92533b92f799b2331db61d41f

diff --git a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild 
b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
deleted file mode 100644
index aa5d6253188..00000000000
--- a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk,xml"
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit eutils distutils-r1 toolchain-funcs
-
-MY_P=${P/-/_}
-MY_P=${MY_P/_rc/rc}
-
-DESCRIPTION="Large suite of open source tools for the management and analysis 
of climate data"
-HOMEPAGE="http://proj.badc.rl.ac.uk/cedaservices/wiki/CdatLite";
-SRC_URI="http://ndg.nerc.ac.uk/dist/${MY_P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-       >=sci-libs/netcdf-4.0.1:0=
-       >=sci-libs/hdf5-1.6.4
-       dev-python/numpy[${PYTHON_USEDEP}]
-       dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-       virtual/python-pmw[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}
-       !sci-biology/ncbi-tools"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       tc-export CC FC RANLIB AR
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-QA.patch
-       find "${S}" -type l -delete || die
-       distutils-r1_src_prepare
-}

diff --git a/sci-geosciences/cdat-lite/files/cdat-lite-6.0_rc2-QA.patch 
b/sci-geosciences/cdat-lite/files/cdat-lite-6.0_rc2-QA.patch
deleted file mode 100644
index a00206ea739..00000000000
--- a/sci-geosciences/cdat-lite/files/cdat-lite-6.0_rc2-QA.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- cdat_lite-6.0rc2/libcdms/Makefile.in
-+++ cdat_lite-6.0rc2/libcdms/Makefile.in
-@@ -44,15 +44,15 @@
- PARMDIR=$(prefix)/lib/lats
- 
- CC = @CC@
--CFLAGS = -I../../include @CFLAGS@ $(DEBUG) -Dgrads @GRIB2INC@ @GRIB2OPTS@
-+CFLAGS = -fPIC -I../../include @CFLAGS@ -Dgrads @GRIB2INC@ @GRIB2OPTS@
- CPPFLAGS = @CPPFLAGS@
- DEBUG = -O
- DEFS = @DEFS@
- FC = @FC@
--FFLAGS = -I../../include @FFLAGS@ $(DEBUG)
-+FFLAGS = -I../../include @FFLAGS@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--LDFLAGS = -L../../../lib -lcdms @NCOPTS@ @HDFOPTS@ @DRSOPTS@ @LIBS@ @GRIB2LIB@
-+LDFLAGS += -L../../../lib -lcdms @NCOPTS@ @HDFOPTS@ @DRSOPTS@ @LIBS@ 
@GRIB2LIB@
- OS = @OS@
- RANLIB = @RANLIB@
- 
---- cdat_lite-6.0rc2/libcdms/src/db_util/Makefile.in
-+++ cdat_lite-6.0rc2/libcdms/src/db_util/Makefile.in
-@@ -38,17 +38,18 @@
- PARMDIR=$(prefix)/lib/lats
- 
- CC = @CC@
--CFLAGS = -I../../include @CFLAGS@ $(DEBUG) -Dgrads
-+CFLAGS = -fPIC -I../../include @CFLAGS@ -Dgrads
- CPPFLAGS = @CPPFLAGS@
- DEBUG = -O
- DEFS = @DEFS@
- FC = @FC@
--FFLAGS = -I../../include @FFLAGS@ $(DEBUG)
-+FFLAGS = -I../../include @FFLAGS@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--LDFLAGS = -L../../../lib -lcdms @NCOPTS@ @DRSOPTS@ @LIBS@
-+LDFLAGS += -L../../../lib -lcdms @NCOPTS@ @DRSOPTS@ @LIBS@
- OS = @OS@
- RANLIB = @RANLIB@
-+AR ?= ar
- 
- # Shell to run make subcommands
- SHELL = /bin/sh
-@@ -60,7 +61,7 @@
-                 cdUtil.o
- 
- all:          $(OBJS) FORCE
--              ar rv $(LIBRARY) $(OBJS)
-+              $(AR) rv $(LIBRARY) $(OBJS)
-               $(RANLIB) $(LIBRARY)
- 
- cdTimeConv.o: cdTimeConv.c ../../include/cdmsint.h ../../include/cdms.h 
../../include/cdunif.h
---- cdat_lite-6.0rc2/libcdms/src/cdunif/Makefile.in
-+++ cdat_lite-6.0rc2/libcdms/src/cdunif/Makefile.in
-@@ -47,29 +47,29 @@
- PARMDIR=$(prefix)/lib/lats
- 
- # Set the compiler flag for the 64-bit Opteron platform
-+CC = @CC@
- ARCH=$(shell uname -m)
- ifeq ($(ARCH),x86_64)
--   CC = gcc -fPIC -D__x86_64__
--else
--   CC = @CC@
-+   CC += -fPIC -D__x86_64__
- endif
- 
- ifneq (@GRIB2INC@,)
--  CFLAGS = -I../../include -I"@NCINC@" -I@HDFINC@ -I@DRSINC@ @CFLAGS@ 
$(DEBUG) -Dgrads -I@GRIB2INC@ @GRIB2OPTS@
-+  CFLAGS = -I../../include -I"@NCINC@" -I@HDFINC@ -I@DRSINC@ @CFLAGS@ -Dgrads 
-I@GRIB2INC@ @GRIB2OPTS@
- else
--  CFLAGS = -I../../include -I"@NCINC@" -I@HDFINC@ -I@DRSINC@ @CFLAGS@ 
$(DEBUG) -Dgrads
-+  CFLAGS = -I../../include -I"@NCINC@" -I@HDFINC@ -I@DRSINC@ @CFLAGS@ -Dgrads
- endif
- 
--CPPFLAGS = @CPPFLAGS@ -DSTNDALN=1 -DBYTEORDER=@GRADS_BYTEORDER@ 
-DGRADS_CRAY=@GRADS_CRAY@ @QLOPTS@ @PPOPTS@ @GRIB2OPTS@
-+CPPFLAGS += @CPPFLAGS@ -DSTNDALN=1 -DBYTEORDER=@GRADS_BYTEORDER@ 
-DGRADS_CRAY=@GRADS_CRAY@ @QLOPTS@ @PPOPTS@ @GRIB2OPTS@
- DEBUG = -O
- DEFS = @DEFS@
- FC = @FC@
--FFLAGS = -I../../include @FFLAGS@ $(DEBUG)
-+FFLAGS = -I../../include @FFLAGS@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--LDFLAGS = -L../../../lib -lcdms @NCOPTS@ @HDFOPTS@ @DRSOPTS@ @LIBS@ @GRIB2LIB@
-+LDFLAGS += -L../../../lib -lcdms @NCOPTS@ @HDFOPTS@ @DRSOPTS@ @LIBS@ 
@GRIB2LIB@
- OS = @OS@
- RANLIB = @RANLIB@
-+AR ?= ar
- 
- # Shell to run make subcommands
- SHELL = /bin/sh
-@@ -80,7 +80,7 @@
- OBJS          = cdunif.o cdunifint.o cdunifgen.o cdunifdrs.o cdunifgrads.o 
cdunifnc.o cdunifhdf.o cdunifslab.o cdunifstub.o cdunifra.o cdrra.o cdsort.o 
gamach.o gaio.o gaprnt.o gautil.o gaddes.o galloc.o gabufr.o gabufrtbl.o 
cdunifql.o @GRADS_IEEE2CRAY_OBJECT@
- 
- all:          $(OBJS) FORCE
--              ar rv $(LIBRARY) $(OBJS)
-+              $(AR) rv $(LIBRARY) $(OBJS)
-               cd cdunifpp; $(MAKE) DEBUG=$(DEBUG)
-               $(RANLIB) $(LIBRARY)
- 
---- cdat_lite-6.0rc2/libcdms/src/cdunif/cdunifpp/Makefile.in
-+++ cdat_lite-6.0rc2/libcdms/src/cdunif/cdunifpp/Makefile.in
-@@ -37,12 +37,13 @@
- # set to blank if you don't want to rename symbols in unpacking routines
- 
- CC = @CC@
--CFLAGS = -I../../../include/cdunifpp -I@NCINC@ @CFLAGS@ -I../../../include 
$(DEBUG)
-+CFLAGS = -fPIC -I../../../include/cdunifpp -I@NCINC@ @CFLAGS@ 
-I../../../include
- CPPFLAGS = @CPPFLAGS@ @PPOPTS@ -Uhdf
- LIBRARY = ../../../lib/libcdms.a
-+AR ?= ar
- 
- all: $(OBJS)
--      ar rv $(LIBRARY) $(OBJS)
-+      $(AR) rv $(LIBRARY) $(OBJS)
- # (ranlib called by higher-level makefile)
- 
- %.o: %.c $(HEADERS)
---- cdat_lite-6.0rc2/setup_util.py
-+++ cdat_lite-6.0rc2/setup_util.py
-@@ -296,8 +296,6 @@
-             nc4_defs = ''
- 
-         self._system('cd libcdms ; '
--                     'CFLAGS="-fPIC" '
--                     'CC=%(cc)s '
-                      'sh ./configure --disable-drs --disable-hdf '
-                      '--disable-ql --with-ncinc=%(ncinc)s 
--with-ncincf=%(ncinc)s --with-nclib=%(nclib)s %(nc4)s'
-                      % dict(ncinc=netcdf_config.netcdf_incdir, 
nclib=netcdf_config.netcdf_libdir,

diff --git a/sci-geosciences/cdat-lite/metadata.xml 
b/sci-geosciences/cdat-lite/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/sci-geosciences/cdat-lite/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

Reply via email to