[gentoo-commits] repo/gentoo:master commit in: dev-libs/libmspack/

[Maciej Mrozowski]

commit:     1f520671da7d6579f2a03c8bdb73314c78a0a4bd
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 01:39:34 2017 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Fri Nov  3 01:39:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f520671

dev-libs/libmspack: Put utils behing USE flag to resolve file collision with app-arch/mscompress, bug 634940

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 dev-libs/libmspack/libmspack-0.6_alpha.ebuild |  9 +++++++--
 dev-libs/libmspack/metadata.xml               | 11 +++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index 6a40351178f..63c273dced2 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -15,10 +15,12 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc static-libs"
+IUSE="debug doc static-libs utils"
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="
+	utils? ( !app-arch/mscompress )
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-tests.patch"
@@ -47,4 +49,7 @@ multilib_src_install_all() {
 	if use doc; then
 		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
+	if ! use utils; then
+		rm "${ED}"/usr/bin/* || die
+	fi
 }

diff --git a/dev-libs/libmspack/metadata.xml b/dev-libs/libmspack/metadata.xml
index ea4e7c21a84..1e5806295c8 100644
--- a/dev-libs/libmspack/metadata.xml
+++ b/dev-libs/libmspack/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>reavertm@g.o</email>
-        <name>Maciej Mrozowski</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>reavertm@g.o</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<use>
+		<flag name="utils">Enables building cabrip, chmextract, msexpand and oabextract</flag>
+	</use>
 </pkgmetadata>