From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 29 May 2018 03:22:09 +0100
Subject: gentoo resync : 29.05.2018

---
 sci-libs/szip/Manifest           |  3 +--
 sci-libs/szip/szip-2.1-r2.ebuild | 11 ++++++-----
 sci-libs/szip/szip-2.1.ebuild    | 26 --------------------------
 3 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 sci-libs/szip/szip-2.1.ebuild

(limited to 'sci-libs/szip')

diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 7bcf45cd4263..33d3892bc563 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,4 +1,3 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 712 BLAKE2B 4749cb93c7c2b7d47f21a539756e5dec434c28806c1f7bce749f96a22a42da9cd5bcfbcdb03fe65ae1625ed5ab1b1f64a0202e90fa00d08d9c04cebf4c9379b6 SHA512 5a7d895eb62ea16d9484f83fbdc264358ec98c7793ece6eade40dea9f0d2488a058df7c6e129e2d0eeb3a96cee7ae4d7fa52c453b05b775e93c0322911715e9c
-EBUILD szip-2.1.ebuild 657 BLAKE2B ed56e1a2d4a2f35a1562436d33052288139ed67225651fe2e0ff2eaa4b499b50d2ced733b2b2d933f2327f8bed68d10e3d1a98c67335668bb1a44f5753894753 SHA512 8199d391b81ae1622100fa8037e819db89ae1eb001e120807cc523a18b8f63a0534e172bd0bdda0ee2767ab5ec5484b8d1dfdd4022c64418f213778aa0ddb330
+EBUILD szip-2.1-r2.ebuild 725 BLAKE2B c3758ab6b092d8a29745f1bc46bf90129f60900caec4ed94104a21d3e385037cc7dd5c1205064097a7b3d889788c89eecbc32724b090b3619dbf222a57a93be2 SHA512 7a9bdfab3dfbcaba184fb7cb6fbd235005606df093eef6210fab0944b9560134c83c71668e983db536c03d48aae01aada82eb41f0bfda87648a43549060997fa
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index f21bfef39ae4..603af0c3cff4 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -3,17 +3,15 @@
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Extended-Rice lossless compression algorithm implementation"
 HOMEPAGE="http://www.hdfgroup.org/doc_resource/SZIP/"
 SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
-LICENSE="szip"
 
+LICENSE="szip"
 SLOT="0/2"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
 IUSE="static-libs"
+
 RDEPEND="!sci-libs/libaec[szip]"
 DEPEND=""
 
@@ -25,5 +23,8 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }
diff --git a/sci-libs/szip/szip-2.1.ebuild b/sci-libs/szip/szip-2.1.ebuild
deleted file mode 100644
index ef6208b661f1..000000000000
--- a/sci-libs/szip/szip-2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Implementation of the extended-Rice lossless compression algorithm"
-HOMEPAGE="http://www.hdfgroup.org/doc_resource/SZIP/"
-SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
-LICENSE="szip"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-IUSE=""
-DEPEND=""
-RDEPEND="!sci-libs/libaec"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc RELEASE.txt HISTORY.txt
-	insinto /usr/share/doc/${PF}/
-	emake -C examples clean || die
-	doins -r examples
-}
-- 
cgit v1.2.3