From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D697C13888F for ; Thu, 29 Oct 2015 08:20:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77F6A21C005; Thu, 29 Oct 2015 08:20:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D94421C005 for ; Thu, 29 Oct 2015 08:20:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38D08340AF2 for ; Thu, 29 Oct 2015 08:20:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37FA019AC for ; Thu, 29 Oct 2015 08:20:18 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1446106815.dc66baee3f174784ca7abe23580056f20cb52732.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/p7zip/p7zip-15.09.ebuild X-VCS-Directories: app-arch/p7zip/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: dc66baee3f174784ca7abe23580056f20cb52732 X-VCS-Branch: master Date: Thu, 29 Oct 2015 08:20:18 +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: 91eabd31-313e-433c-9ab7-14b5300d20f4 X-Archives-Hash: 5cc266cb392d4f63fb86070c2acac7fe commit: dc66baee3f174784ca7abe23580056f20cb52732 Author: Justin Lecher gentoo org> AuthorDate: Thu Oct 29 08:20:06 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Oct 29 08:20:15 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc66baee app-arch/p7zip: Fix build problems for GUI Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564332 Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher gentoo.org> app-arch/p7zip/p7zip-15.09.ebuild | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app-arch/p7zip/p7zip-15.09.ebuild b/app-arch/p7zip/p7zip-15.09.ebuild index 048f4cc..2b4b810 100644 --- a/app-arch/p7zip/p7zip-15.09.ebuild +++ b/app-arch/p7zip/p7zip-15.09.ebuild @@ -40,9 +40,6 @@ src_prepare() { sed \ -e 's:-m32 ::g' \ -e 's:-m64 ::g' \ - -e 's:-O::g' \ - -e 's: -s ::g' \ - -e 's: -s$::g' \ -e 's:-pipe::g' \ -e "/^CXX=/s:g++:$(tc-getCXX):" \ -e "/^CC=/s:gcc:$(tc-getCC):" \ @@ -100,7 +97,7 @@ src_compile() { emake all3 if use kde || use wxwidgets; then emake -- 7zG - emake -- 7zFM +# emake -- 7zFM fi } @@ -116,13 +113,14 @@ src_install() { if use kde || use wxwidgets; then make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG" - make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM" +# make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM" - make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression" +# make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression" dobin GUI/p7zipForFilemanager exeinto /usr/$(get_libdir)/${PN} - doexe bin/7z{G,FM} +# doexe bin/7z{G,FM} + doexe bin/7zG insinto /usr/$(get_libdir)/${PN} doins -r GUI/{Lang,help}