sci-libs/matio: Fix license to BSD-2, #536294

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 35 insertions, 26 deletions

diff --git a/sci-libs/matio/ChangeLog b/sci-libs/matio/ChangeLog
index a8b5c801eca6..507a9ea3be36 100644
--- a/sci-libs/matio/ChangeLog
+++ b/sci-libs/matio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/matio
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/matio/ChangeLog,v 1.7 2013/08/08 21:48:11 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/matio/ChangeLog,v 1.8 2015/02/02 14:49:00 jlec Exp $
+
+  02 Feb 2015; Justin Lecher <jlec@gentoo.org> matio-1.5.1.ebuild,
+  matio-1.5.2.ebuild, metadata.xml:
+  Fix license to BSD-2, #536294
 
 *matio-1.5.2 (08 Aug 2013)
 
diff --git a/sci-libs/matio/matio-1.5.1.ebuild b/sci-libs/matio/matio-1.5.1.ebuild
index 1658d8ea4808..e879a72f2a1e 100644
--- a/sci-libs/matio/matio-1.5.1.ebuild
+++ b/sci-libs/matio/matio-1.5.1.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/matio/matio-1.5.1.ebuild,v 1.2 2013/03/22 10:50:10 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/matio/matio-1.5.1.ebuild,v 1.3 2015/02/02 14:49:00 jlec Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
+
 inherit autotools-utils eutils
 
 DESCRIPTION="Library for reading and writing matlab files"
 HOMEPAGE="http://sourceforge.net/projects/matio/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 SLOT="0"
-LICENSE="LGPL-2.1"
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples hdf5 sparse static-libs"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RDEPEND="sys-libs/zlib
+
+RDEPEND="
+	sys-libs/zlib
 	hdf5? ( sci-libs/hdf5 )"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base )"
@@ -36,14 +40,11 @@ src_compile() {
 }
 
 src_install() {
+	use doc && DOCS=( "${BUILD_DIR}"/documentation/matio_user_guide.pdf )
 	autotools-utils_src_install
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${WORKDIR}"/${P}_build/documentation/matio_user_guide.pdf
-	fi
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/test*
+		docinto examples
+		dodoc test/test*
 		insinto /usr/share/${PN}
 		doins share/test*
 	fi
diff --git a/sci-libs/matio/matio-1.5.2.ebuild b/sci-libs/matio/matio-1.5.2.ebuild
index 01819b7244ec..f34e249af6bb 100644
--- a/sci-libs/matio/matio-1.5.2.ebuild
+++ b/sci-libs/matio/matio-1.5.2.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/matio/matio-1.5.2.ebuild,v 1.1 2013/08/08 21:48:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/matio/matio-1.5.2.ebuild,v 1.2 2015/02/02 14:49:00 jlec Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
+
 inherit autotools-utils eutils
 
 DESCRIPTION="Library for reading and writing matlab files"
 HOMEPAGE="http://sourceforge.net/projects/matio/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 SLOT="0"
-LICENSE="LGPL-2.1"
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples hdf5 sparse static-libs"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RDEPEND="sys-libs/zlib
+
+RDEPEND="
+	sys-libs/zlib
 	hdf5? ( sci-libs/hdf5 )"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base )"
@@ -36,11 +40,11 @@ src_compile() {
 }
 
 src_install() {
+	use doc && DOCS=( "${BUILD_DIR}"/documentation/matio_user_guide.pdf )
 	autotools-utils_src_install
-	use doc && dodoc "${WORKDIR}"/${P}_build/documentation/matio_user_guide.pdf
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/test*
+		docinto examples
+		dodoc test/test*
 		insinto /usr/share/${PN}
 		doins share/test*
 	fi
diff --git a/sci-libs/matio/metadata.xml b/sci-libs/matio/metadata.xml
index 2d082b20ff6d..fa1c42e93df9 100644
--- a/sci-libs/matio/metadata.xml
+++ b/sci-libs/matio/metadata.xml
@@ -1,12 +1,12 @@
 <?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">
   matio is an ISO C library (with a limited Fortran 90 interface) for
   reading and writing Matlab MAT files.
 </longdescription>
-<use>
-  <flag name='sparse'>Extend formats for sparse matrix (not matlab)</flag>
-</use>
+  <use>
+    <flag name="sparse">Extend formats for sparse matrix (not matlab)</flag>
+  </use>
 </pkgmetadata>