gentoo resync : 13.10.2019

5 files changed, 23 insertions, 56 deletions

diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 9aaf7987bb3e..9e9a010da8c3 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,6 +1,4 @@
-DIST squashfs-tools-ng-0.5.tar.xz 158048 BLAKE2B e8d53336a0955875eaf5a301329f620f6efd27d27d985c760a7eaaded94a60e1a7384f076311101b4a6de36b1330d7b42866079b074b6af1829d4162c1f62b38 SHA512 b39cd6e9627e71eb0fcc59a587612fe062c3f437e11342e6ec1a1fee1e6a51b38dcc881bf9a1d69578ad4686f939ece8ec02ed79a6cc6c69afe06bc6753390bf
-DIST squashfs-tools-ng-0.6.1.tar.xz 203756 BLAKE2B 94d20ed11f53df4b9d6a413ad52e3d968bdbacaa0a68988672eab07664a0b3681f0de916288fdf6ce5f6d4eea4b77af08fe2da3fbbf19cc745a3a24c7ac23ba2 SHA512 f82506d298be4fbf878f68e118dbcf8377fe72ef89d8cb9a24b8cecc23c6d431b021f6b3d5312c0da155ab148a3c55aacb962e8215ac28511b203b5c5dbfb855
-EBUILD squashfs-tools-ng-0.5.ebuild 1069 BLAKE2B fe678e7d13fffbaaeb7722b78db10a16d37f38788ac3850b785ad59aed89787cdc9cb6b867549f78532835e269684efaa74aa7ed6d4f6a5fb2ded18cae5fc380 SHA512 d332d401829b10aac7518df6717ee53f0152380a49789d893b489f8b8895fcda4bc76114346caae218403ba5470a8f4696bec8be22454f94b3cc8207f938c047
-EBUILD squashfs-tools-ng-0.6.1.ebuild 983 BLAKE2B af83b5bade10a52a5429ba33672ac17bca57ecfd2f88a3a4b93197a786913f2bada77d0b509ff4bb5719400afa3f764b71826665adb5b9887f49b6bb03b7ef0d SHA512 1b0b2367c3bb73aa284955b93b68f258bfd4c3727036ed4d0a083a60306c74077734ce7b560663d7972bff239115722c13f5a83c75bc5a7e41f0332aac4ec2b9
-EBUILD squashfs-tools-ng-9999.ebuild 983 BLAKE2B af83b5bade10a52a5429ba33672ac17bca57ecfd2f88a3a4b93197a786913f2bada77d0b509ff4bb5719400afa3f764b71826665adb5b9887f49b6bb03b7ef0d SHA512 1b0b2367c3bb73aa284955b93b68f258bfd4c3727036ed4d0a083a60306c74077734ce7b560663d7972bff239115722c13f5a83c75bc5a7e41f0332aac4ec2b9
-MISC metadata.xml 454 BLAKE2B 65aa175f46508710442c940c7c383f8ecac4c57c08f4270125509911f7f48648d54378972335ba72b66650b097480722b55cc77611287f2d89886d10e53f4630 SHA512 22546c9bb2d1f9f3e67058c4741aaac71279aac8c08400a8470afdf1c098b4fdc56e3569e17d25733fe39d6a5268bdf6283d82fd6366aa0aaa4d98e0ec0fe6fd
+DIST squashfs-tools-ng-0.7.tar.xz 372956 BLAKE2B 5fd0849c8cb0255ea56edc5b5cdc771363f5ca038f4306bb7d816ff26ce23cbd4f4652ef8ae497b8c9fe1ec09f9ebcfcf13aeb6b99b97db80a95018c25d4a3a6 SHA512 e53d7b64e68a40b49667b65d9fa8f12e977e8ca923c2fe9ce1e1def2745573f8607f7dee7ae6c06496489ef721c4c500ec40513ea5f6bd3ad4bb3a7796972b8e
+EBUILD squashfs-tools-ng-0.7.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
+EBUILD squashfs-tools-ng-9999.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
+MISC metadata.xml 556 BLAKE2B fcff50b7024c1743fb7d7e677c04865bba266c011305d701b4a27b1ce813eb492b6becb64b5f1d4d52a3efd5a80d3369ac88ac65c2665cb0121c6b59d592b966 SHA512 cd1de16571ec7651bf353e804c8f44cbe6a919c21577a832782d8213e7e956b5af1769889eb1631f1a97c44b89018d484122fee59bedef4409363901101df6e3
diff --git a/sys-fs/squashfs-tools-ng/metadata.xml b/sys-fs/squashfs-tools-ng/metadata.xml
index a98fd7a51d69..9d2517015161 100644
--- a/sys-fs/squashfs-tools-ng/metadata.xml
+++ b/sys-fs/squashfs-tools-ng/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Matt Turner</name>
 	</maintainer>
 	<use>
+		<flag name="tools">Build the gensquashfs, rdsquashfs, sqfs2tar, sqfsdiff, and tar2sqfs tools</flag>
 		<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
 	</use>
 	<upstream>
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.5.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.5.ebuild
deleted file mode 100644
index fc732972175d..000000000000
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A new set of tools for working with SquashFS images"
-HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
-if [[ ${PV} = 9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="lz4 lzo selinux +xz +zlib zstd"
-REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )"
-
-DEPEND="
-	lz4?     ( app-arch/lz4:= )
-	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
-	selinux? ( sys-libs/libselinux:= )
-	zlib?    ( sys-libs/zlib:= )
-	zstd?    ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with lz4)
-		$(use_with lzo)
-		$(use_with selinux)
-		$(use_with xz)
-		$(use_with zlib gzip)
-		$(use_with zstd)
-	)
-	econf "${myconf[@]}"
-}
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.7.ebuild
index b77878296fdf..22a2dbc93b62 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.1.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.7.ebuild
@@ -13,9 +13,9 @@ else
 	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
 fi
 
-LICENSE="GPL-3+"
+LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +xz zstd"
+IUSE="lz4 lzo selinux +tools +xz zstd"
 
 DEPEND="
 	sys-libs/zlib:=
@@ -34,11 +34,18 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		--disable-static
 		$(use_with lz4)
 		$(use_with lzo)
 		$(use_with selinux)
+		$(use_with tools)
 		$(use_with xz)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
 }
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index b77878296fdf..22a2dbc93b62 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -13,9 +13,9 @@ else
 	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
 fi
 
-LICENSE="GPL-3+"
+LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +xz zstd"
+IUSE="lz4 lzo selinux +tools +xz zstd"
 
 DEPEND="
 	sys-libs/zlib:=
@@ -34,11 +34,18 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		--disable-static
 		$(use_with lz4)
 		$(use_with lzo)
 		$(use_with selinux)
+		$(use_with tools)
 		$(use_with xz)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
 }
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}