Cleaning ebuilds, sub-slots

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 9 insertions, 38 deletions

diff --git a/sci-libs/netcdf-cxx/ChangeLog b/sci-libs/netcdf-cxx/ChangeLog
index 967cd1d080fd..5d18d735a7dc 100644
--- a/sci-libs/netcdf-cxx/ChangeLog
+++ b/sci-libs/netcdf-cxx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/netcdf-cxx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf-cxx/ChangeLog,v 1.6 2014/01/01 19:04:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf-cxx/ChangeLog,v 1.7 2014/02/27 18:35:14 bicatali Exp $
+
+  27 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> -netcdf-cxx-4.2-r1.ebuild,
+  metadata.xml, netcdf-cxx-4.2.1.ebuild:
+  Cleaning ebuilds, sub-slots
 
 *netcdf-cxx-4.2-r300 (01 Jan 2014)
 
diff --git a/sci-libs/netcdf-cxx/metadata.xml b/sci-libs/netcdf-cxx/metadata.xml
index c4b9426d48a5..5703447ef64a 100644
--- a/sci-libs/netcdf-cxx/metadata.xml
+++ b/sci-libs/netcdf-cxx/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   NetCDF (network Common Data Form) is an interface for scientific
   data access and a freely-distributed software library that provides an
   implementation of the interface.  The netCDF library also defines a
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r1.ebuild
deleted file mode 100644
index 8550c68b9e04..000000000000
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r1.ebuild,v 1.1 2013/01/10 18:55:41 bicatali Exp $
-
-EAPI=4
-
-inherit autotools-utils versionator
-
-MYP=${PN}4-${PV}
-
-DESCRIPTION="C++ library for netCDF"
-HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://www.unidata.ucar.edu/downloads/netcdf/ftp/${MYP}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-RDEPEND=">=sci-libs/netcdf-4.2"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${P}-config.patch )
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild
index 5f02d4a7ca1a..210fd578a368 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild,v 1.1 2014/01/01 17:19:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild,v 1.2 2014/02/27 18:35:14 bicatali Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
 SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v4.2.1.tar.gz -> ${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
-SLOT="0"
+SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs"