From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 855001396D9 for ; Fri, 3 Nov 2017 01:40:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 854E6E0BDF; Fri, 3 Nov 2017 01:40:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 639BEE0BDF for ; Fri, 3 Nov 2017 01:40:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAEA233BE2E for ; Fri, 3 Nov 2017 01:39:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43ED892F8 for ; Fri, 3 Nov 2017 01:39:58 +0000 (UTC) From: "Maciej Mrozowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Mrozowski" Message-ID: <1509673174.1f520671da7d6579f2a03c8bdb73314c78a0a4bd.reavertm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmspack/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libmspack/libmspack-0.6_alpha.ebuild dev-libs/libmspack/metadata.xml X-VCS-Directories: dev-libs/libmspack/ X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski X-VCS-Revision: 1f520671da7d6579f2a03c8bdb73314c78a0a4bd X-VCS-Branch: master Date: Fri, 3 Nov 2017 01:39:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 37b5fb5b-6269-47b5-95b1-979cf3d6482b X-Archives-Hash: 875cf37a9bbd6189339bb08d813c6a55 commit: 1f520671da7d6579f2a03c8bdb73314c78a0a4bd Author: Maciej Mrozowski gentoo org> AuthorDate: Fri Nov 3 01:39:34 2017 +0000 Commit: Maciej Mrozowski gentoo 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 @@ - - reavertm@gentoo.org - Maciej Mrozowski - + + reavertm@gentoo.org + Maciej Mrozowski + + + Enables building cabrip, chmextract, msexpand and oabextract +