public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matthew Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/
Date: Sun, 15 Mar 2020 19:25:16 +0000 (UTC)	[thread overview]
Message-ID: <1584300311.138c3021a4461434d45382577cd4ac93b05dfc90.prometheanfire@gentoo> (raw)

commit:     138c3021a4461434d45382577cd4ac93b05dfc90
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 19:24:35 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 19:25:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138c3021

app-arch/p7zip: fix docs install

Closes: https://bugs.gentoo.org/712428

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-arch/p7zip/p7zip-16.02-r6.ebuild | 167 +++++++++++++++++++++++++++++++++++
 1 file changed, 167 insertions(+)

diff --git a/app-arch/p7zip/p7zip-16.02-r6.ebuild b/app-arch/p7zip/p7zip-16.02-r6.ebuild
new file mode 100644
index 00000000000..94a2fca9fe5
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r6.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0"
+
+inherit eutils toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+DOCS=( ChangeLog README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/CVE-2016-9296.patch
+	"${FILESDIR}"/CVE-2017-17969.patch
+	"${FILESDIR}"/CVE-2018-5996.patch
+	"${FILESDIR}"/CVE-2018-10115.patch
+	"${FILESDIR}"/WimHandler.cpp.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's|-m32 ||g' \
+		-e 's|-m64 ||g' \
+		-e 's|-pipe||g' \
+		-e "/[ALL|OPT]FLAGS/s|-s||;/OPTIMIZE/s|-s||" \
+		-e "/CFLAGS=/s|=|+=|" \
+		-e "/CXXFLAGS=/s|=|+=|" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	if use kde || use wxwidgets; then
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+#		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+#		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/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/Lang
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kservices5/ServiceMenus
+			doins GUI/kde4/*.desktop
+			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
+			for item in "${ED}"/usr/share/kservices5/ServiceMenus/*.desktop; do
+				item="$(basename ${item})"
+				dosym ${EROOT}"/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
+			done
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+
+	if use doc; then
+		dodoc DOC/*.txt
+		docinto html
+		dodoc -r DOC/MANUAL/*
+	fi
+}


             reply	other threads:[~2020-03-15 19:25 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-15 19:25 Matthew Thode [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-03 16:04 [gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/ Jakov Smolić
2025-02-02 19:33 Arthur Zamarin
2025-02-02 19:33 Arthur Zamarin
2025-02-02 19:33 Arthur Zamarin
2025-02-02 19:33 Arthur Zamarin
2025-02-02 19:33 Arthur Zamarin
2024-10-24  5:40 Arthur Zamarin
2024-10-18 19:05 Arthur Zamarin
2024-10-13 13:35 Andreas Sturmlechner
2024-10-13 13:35 Andreas Sturmlechner
2024-10-13 13:35 Andreas Sturmlechner
2024-04-05 14:26 Sam James
2023-10-08 19:45 WANG Xuerui
2023-05-28 12:30 Joonas Niilola
2023-04-14 15:34 Matthew Thode
2023-04-14 15:34 Matthew Thode
2023-04-14 15:34 Matthew Thode
2023-04-14 15:34 Matthew Thode
2023-03-02 14:10 Matthew Thode
2023-03-01 18:48 Matthew Thode
2022-03-16 17:07 Sam James
2022-01-05 10:01 David Seifert
2021-04-25  9:31 Sam James
2021-04-25  9:30 David Seifert
2021-04-25  5:16 Sam James
2021-04-25  5:14 Sam James
2021-04-25  5:14 Sam James
2021-04-25  5:11 Sam James
2021-04-25  5:09 Sam James
2021-04-05 12:43 David Seifert
2021-04-05  2:31 Mike Gilbert
2021-03-27 16:04 Sam James
2021-01-06 12:52 Fabian Groffen
2020-08-28  3:36 Matthew Thode
2020-01-23 17:25 Matthew Thode
2020-01-23 17:18 Matthew Thode
2019-05-06 20:39 Matthew Thode
2018-07-03 15:08 Matt Thode
2018-07-03  3:11 Aaron Bauman
2018-07-03  2:09 Matt Thode
2018-07-02  0:49 Thomas Deutschmann
2018-06-30 19:03 Sergei Trofimovich
2018-06-30 14:45 Sergei Trofimovich
2018-06-29 10:15 Jeroen Roovers
2018-06-29  6:52 Sergei Trofimovich
2018-06-18 18:31 Sergei Trofimovich
2018-03-12  1:05 Matt Turner
2018-03-12  1:05 Matt Turner
2018-03-04 17:07 Tobias Klausmann
2018-02-10  0:32 Thomas Deutschmann
2018-02-09  8:39 Agostino Sarubbo
2018-02-09  7:34 Sergei Trofimovich
2018-02-08 21:33 Sergei Trofimovich
2017-07-10 15:51 Alexis Ballier
2017-01-09 17:39 Matt Thode
2017-01-09 14:12 Jeroen Roovers
2016-11-19 13:55 Agostino Sarubbo
2016-11-19 13:53 Agostino Sarubbo
2016-11-15 14:53 Tobias Klausmann
2016-10-01 19:28 Matt Thode
2016-07-15  7:43 Lars Wendler
2016-05-13  8:41 Agostino Sarubbo
2016-04-10  2:19 Matt Thode
2016-03-14  6:34 Patrick Lauer
2016-03-14  3:14 Matt Thode
2016-02-26 16:47 Matt Thode
2016-02-25 17:22 Matt Thode
2015-10-29  8:20 Justin Lecher
2015-10-24 10:24 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1584300311.138c3021a4461434d45382577cd4ac93b05dfc90.prometheanfire@gentoo \
    --to=prometheanfire@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox