summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2017-11-03 02:39:34 +0100
committerMaciej Mrozowski <reavertm@gentoo.org>2017-11-03 02:39:34 +0100
commit1f520671da7d6579f2a03c8bdb73314c78a0a4bd (patch)
tree101f838db0f6faabe33e46eff6dad74c946f7393 /dev-libs/libmspack
parentdev-libs/libmspack: Fix "Fix tests" patch, bug 636110 (diff)
downloadgentoo-1f520671da7d6579f2a03c8bdb73314c78a0a4bd.tar.gz
gentoo-1f520671da7d6579f2a03c8bdb73314c78a0a4bd.tar.bz2
gentoo-1f520671da7d6579f2a03c8bdb73314c78a0a4bd.zip
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
Diffstat (limited to 'dev-libs/libmspack')
-rw-r--r--dev-libs/libmspack/libmspack-0.6_alpha.ebuild9
-rw-r--r--dev-libs/libmspack/metadata.xml11
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 6a40351178f2..63c273dced26 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 ea4e7c21a844..1e5806295c83 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@gentoo.org</email>
- <name>Maciej Mrozowski</name>
- </maintainer>
+ <maintainer type="person">
+ <email>reavertm@gentoo.org</email>
+ <name>Maciej Mrozowski</name>
+ </maintainer>
+ <use>
+ <flag name="utils">Enables building cabrip, chmextract, msexpand and oabextract</flag>
+ </use>
</pkgmetadata>