subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-arch\/p7zip\/"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2024-04-05 Thread Sam James

commit: 9acf37582468371cb55068f41c1a5bf7f511d423
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  5 13:15:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  5 14:25:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acf3758

app-arch/p7zip: fix indentation

Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-17.05-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild 
b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index 656d88659586..324ae0051c52 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ BDEPEND="
x86? ( dev-lang/nasm )"
 
 PATCHES=(
-  "${FILESDIR}/p7zip-17.05-unit64.patch"
+   "${FILESDIR}/p7zip-17.05-unit64.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2023-10-08 Thread WANG Xuerui

commit: e597714d0e7a8c6c97e49c70326da072244bcb11
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Oct  8 19:25:49 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Oct  8 19:25:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e597714d

app-arch/p7zip: keyword 17.05-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 app-arch/p7zip/p7zip-17.05-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild 
b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index 3ae8fa5c09e1..656d88659586 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="abi_x86_x32 natspec +pch rar static"
 
 RDEPEND="natspec? ( dev-libs/libnatspec )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/, app-arch/p7zip/

2023-09-24 Thread Matthew Thode

commit: 275bd4036e56c8f0e00081100814ae88a4d3361c
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Sep 24 14:57:57 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Sep 24 14:59:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275bd403

app-arch/p7zip: fix build issue

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

Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/files/p7zip-17.05-unit64.patch | 21 +
 app-arch/p7zip/p7zip-17.05-r1.ebuild  |  4 
 2 files changed, 25 insertions(+)

diff --git a/app-arch/p7zip/files/p7zip-17.05-unit64.patch 
b/app-arch/p7zip/files/p7zip-17.05-unit64.patch
new file mode 100644
index ..0aa19e329ac0
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-17.05-unit64.patch
@@ -0,0 +1,21 @@
+--- p7zip-17.05-orig/C/hashes/hash.h   2023-03-03 23:16:28.0 +1100
 p7zip-17.05/C/hashes/hash.h2023-04-15 09:05:20.357955971 +1000
+@@ -42,17 +42,7 @@
+ 
+ #include "../7zTypes.h"
+ 
+-#ifndef _UINT32_T_DECLARED
+-typedef UInt32 uint32_t;
+-#define _UINT32_T_DECLARED
+-#endif
+-
+-#ifndef _UINT64_T_DECLARED
+-typedef UInt64 uint64_t;
+-#define _UINT64_T_DECLARED
+-#endif
+-
+-//#include 
++#include 
+ 
+ #ifndef min
+ #define min(a,b) (((a)>(b))?(b):(a))

diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild 
b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index a70685f6c3fb..3ae8fa5c09e1 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -22,6 +22,10 @@ BDEPEND="
amd64? ( dev-lang/yasm )
x86? ( dev-lang/nasm )"
 
+PATCHES=(
+  "${FILESDIR}/p7zip-17.05-unit64.patch"
+)
+
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2023-05-28 Thread Joonas Niilola

commit: 4b39f7038bb3158d054e46c5c1de51ac7b3a4cfa
Author: NRK  disroot  org>
AuthorDate: Sat May 13 10:06:16 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 28 12:30:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b39f703

app-arch/p7zip: install docs unconditionally

The QA policy is to install small files (that require no additional
dependency to build) to be installed unconditionally:
https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301

Signed-off-by: NRK  disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/31018
Signed-off-by: Joonas Niilola  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 12 +---
 app-arch/p7zip/p7zip-17.05-r1.ebuild | 10 --
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index 6c906b43180e..933adee9f26f 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}_${PV}"
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
+IUSE="abi_x86_x32 kde +pch rar static wxwidgets"
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
@@ -143,9 +143,7 @@ src_install() {
doman man1/7z.1 man1/7za.1 man1/7zr.1
 
dodoc ChangeLog README TODO
-   if use doc; then
-   dodoc DOC/*.txt
-   docinto html
-   dodoc -r DOC/MANUAL/.
-   fi
+   dodoc DOC/*.txt
+   docinto html
+   dodoc -r DOC/MANUAL/.
 }

diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild 
b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index b021745a051b..dc971183b1eb 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="abi_x86_x32 doc natspec +pch rar static"
+IUSE="abi_x86_x32 natspec +pch rar static"
 
 RDEPEND="natspec? ( dev-libs/libnatspec )"
 DEPEND="${RDEPEND}"
@@ -106,9 +106,7 @@ src_install() {
doman man1/7z.1 man1/7za.1 man1/7zr.1
 
dodoc ChangeLog README TODO
-   if use doc; then
-   dodoc DOC/*.txt
-   docinto html
-   dodoc -r DOC/MANUAL/.
-   fi
+   dodoc DOC/*.txt
+   docinto html
+   dodoc -r DOC/MANUAL/.
 }

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/, app-arch/p7zip/

2023-04-16 Thread Sam James

commit: 2861b43fa9fdf0f2dfff1508647e5eae87f84d8d
Author: Joe Kappus  wt  gd>
AuthorDate: Fri Apr 14 19:34:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 16 06:49:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2861b43f

app-arch/p7zip: fix natspec patch

due to how we handle makefiles need to drop that part from patch
and update the makefiles directly in ebuild. fixes build with natspec.

Closes: https://bugs.gentoo.org/904332
Signed-off-by: Joe Kappus  wt.gd>
Closes: https://github.com/gentoo/gentoo/pull/30597
Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/files/p7zip-17.05-natspec.patch | 13 -
 app-arch/p7zip/p7zip-17.05-r1.ebuild   |  5 -
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app-arch/p7zip/files/p7zip-17.05-natspec.patch 
b/app-arch/p7zip/files/p7zip-17.05-natspec.patch
index 45f24559a4c8..7487924af306 100644
--- a/app-arch/p7zip/files/p7zip-17.05-natspec.patch
+++ b/app-arch/p7zip/files/p7zip-17.05-natspec.patch
@@ -115,16 +115,3 @@ index 353e895..44071f3 100644
if (isUtf8)
  if (ConvertUTF8ToUnicode(s, res) || ignore_Utf8_Errors)
return;
-diff --git a/makefile.machine b/makefile.machine
-index a89b568..3e12592 100644
 a/makefile.machine
-+++ b/makefile.machine
-@@ -16,7 +16,7 @@ CC=gcc
- CC_SHARED=-fPIC
- LINK_SHARED=-fPIC -shared
- 
--LOCAL_LIBS=-lpthread
-+LOCAL_LIBS=-lpthread -lnatspec
- LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
- 
- OBJ_CRC32=$(OBJ_CRC32_C)

diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild 
b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index dbb6ca8a3567..f07d678263c8 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -25,7 +25,10 @@ BDEPEND="
 src_prepare() {
default
 
-   use natspec && eapply "${FILESDIR}"/${P}-natspec.patch
+   if use natspec; then
+   eapply "${FILESDIR}"/${P}-natspec.patch
+   sed -i '/^LOCAL_LIBS/s/$/ -lnatspec/' makefile.* || die
+   fi
 
if ! use pch; then
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" 
-i makefile.* || die

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2023-04-14 Thread Matthew Thode

commit: 2f0330ea018e01c7e989bbd748582898a8c75408
Author: Joe Kappus  wt  gd>
AuthorDate: Fri Apr 14 09:48:47 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Apr 14 15:34:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0330ea

app-arch/p7zip: 17.05-r1 drop unrar warning

Not needed as we already use LICENSE.

Closes: https://bugs.gentoo.org/850724
Signed-off-by: Joe Kappus  wt.gd>
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/p7zip-17.05-r1.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild 
b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index 575b07ea68cc..8b320e470f1f 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -38,9 +38,7 @@ src_prepare() {
-i makefile* || die
 
# remove non-free RAR codec
-   if use rar; then
-   ewarn "Enabling nonfree RAR decompressor"
-   else
+   if ! use rar; then
sed \
-e '/Rar/d' \
-e '/RAR/d' \

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2023-04-14 Thread Matthew Thode

commit: 26730a4ce9796a0811ba681e63ad89d8510ae416
Author: Joe Kappus  wt  gd>
AuthorDate: Fri Apr 14 09:38:44 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Apr 14 15:34:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26730a4c

app-arch/p7zip: 17.05-r1 revbump

Upstream pushed out 17.05 with 17.04 in version, they re-released
with it corrected, this grabs the re-release.

Also removed wxgtk reference since we don't build GUI anymore.

Closes: https://bugs.gentoo.org/902117
Signed-off-by: Joe Kappus  wt.gd>
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/Manifest  |   2 +-
 app-arch/p7zip/p7zip-17.05-r1.ebuild | 110 +++
 2 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 7bb0c1b7e7ed..c03f71b7e19b 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,2 +1,2 @@
-DIST p7zip-17.05.tar.gz 6722048 BLAKE2B 
3aa653b7875bb1b5ce96af7f7b8f4097860a9e5f0e172803fde6917ae4b7ef9c9e06d1daa31b7e33bb4ff91302972e8ece10f846bfa152fa6c783b234ac77ed3
 SHA512 
973fd906eaf376ca7d1d0738bb9aa137dcae3a6b17f974d3afc6bbb4efab4c7afa78e3dc9fbdf7b6d37630c9986ddaca7afc209ba18da1ed27944ee88a321a55
+DIST p7zip-17.05.tar.gz 6722154 BLAKE2B 
0bcba638d3acaf2aa270e02693ad4295dfcc6b388037bdb446e25f3f4e1cb34f1b05bbc9a845364ca770625c32b2d7f55f63f504ad8e0863fff4bf940ae1fddd
 SHA512 
97a7cfd15287998eb049c320548477be496c4ddf6b45c833c42adca4ab88719b07a442ae2e71cf2dc3b30a0777a3acab0a1a30f01fd85bacffa3fa9bd22c3f7d
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 
075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6
 SHA512 
d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f

diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild 
b/app-arch/p7zip/p7zip-17.05-r1.ebuild
new file mode 100644
index ..575b07ea68cc
--- /dev/null
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs wrapper xdg
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="https://github.com/p7zip-project/p7zip;
+SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+#S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="abi_x86_x32 doc +pch rar static"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+   amd64? ( dev-lang/yasm )
+   x86? ( dev-lang/nasm )"
+
+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 -r 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 || die
+   # 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
+   fi
+
+   if use static; then
+   sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /'

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/, app-arch/p7zip/files/

2023-04-14 Thread Matthew Thode

commit: f30b488fc9b6821fe541da04652512331ee4012a
Author: Joe Kappus  wt  gd>
AuthorDate: Fri Apr 14 11:52:25 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Apr 14 15:34:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30b488f

app-arch/p7zip: add natspec support via useflag

Patch is from Arch:
https://aur.archlinux.org/cgit/aur.git/tree/natspec.patch?h=p7zip-natspec

Closes: https://bugs.gentoo.org/574900
Signed-off-by: Joe Kappus  wt.gd>
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/files/p7zip-17.05-natspec.patch | 130 +
 app-arch/p7zip/metadata.xml|   1 +
 app-arch/p7zip/p7zip-17.05-r1.ebuild   |   5 +-
 3 files changed, 135 insertions(+), 1 deletion(-)

diff --git a/app-arch/p7zip/files/p7zip-17.05-natspec.patch 
b/app-arch/p7zip/files/p7zip-17.05-natspec.patch
new file mode 100644
index ..45f24559a4c8
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-17.05-natspec.patch
@@ -0,0 +1,130 @@
+commit f25f0b75bbeb485961dc139aed6b5b474552d043 (HEAD -> main)
+Author: Taiki Sugawara 
+Date:   Wed May 12 18:26:11 2021 +0900
+
+natspec patch for p7zip 17.x
+
+diff --git a/CPP/7zip/Archive/Zip/ZipItem.cpp 
b/CPP/7zip/Archive/Zip/ZipItem.cpp
+index 353e895..44071f3 100644
+--- a/CPP/7zip/Archive/Zip/ZipItem.cpp
 b/CPP/7zip/Archive/Zip/ZipItem.cpp
+@@ -1,9 +1,7 @@
+ // Archive/ZipItem.cpp
+ 
+-#if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__)
+ #include 
+-#include 
+-#endif
++#include 
+ 
+ #include "StdAfx.h"
+ 
+@@ -355,87 +353,15 @@ void CItem::GetUnicodeString(UString , const AString 
, bool isComment, boo
+ #endif
+   }
+   
+-  #if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__)
+-  // Convert OEM char set to UTF-8 if needed
+-  // Use system locale to select code page
+-
+-  Byte hostOS = GetHostOS();
+-  if (!isUtf8 && ((hostOS == NFileHeader::NHostOS::kFAT) || (hostOS == 
NFileHeader::NHostOS::kNTFS))) {
+-
+-const char *oemcp;
+-oemcp = getenv("OEMCP");
+-if (!oemcp) {
+-  oemcp = "CP437\0"; // CP name is 6 chars max
+-
+-  const char *lc_to_cp_table[] = {
+-  "af_ZA", "CP850", "ar_SA", "CP720", "ar_LB", "CP720", "ar_EG", "CP720",
+-  "ar_DZ", "CP720", "ar_BH", "CP720", "ar_IQ", "CP720", "ar_JO", "CP720",
+-  "ar_KW", "CP720", "ar_LY", "CP720", "ar_MA", "CP720", "ar_OM", "CP720",
+-  "ar_QA", "CP720", "ar_SY", "CP720", "ar_TN", "CP720", "ar_AE", "CP720",
+-  "ar_YE", "CP720","ast_ES", "CP850", "az_AZ", "CP866", "az_AZ", "CP857",
+-  "be_BY", "CP866", "bg_BG", "CP866", "br_FR", "CP850", "ca_ES", "CP850",
+-  "zh_CN", "CP936", "zh_TW", "CP950", "kw_GB", "CP850", "cs_CZ", "CP852",
+-  "cy_GB", "CP850", "da_DK", "CP850", "de_AT", "CP850", "de_LI", "CP850",
+-  "de_LU", "CP850", "de_CH", "CP850", "de_DE", "CP850", "el_GR", "CP737",
+-  "en_AU", "CP850", "en_CA", "CP850", "en_GB", "CP850", "en_IE", "CP850",
+-  "en_JM", "CP850", "en_BZ", "CP850", "en_PH", "CP437", "en_ZA", "CP437",
+-  "en_TT", "CP850", "en_US", "CP437", "en_ZW", "CP437", "en_NZ", "CP850",
+-  "es_PA", "CP850", "es_BO", "CP850", "es_CR", "CP850", "es_DO", "CP850",
+-  "es_SV", "CP850", "es_EC", "CP850", "es_GT", "CP850", "es_HN", "CP850",
+-  "es_NI", "CP850", "es_CL", "CP850", "es_MX", "CP850", "es_ES", "CP850",
+-  "es_CO", "CP850", "es_ES", "CP850", "es_PE", "CP850", "es_AR", "CP850",
+-  "es_PR", "CP850", "es_VE", "CP850", "es_UY", "CP850", "es_PY", "CP850",
+-  "et_EE", "CP775", "eu_ES", "CP850", "fa_IR", "CP720", "fi_FI", "CP850",
+-  "fo_FO", "CP850", "fr_FR", "CP850", "fr_BE", "CP850", "fr_CA", "CP850",
+-  "fr_LU", "CP850", "fr_MC", "CP850", "fr_CH", "CP850", "ga_IE", "CP437",
+-  "gd_GB", "CP850", "gv_IM", "CP850", "gl_ES", "CP850", "he_IL", "CP862",
+-  "hr_HR", "CP852", "hu_HU", "CP852", "id_ID", "CP850", "is_IS", "CP850",
+-  "it_IT", "CP850", "it_CH", "CP850", "iv_IV", "CP437", "ja_JP", "CP932",
+-  "kk_KZ", "CP866", "ko_KR", "CP949", "ky_KG", "CP866", "lt_LT", "CP775",
+-  "lv_LV", "CP775", "mk_MK", "CP866", "mn_MN", "CP866", "ms_BN", "CP850",
+-  "ms_MY", "CP850", "nl_BE", "CP850", "nl_NL", "CP850", "nl_SR", "CP850",
+-  "nn_NO", "CP850", "nb_NO", "CP850", "pl_PL", "CP852", "pt_BR", "CP850",
+-  "pt_PT", "CP850", "rm_CH", "CP850", "ro_RO", "CP852", "ru_RU", "CP866",
+-  "sk_SK", "CP852", "sl_SI", "CP852", "sq_AL", "CP852", "sr_RS", "CP855",
+-  "sr_RS", "CP852", "sv_SE", "CP850", "sv_FI", "CP850", "sw_KE", "CP437",
+-  "th_TH", "CP874", "tr_TR", "CP857", "tt_RU", "CP866", "uk_UA", "CP866",
+-  "ur_PK", "CP720", "uz_UZ", "CP866", "uz_UZ", "CP857", "vi_VN", "CP1258",
+-  "wa_BE", "CP850", "zh_HK", "CP950", "zh_SG", "CP936"};
+-  int table_len = sizeof(lc_to_cp_table) / sizeof(char *);
+-  int lc_len, i;
+-
+-  char *lc = setlocale(LC_CTYPE, "");
+-
+-  if (lc && lc[0]) {
+-

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2023-04-14 Thread Matthew Thode

commit: 7497eeb19e82be490eabf8ffc83d0c635d3fff6f
Author: Joe Kappus  wt  gd>
AuthorDate: Fri Apr 14 11:07:38 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Apr 14 15:34:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7497eeb1

app-arch/p7zip: update upstream metadata

Closes: https://bugs.gentoo.org/855503
Signed-off-by: Joe Kappus  wt.gd>
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
index 762c5a16f7fe..b936059d893c 100644
--- a/app-arch/p7zip/metadata.xml
+++ b/app-arch/p7zip/metadata.xml
@@ -8,6 +8,6 @@
 Enable support for non-free rar decoder
   
   
-p7zip
+p7zip-project/p7zip

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2023-04-14 Thread Matthew Thode

commit: 8d75300ebec012a04f3ff6fe12b604bb7b161b25
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Apr 14 15:33:34 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Apr 14 15:34:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d75300e

app-arch/p7zip: drop 17.05

Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/p7zip-17.05.ebuild | 111 --
 1 file changed, 111 deletions(-)

diff --git a/app-arch/p7zip/p7zip-17.05.ebuild 
b/app-arch/p7zip/p7zip-17.05.ebuild
deleted file mode 100644
index 0d5e544d4797..
--- a/app-arch/p7zip/p7zip-17.05.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit multilib toolchain-funcs wrapper xdg
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="https://github.com/p7zip-project/p7zip;
-SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-#S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="LGPL-2.1 rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="abi_x86_x32 doc +pch rar static"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
-   amd64? ( dev-lang/yasm )
-   x86? ( dev-lang/nasm )"
-
-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 -r 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 || die
-   # 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
-   fi
-
-   if use static; then
-   sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' 
makefile.machine || die
-   fi
-}
-
-src_compile() {
-   emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all3
-}
-
-src_test() {
-   emake test test_7z test_7zr
-}
-
-src_install() {
-   # these wrappers cannot be symlinks, p7zip should be called with full 
path
-   make_wrapper 7zr /usr/$(get_libdir)/p7zip/7zr
-   make_wrapper 7za /usr/$(get_libdir)/p7zip/7za
-   make_wrapper 7z /usr/$(get_libdir)/p7zip/7z
-
-   dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
-   doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
-
-   exeinto /usr/$(get_libdir)/p7zip
-   doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
-   doexe bin/*$(get_modname)
-   if use rar; then
-   exeinto /usr/$(get_libdir)/p7zip/Codecs
-   doexe bin/Codecs/*$(get_modname)
-   fi
-
-   doman man1/7z.1 man1/7za.1 man1/7zr.1
-
-   dodoc ChangeLog README TODO
-   if use doc; then
-   dodoc DOC/*.txt
-   docinto html
-   dodoc -r DOC/MANUAL/.
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2023-03-02 Thread Matthew Thode

commit: 71c8bc0770a49db8767a7e42fe0892b25607648c
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Mar  2 14:08:43 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Mar  2 14:08:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c8bc07

app-arch/p7zip: remove gui support

only cli is currently supported

Bug: https://bugs.gentoo.org/898650

Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/p7zip-17.05.ebuild | 35 ++-
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/app-arch/p7zip/p7zip-17.05.ebuild 
b/app-arch/p7zip/p7zip-17.05.ebuild
index dc0b336a3d08..0d5e544d4797 100644
--- a/app-arch/p7zip/p7zip-17.05.ebuild
+++ b/app-arch/p7zip/p7zip-17.05.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit multilib toolchain-funcs wrapper wxwidgets xdg
+inherit multilib toolchain-funcs wrapper xdg
 
 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="https://github.com/p7zip-project/p7zip;
@@ -14,10 +14,8 @@ 
SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
-REQUIRED_USE="kde? ( wxwidgets )"
+IUSE="abi_x86_x32 doc +pch rar static"
 
-RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
@@ -75,19 +73,10 @@ src_prepare() {
if use static; then
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' 
makefile.machine || die
fi
-
-   if use kde || use wxwidgets; then
-   setup-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
-   fi
 }
 
 src_test() {
@@ -100,26 +89,6 @@ src_install() {
make_wrapper 7za /usr/$(get_libdir)/p7zip/7za
make_wrapper 7z /usr/$(get_libdir)/p7zip/7z
 
-   if use kde || use wxwidgets; then
-   make_wrapper 7zG /usr/$(get_libdir)/p7zip/7zG
-
-   dobin GUI/p7zipForFilemanager
-   exeinto /usr/$(get_libdir)/p7zip
-   doexe bin/7zG
-
-   insinto /usr/$(get_libdir)/p7zip
-   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
-   fi
-   fi
-
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2023-03-01 Thread Matthew Thode

commit: f985b6d49c967c4fc29597e9f564ff66c09764a5
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Mar  1 18:47:48 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Mar  1 18:48:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f985b6d4

app-arch/p7zip: add 17.05

Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/Manifest   |   1 +
 app-arch/p7zip/p7zip-17.05.ebuild | 142 ++
 2 files changed, 143 insertions(+)

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 29b37f25e4d4..7bb0c1b7e7ed 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1 +1,2 @@
+DIST p7zip-17.05.tar.gz 6722048 BLAKE2B 
3aa653b7875bb1b5ce96af7f7b8f4097860a9e5f0e172803fde6917ae4b7ef9c9e06d1daa31b7e33bb4ff91302972e8ece10f846bfa152fa6c783b234ac77ed3
 SHA512 
973fd906eaf376ca7d1d0738bb9aa137dcae3a6b17f974d3afc6bbb4efab4c7afa78e3dc9fbdf7b6d37630c9986ddaca7afc209ba18da1ed27944ee88a321a55
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 
075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6
 SHA512 
d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f

diff --git a/app-arch/p7zip/p7zip-17.05.ebuild 
b/app-arch/p7zip/p7zip-17.05.ebuild
new file mode 100644
index ..dc0b336a3d08
--- /dev/null
+++ b/app-arch/p7zip/p7zip-17.05.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit multilib toolchain-funcs wrapper wxwidgets xdg
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="https://github.com/p7zip-project/p7zip;
+SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+#S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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}"
+BDEPEND="
+   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+   amd64? ( dev-lang/yasm )
+   x86? ( dev-lang/nasm )"
+
+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 -r 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 || die
+   # 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
+   fi
+
+   if use static; then
+   sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' 
makefile.machine || die
+   fi
+
+   if use kde || use wxwidgets; then
+   setup-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
+   fi
+}
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2022-03-16 Thread Sam James

commit: 49b11d2a3885caf8f9b7669181aefcddafb46bdf
Author: François-Xavier Carton  gmail  com>
AuthorDate: Tue Mar 15 17:57:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 16 17:06:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b11d2a

app-arch/p7zip: quote variables to allow CC containing spaces

Signed-off-by: François-Xavier Carton  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index 2846c75537c9..d0bf79b50d69 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -88,14 +88,14 @@ src_prepare() {
if use kde || use wxwidgets; then
setup-wxwidgets unicode
einfo "Preparing dependency list"
-   emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
+   emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" depend
fi
 }
 
 src_compile() {
-   emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+   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)" -- 7zG
fi
 }

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2022-01-05 Thread David Seifert

commit: 7d6df68d6249642e91c09b198b1fb66f5787bc96
Author: David Seifert  gentoo  org>
AuthorDate: Wed Jan  5 10:01:16 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan  5 10:01:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d6df68d

app-arch/p7zip: remove x86-fbsd

Signed-off-by: David Seifert  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index b41f7d8a8f5c..2846c75537c9 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -79,9 +79,6 @@ src_prepare() {
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 
|| die
fi
 
if use static; then

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-25 Thread Sam James

commit: c6f3b6f06cd0df983c25f39e0e0758edf237a184
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 09:27:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 09:30:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f3b6f0

app-arch/p7zip: Stabilize 16.02-r8 arm, #785439

Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index 4e8719b03f0..b41f7d8a8f5 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-25 Thread David Seifert

commit: 8311b4b3a3529e79648440897e69b3f0d0d5be1f
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 25 09:30:16 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 25 09:30:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8311b4b3

app-arch/p7zip: Remove old 16.02-r4, 16.02-r5

Closes: https://bugs.gentoo.org/669998
Closes: https://bugs.gentoo.org/773190
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 165 --
 app-arch/p7zip/p7zip-16.02-r5.ebuild | 168 ---
 2 files changed, 333 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
deleted file mode 100644
index 9d611ea84a5..000
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~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
-)
-
-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 '/ALLFLAGS/s|-s ||' \
-   -e "/OPTFLAGS=/s|=.*|=${CXXFLAGS}|" \
-   -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
-   setup-wxwidgets unicode
-   einfo "Preparing dependency list"
-   emake 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 -- 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

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-24 Thread Sam James

commit: bd01dba3497f098db1636b1ed78fdea2da638a2f
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:15:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:15:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd01dba3

app-arch/p7zip: Stabilize 16.02-r8 sparc, #785439

Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index ca7168929a0..4e8719b03f0 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-24 Thread Sam James

commit: 5140c0d7707f4a10eafc307b61f0360573610812
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:13:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:13:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5140c0d7

app-arch/p7zip: Stabilize 16.02-r8 arm64, #785439

Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index 1956fe47abc..ca7168929a0 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-24 Thread Sam James

commit: f5cdc758780256db1bac4783730a1eb7140600b3
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:13:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:13:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cdc758

app-arch/p7zip: Stabilize 16.02-r8 ppc64, #785439

Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index d7d094b0194..1956fe47abc 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-24 Thread Sam James

commit: 00306ec4343c1f7ee22b5874e848201a7833c958
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:11:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:11:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00306ec4

app-arch/p7zip: Stabilize 16.02-r8 x86, #785439

Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index fcac940d344..e9cceeda8ae 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-24 Thread Sam James

commit: 66198734756d0015e34ebf6782479dd9a098a5c7
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:09:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66198734

app-arch/p7zip: Stabilize 16.02-r8 amd64, #785439

Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index b46bf132d46..fcac940d344 100644
--- a/app-arch/p7zip/p7zip-16.02-r8.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-05 Thread David Seifert

commit: 1b7ce2e686f48ec6c420ebe7b283943180ab730b
Author: David Seifert  gentoo  org>
AuthorDate: Mon Apr  5 12:43:16 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Apr  5 12:43:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7ce2e6

app-arch/p7zip: Use wxGTK-gtk3

Bug: https://bugs.gentoo.org/669998
Bug: https://bugs.gentoo.org/773190
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 app-arch/p7zip/{p7zip-16.02-r7.ebuild => p7zip-16.02-r8.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r7.ebuild 
b/app-arch/p7zip/p7zip-16.02-r8.ebuild
similarity index 98%
rename from app-arch/p7zip/p7zip-16.02-r7.ebuild
rename to app-arch/p7zip/p7zip-16.02-r8.ebuild
index 2001d122f09..b46bf132d46 100644
--- a/app-arch/p7zip/p7zip-16.02-r7.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-WX_GTK_VER="3.0"
-inherit multilib toolchain-funcs wrapper wxwidgets
+WX_GTK_VER="3.0-gtk3"
+inherit multilib toolchain-funcs wrapper wxwidgets xdg
 
 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="http://p7zip.sourceforge.net/;

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-04-04 Thread Mike Gilbert

commit: 0390490ab16dd03ddbede6297f6755fc4d1338b5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr  5 02:31:08 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr  5 02:31:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0390490a

app-arch/p7zip: avoid using EROOT in src_install

Signed-off-by: Mike Gilbert  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r5.ebuild 
b/app-arch/p7zip/p7zip-16.02-r5.ebuild
index a84c128036d..1319183020a 100644
--- a/app-arch/p7zip/p7zip-16.02-r5.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r5.ebuild
@@ -142,7 +142,7 @@ src_install() {
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}"
+   dosym 
"${EPREFIX}/usr/share/kservices5/ServiceMenus/${item}" 
"/usr/share/kde4/services/ServiceMenus/${item}"
done
fi
fi

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-03-27 Thread Sam James

commit: 49c38570140882d418e6a3f3e025861e0f4fadca
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 27 16:04:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 27 16:04:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c38570

app-arch/p7zip: Stabilize 16.02-r4 arm, #769200

Signed-off-by: Sam James  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index 93e6132eddb..04d7eae53f7 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ 
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 ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2021-01-06 Thread Fabian Groffen

commit: 362af2201f1d2e679d4ce9425cd361bc4e0c57c9
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 12:49:39 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 12:51:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362af220

app-arch/p7zip: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 4 ++--
 app-arch/p7zip/p7zip-16.02-r5.ebuild | 4 ++--
 app-arch/p7zip/p7zip-16.02-r6.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index 510b8f6eff9..93e6132eddb 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 
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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"

diff --git a/app-arch/p7zip/p7zip-16.02-r5.ebuild 
b/app-arch/p7zip/p7zip-16.02-r5.ebuild
index 9dbf6467ced..2f824241845 100644
--- a/app-arch/p7zip/p7zip-16.02-r5.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 
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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"

diff --git a/app-arch/p7zip/p7zip-16.02-r6.ebuild 
b/app-arch/p7zip/p7zip-16.02-r6.ebuild
index 598644099a4..49e822f2436 100644
--- a/app-arch/p7zip/p7zip-16.02-r6.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 
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 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2020-08-27 Thread Matthew Thode

commit: cc76549e3c88bd5844422f0696411838e9d9d229
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Aug 28 03:35:50 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Aug 28 03:36:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc76549e

app-arch/p7zip: downgrage to eapi6 for need-wxwidget support

Closes: https://bugs.gentoo.org/739334
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r6.ebuild 
b/app-arch/p7zip/p7zip-16.02-r6.ebuild
index 94a2fca9fe5..3717156c8de 100644
--- a/app-arch/p7zip/p7zip-16.02-r6.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 WX_GTK_VER="3.0"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2020-03-15 Thread Matthew Thode

commit: 138c3021a4461434d45382577cd4ac93b05dfc90
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Mar 15 19:24:35 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Mar 15 19:25:11 2020 +
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  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 000..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"
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2020-01-23 Thread Matthew Thode

commit: 37e10622a0b8819c9d06e6f7bae874dd0affe9e8
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jan 23 17:24:34 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jan 23 17:24:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e10622

app-arch/p7zip: switch to EROOT from ROOT

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r5.ebuild 
b/app-arch/p7zip/p7zip-16.02-r5.ebuild
index 69a282e67c7..da300f957e6 100644
--- a/app-arch/p7zip/p7zip-16.02-r5.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r5.ebuild
@@ -142,7 +142,7 @@ src_install() {
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 
${ROOT}"/usr/share/kservices5/ServiceMenus/${item}" 
"/usr/share/kde4/services/ServiceMenus/${item}"
+   dosym 
${EROOT}"/usr/share/kservices5/ServiceMenus/${item}" 
"/usr/share/kde4/services/ServiceMenus/${item}"
done
fi
fi

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/, app-arch/p7zip/files/

2020-01-23 Thread Matthew Thode

commit: 011921ef714adf03acb30a5be54c3dd7b8b9e208
Author: Denis Pronin  yandex  ru>
AuthorDate: Thu Jan 23 06:30:29 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jan 23 17:09:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011921ef

app-arch/p7zip: it is now possible to compile with clang and c++17

Signed-off-by: Denis Pronin  yandex.ru>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/files/WimHandler.cpp.patch |  11 ++
 app-arch/p7zip/p7zip-16.02-r5.ebuild  | 167 ++
 2 files changed, 178 insertions(+)

diff --git a/app-arch/p7zip/files/WimHandler.cpp.patch 
b/app-arch/p7zip/files/WimHandler.cpp.patch
new file mode 100644
index 000..db7d73a2b94
--- /dev/null
+++ b/app-arch/p7zip/files/WimHandler.cpp.patch
@@ -0,0 +1,11 @@
+--- ./CPP/7zip/Archive/Wim/WimHandler.cpp  2016-06-11 11:08:06.0 
+0300
 ./CPP/7zip/Archive/Wim/WimHandler.cpp.new  2020-01-22 09:36:59.671803569 
+0300
+@@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchivePropert
+ 
+   AString res;
+ 
+-  bool numMethods = 0;
++  int numMethods = 0;
+   for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++)
+   {
+ if (methodMask & ((UInt32)1 << i))

diff --git a/app-arch/p7zip/p7zip-16.02-r5.ebuild 
b/app-arch/p7zip/p7zip-16.02-r5.ebuild
new file mode 100644
index 000..4c56f6b4da6
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit 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 ||

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2020-01-23 Thread Matthew Thode

commit: be286e038ca55e8fdc1a5d4c51277330a214d351
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jan 23 17:18:44 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jan 23 17:18:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be286e03

app-arch/p7zip: bump to eapi7 and fix pkgcheck issues

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r5.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r5.ebuild 
b/app-arch/p7zip/p7zip-16.02-r5.ebuild
index 4c56f6b4da6..69a282e67c7 100644
--- a/app-arch/p7zip/p7zip-16.02-r5.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0"
 
@@ -140,9 +140,9 @@ src_install() {
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
+   for item in 
"${ED}"/usr/share/kservices5/ServiceMenus/*.desktop; do
item="$(basename ${item})"
-   dosym 
"/usr/share/kservices5/ServiceMenus/${item}" 
"/usr/share/kde4/services/ServiceMenus/${item}"
+   dosym 
${ROOT}"/usr/share/kservices5/ServiceMenus/${item}" 
"/usr/share/kde4/services/ServiceMenus/${item}"
done
fi
fi
@@ -162,6 +162,7 @@ src_install() {
 
if use doc; then
dodoc DOC/*.txt
-   dohtml -r DOC/MANUAL/*
+   docinto html
+   dodoc -r DOC/MANUAL/*
fi
 }

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2019-05-06 Thread Matthew Thode

commit: 1de027a4a4a91be59bf59c46b84570cebbf5d50d
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon May  6 20:38:38 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon May  6 20:38:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de027a4

app-arch/p7zip: fix broken sed to use pipes

Fixes: https://bugs.gentoo.org/685166
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index dc858bf58b8..e71c79f0fb0 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,11 +44,11 @@ src_prepare() {
fi
 
sed \
-   -e 's:-m32 ::g' \
-   -e 's:-m64 ::g' \
-   -e 's:-pipe::g' \
-   -e '/ALLFLAGS/s:-s ::' \
-   -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+   -e 's|-m32 ||g' \
+   -e 's|-m64 ||g' \
+   -e 's|-pipe||g' \
+   -e '/ALLFLAGS/s|-s ||' \
+   -e "/OPTFLAGS=/s|=.*|=${CXXFLAGS}|" \
-i makefile* || die
 
# remove non-free RAR codec

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-07-03 Thread Matt Thode

commit: f827dfb0e8b2ccf9a95aa4760f8a47f64e6389a1
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  3 15:07:54 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Jul  3 15:07:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f827dfb0

app-arch/p7zip: fix stables

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index c6c4458768a..dc858bf58b8 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-07-02 Thread Aaron Bauman

commit: 0695cf40aac27e797742c96270d81044cdf418cc
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Jul  3 03:11:35 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Jul  3 03:11:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0695cf40

app-arch/p7zip: amd64 stable

Bug: https://bugs.gentoo.org/655270
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index 5f1f2513c4d..c6c4458768a 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 ~s390 ~sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-07-02 Thread Matt Thode

commit: 3858c664e6e8d5cfb35e9d7e920c29af12f83a26
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jul  3 02:08:40 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Jul  3 02:08:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3858c664

app-arch/p7zip: remove old

Bug: https://bugs.gentoo.org/655270
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-arch/p7zip/p7zip-16.02-r1.ebuild | 159 -
 app-arch/p7zip/p7zip-16.02-r2.ebuild | 163 --
 app-arch/p7zip/p7zip-16.02-r3.ebuild | 164 ---
 3 files changed, 486 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r1.ebuild 
b/app-arch/p7zip/p7zip-16.02-r1.ebuild
deleted file mode 100644
index 9f3c5aac923..000
--- a/app-arch/p7zip/p7zip-16.02-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit 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 
~x86-fbsd ~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 )
-
-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 '/ALLFLAGS/s:-s ::' \
-   -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
-   -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 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 -- 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"
-
-#

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-07-01 Thread Thomas Deutschmann

commit: b5f5a27c6b56734f77602e1500c6417386b77fd2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul  2 00:27:09 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul  2 00:27:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f5a27c

app-arch/p7zip: x86 stable (bug #655270)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index 522ffe1bf8b..5f1f2513c4d 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 ~s390 ~sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-06-30 Thread Sergei Trofimovich

commit: ef5d31d5370768c259344d338b32611d5325f3cb
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 30 18:03:35 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 30 19:02:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5d31d5

app-arch/p7zip: stable 16.02-r4 for ppc64, bug #655270

Bug: https://bugs.gentoo.org/655270
Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc64"

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index fabcfd33fc1..522ffe1bf8b 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-06-30 Thread Sergei Trofimovich

commit: f225e5fc91c55cc177eae2d756f051f5de5ecdce
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 30 13:01:41 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 30 14:44:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f225e5fc

app-arch/p7zip: stable 16.02-r4 for ia64, bug #655270

Bug: https://bugs.gentoo.org/655270
Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index 1963c263c14..fabcfd33fc1 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-06-29 Thread Jeroen Roovers

commit: 2c5907a3804ce99cf2fb927d21704f412eb32948
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jun 29 10:14:51 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jun 29 10:14:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5907a3

app-arch/p7zip: Stable for HPPA too.

Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --ignore-arches

 app-arch/p7zip/p7zip-16.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild 
b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index 57134020e70..1963c263c14 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-06-29 Thread Sergei Trofimovich

commit: 1c954aec09cfb1b6d77c269c4a4cc94529915e4c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jun 29 06:50:36 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jun 29 06:51:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c954aec

app-arch/p7zip: stable 16.02-r3 for ia64, bug #655270

Bug: https://bugs.gentoo.org/655270
Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 app-arch/p7zip/p7zip-16.02-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r3.ebuild 
b/app-arch/p7zip/p7zip-16.02-r3.ebuild
index 394b319ac40..5cfee124433 100644
--- a/app-arch/p7zip/p7zip-16.02-r3.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r3.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/, app-arch/p7zip/files/

2018-06-28 Thread Matt Thode

commit: 2b160b9fd86e68ee72f39ce96db2e0c7de72e5f7
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jun 28 19:06:34 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Jun 28 19:07:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b160b9f

app-arch/p7zip: add fix for CVE-2018-10115

Bug: https://bugs.gentoo.org/655270
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-arch/p7zip/files/CVE-2018-10115.patch | 311 ++
 app-arch/p7zip/p7zip-16.02-r4.ebuild  | 165 
 2 files changed, 476 insertions(+)

diff --git a/app-arch/p7zip/files/CVE-2018-10115.patch 
b/app-arch/p7zip/files/CVE-2018-10115.patch
new file mode 100644
index 000..7d9c4bf81f0
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2018-10115.patch
@@ -0,0 +1,311 @@
+From: Robert Luberda 
+Date: Tue, 29 May 2018 23:59:09 +0200
+Subject: Fix CVE-2018-10115
+
+Apply "patch" taken from https://landave.io/files/patch_7zip_CVE-2018-10115.txt
+
+
+Bugs-Debian: https://bugs.debian.org/897674
+---
+ CPP/7zip/Compress/Rar1Decoder.cpp | 16 +++-
+ CPP/7zip/Compress/Rar1Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar2Decoder.cpp | 17 +
+ CPP/7zip/Compress/Rar2Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar3Decoder.cpp | 19 +++
+ CPP/7zip/Compress/Rar3Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar5Decoder.cpp |  8 
+ CPP/7zip/Compress/Rar5Decoder.h   |  1 +
+ 8 files changed, 54 insertions(+), 16 deletions(-)
+
+diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp 
b/CPP/7zip/Compress/Rar1Decoder.cpp
+index 68030c7..8c890c8 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
 b/CPP/7zip/Compress/Rar1Decoder.cpp
+@@ -29,7 +29,7 @@ public:
+ };
+ */
+ 
+-CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
++CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), 
_errorMode(false) { }
+ 
+ void CDecoder::InitStructures()
+ {
+@@ -345,7 +345,7 @@ void CDecoder::GetFlagsBuf()
+ 
+ void CDecoder::InitData()
+ {
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+ AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
+ AvrPlc = 0x3500;
+@@ -391,6 +391,11 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, 
ISequentialOutStream *
+   if (inSize == NULL || outSize == NULL)
+ return E_INVALIDARG;
+ 
++  if (_isSolid && !_solidAllowed)
++return S_FALSE;
++
++  _solidAllowed = false;
++
+   if (!m_OutWindowStream.Create(kHistorySize))
+ return E_OUTOFMEMORY;
+   if (!m_InBitStream.Create(1 << 20))
+@@ -398,13 +403,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream 
*inStream, ISequentialOutStream *
+ 
+   m_UnpackSize = (Int64)*outSize;
+   m_OutWindowStream.SetStream(outStream);
+-  m_OutWindowStream.Init(m_IsSolid);
++  m_OutWindowStream.Init(_isSolid);
+   m_InBitStream.SetStream(inStream);
+   m_InBitStream.Init();
+ 
+   // CCoderReleaser coderReleaser(this);
+   InitData();
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+ _errorMode = false;
+ InitStructures();
+@@ -475,6 +480,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, 
ISequentialOutStream *
+   }
+   if (m_UnpackSize < 0)
+ return S_FALSE;
++  _solidAllowed = true;
+   return m_OutWindowStream.Flush();
+ }
+ 
+@@ -491,7 +497,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte 
*data, UInt32 size)
+ {
+   if (size < 1)
+ return E_INVALIDARG;
+-  m_IsSolid = ((data[0] & 1) != 0);
++  _isSolid = ((data[0] & 1) != 0);
+   return S_OK;
+ }
+ 
+diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
+index 01b606b..8abb3a3 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.h
 b/CPP/7zip/Compress/Rar1Decoder.h
+@@ -38,7 +38,8 @@ public:
+   UInt32 LastLength;
+ 
+   Int64 m_UnpackSize;
+-  bool m_IsSolid;
++  bool _isSolid;
++  bool _solidAllowed;
+   bool _errorMode;
+ 
+   UInt32 ReadBits(int numBits);
+diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp 
b/CPP/7zip/Compress/Rar2Decoder.cpp
+index 0580c8d..be8d842 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.cpp
 b/CPP/7zip/Compress/Rar2Decoder.cpp
+@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
+ static const UInt32 kWindowReservSize = (1 << 22) + 256;
+ 
+ CDecoder::CDecoder():
+-  m_IsSolid(false),
++  _isSolid(false),
++  _solidAllowed(false),
+   m_TablesOK(false)
+ {
+ }
+@@ -320,6 +321,10 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, 
ISequentialOutStream *
+   if (inSize == NULL || outSize == NULL)
+ return E_INVALIDARG;
+ 
++  if (_isSolid && !_solidAllowed)
++return S_FALSE;
++  _solidAllowed = false;
++
+   if (!m_OutWindowStream.Create(kHistorySize))
+ return E_OUTOFMEMORY;
+   if (!m_InBitStream.Create(1 << 20))
+@@ -330,12 +335,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream 
*inStream, ISequentialOutStream *
+   UInt64 pos = 0, unPackSize = *outSize;
+   
+   m_OutWindowStream.SetStream(outStream);
+-  m_OutWindowStream.Init(m_IsSolid);
++

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-06-18 Thread Sergei Trofimovich

commit: edbb0d92c07600a6202c7f6d1e434cdcc185ec38
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jun 18 16:30:14 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jun 18 18:30:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbb0d92

app-arch/p7zip: stable 16.02-r2 for sparc

Bug: https://bugs.gentoo.org/645500
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 app-arch/p7zip/p7zip-16.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild 
b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index 60127ab5845..f0aa4481c63 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/

2018-05-31 Thread Fabian Groffen

commit: caffb5623f45dfeb423db72bbdbee32b537757e2
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu May 31 12:13:46 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu May 31 12:13:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caffb562

app-arch/p7zip: include patch for >=clang-6, bug #655386

Closes: https://bugs.gentoo.org/655386
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-arch/p7zip/files/p7zip-16.02-darwin.patch | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/app-arch/p7zip/files/p7zip-16.02-darwin.patch 
b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
index 1ee5d3434b9..1c3899f30a5 100644
--- a/app-arch/p7zip/files/p7zip-16.02-darwin.patch
+++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
@@ -9,3 +9,38 @@
  #include 
  #endif
  
+
+https://svnweb.freebsd.org/ports/head/archivers/p7zip/files/patch-CPP_Windows_ErrorMsg.cpp?view=markup=458172
+This fixes the build with Clang 6.0:
+
+ ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to 
-2147024809, which cannot be narrowed to type 'DWORD' (aka  'unsigned int') 
[-Wc++11-narrowing]
+ case E_INVALIDARG  : txt = "E_INVALIDARG"; break ;
+  ^
+ ../../../../CPP/Common/MyWindows.h:89:22: note: expanded from macro 
'E_INVALIDARG'
+ #define E_INVALIDARG ((HRESULT)0x80070057L)
+  ^
+
+The HRESULT cast in the macro causes the value to be read as signed int.
+--- a/CPP/Windows/ErrorMsg.cpp
 b/CPP/Windows/ErrorMsg.cpp
+@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode)
+ 
+   switch(errorCode) {
+ case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
+-case E_NOTIMPL : txt = "E_NOTIMPL"; break ;
+-case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ;
+-case E_ABORT   : txt = "E_ABORT"; break ;
+-case E_FAIL: txt = "E_FAIL"; break ;
+-case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
+-case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ;
+-case E_INVALIDARG  : txt = "E_INVALIDARG"; break ;
++case (DWORD)(E_NOTIMPL) : txt = "E_NOTIMPL"; break ;
++case (DWORD)(E_NOINTERFACE) : txt = "E_NOINTERFACE"; break ;
++case (DWORD)(E_ABORT)   : txt = "E_ABORT"; break ;
++case (DWORD)(E_FAIL): txt = "E_FAIL"; break ;
++case (DWORD)(STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; 
break ;
++case (DWORD)(E_OUTOFMEMORY) : txt = "E_OUTOFMEMORY"; break ;
++case (DWORD)(E_INVALIDARG)  : txt = "E_INVALIDARG"; break ;
+ case ERROR_DIRECTORY  : txt = "Error Directory"; break ;
+ default:
+   txt = strerror(errorCode);

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/, app-arch/p7zip/files/

2018-05-08 Thread Matt Thode

commit: 1ec1595e6328e5f68dd1ce669e2841e052360c55
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue May  8 16:54:37 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue May  8 16:55:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec1595e

app-arch/p7zip: adding 2016 cve

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 app-arch/p7zip/files/CVE-2016-9296.patch |  12 +++
 app-arch/p7zip/p7zip-16.02-r3.ebuild | 164 +++
 2 files changed, 176 insertions(+)

diff --git a/app-arch/p7zip/files/CVE-2016-9296.patch 
b/app-arch/p7zip/files/CVE-2016-9296.patch
new file mode 100644
index 000..773f92a46e0
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2016-9296.patch
@@ -0,0 +1,12 @@
+--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig2016-11-21 01:42:29.460901230 
+
 ./CPP/7zip/Archive/7z/7zIn.cpp 2016-11-21 01:42:57.481197725 +
+@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
+   if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
+ ThrowIncorrect();
+   }
+-  HeadersSize += folders.PackPositions[folders.NumPackStreams];
++  if (folders.PackPositions)
++  HeadersSize += folders.PackPositions[folders.NumPackStreams];
+   return S_OK;
+ }
+ 

diff --git a/app-arch/p7zip/p7zip-16.02-r3.ebuild 
b/app-arch/p7zip/p7zip-16.02-r3.ebuild
new file mode 100644
index 000..394b319ac40
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02-r3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit 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 
~x86-fbsd ~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
+)
+
+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 '/ALLFLAGS/s:-s ::' \
+   -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+   -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"
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-03-11 Thread Matt Turner

commit: 0768fd0cf11bb19ae48d5d960d31076f57eedc8c
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 12 01:04:54 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 12 01:04:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0768fd0c

app-arch/p7zip-16.02-r2: ppc64 stable, bug 645500

 app-arch/p7zip/p7zip-16.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild 
b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index f181b2a2c25..60127ab5845 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-03-11 Thread Matt Turner

commit: d82354178a1c45ecd8ca5da5130701f6ef00eb01
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Mar 12 01:04:50 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 12 01:04:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8235417

app-arch/p7zip-16.02-r2: ppc stable, bug 645500

 app-arch/p7zip/p7zip-16.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild 
b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index fdc25149f24..f181b2a2c25 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ~ppc64 ~s390 ~sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-03-04 Thread Tobias Klausmann

commit: 189498f691f85a0f5e411e014dab0f62ec247109
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sun Mar  4 16:29:14 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sun Mar  4 17:07:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189498f6

app-arch/p7zip-16.02-r2: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/645500

 app-arch/p7zip/p7zip-16.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild 
b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index e6a89fe7a15..fdc25149f24 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-02-09 Thread Thomas Deutschmann

commit: 93635b9eb98002bbee39c403f782c1c53f81aa36
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Feb 10 00:23:06 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Feb 10 00:31:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93635b9e

app-arch/p7zip: x86 stable (bug #645500)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-arch/p7zip/p7zip-16.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild 
b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index 75216baf110..e6a89fe7a15 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-02-09 Thread Agostino Sarubbo

commit: 5885582917c821702b4635c78c66a7b4585f1417
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Feb  9 08:39:23 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Feb  9 08:39:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58855829

app-arch/p7zip: amd64 stable wrt bug #645500

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 app-arch/p7zip/p7zip-16.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild 
b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index b4cd66a6ac6..75216baf110 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-02-08 Thread Sergei Trofimovich

commit: 76d9feda0387cb503e8d2b43d7ae9403d5374b3e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Feb  9 07:34:12 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Feb  9 07:34:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d9feda

app-arch/p7zip: stable 16.02-r2 for hppa, bug #645500

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"

 app-arch/p7zip/p7zip-16.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild 
b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index 83442dd85ca..b4cd66a6ac6 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2018-02-08 Thread Sergei Trofimovich

commit: a14f78fabce050ffa19c84736ed4bc5b9c91de36
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Feb  8 20:10:08 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Feb  8 21:33:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14f78fa

app-arch/p7zip: stable 16.02-r2 for ia64, bug #645500

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 app-arch/p7zip/p7zip-16.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild 
b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index 4bcce404532..83442dd85ca 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ 
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 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/, app-arch/p7zip/

2018-02-07 Thread Matt Thode

commit: b684427f2fbb85f3f5f895f7794b81d6f83a4bea
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Feb  7 19:40:40 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Wed Feb  7 19:41:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b684427f

app-arch/p7zip: for CVE-2017-17969, CVE-2018-5996

Bug: https://bugs.gentoo.org/645500
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-arch/p7zip/files/CVE-2017-17969.patch |  26 
 app-arch/p7zip/files/CVE-2018-5996.patch  | 221 ++
 app-arch/p7zip/p7zip-16.02-r2.ebuild  | 163 ++
 3 files changed, 410 insertions(+)

diff --git a/app-arch/p7zip/files/CVE-2017-17969.patch 
b/app-arch/p7zip/files/CVE-2017-17969.patch
new file mode 100644
index 000..9a820af7306
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2017-17969.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?Antoine_Beaupr=C3=A9?= 
+Date: Sun, 28 Jan 2018 21:19:50 +0100
+Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta
+
+---
+ CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp 
b/CPP/7zip/Compress/ShrinkDecoder.cpp
+index 80b7e67..4acdce5 100644
+--- a/CPP/7zip/Compress/ShrinkDecoder.cpp
 b/CPP/7zip/Compress/ShrinkDecoder.cpp
+@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, 
ISequentialOutStream *
+ {
+   _stack[i++] = _suffixes[cur];
+   cur = _parents[cur];
+-}
++  if (i >= kNumItems)
++break;
++ }
++
++if (i >= kNumItems)
++  break;
+ 
+ _stack[i++] = (Byte)cur;
+ lastChar2 = (Byte)cur;

diff --git a/app-arch/p7zip/files/CVE-2018-5996.patch 
b/app-arch/p7zip/files/CVE-2018-5996.patch
new file mode 100644
index 000..6733bff9189
--- /dev/null
+++ b/app-arch/p7zip/files/CVE-2018-5996.patch
@@ -0,0 +1,221 @@
+From: Robert Luberda 
+Date: Sun, 28 Jan 2018 23:47:40 +0100
+Subject: CVE-2018-5996
+
+Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by
+applying a few changes from 7Zip 18.00-beta.
+
+Bug-Debian: https://bugs.debian.org/#888314
+---
+ CPP/7zip/Compress/Rar1Decoder.cpp | 13 +
+ CPP/7zip/Compress/Rar1Decoder.h   |  1 +
+ CPP/7zip/Compress/Rar2Decoder.cpp | 10 +-
+ CPP/7zip/Compress/Rar2Decoder.h   |  1 +
+ CPP/7zip/Compress/Rar3Decoder.cpp | 23 ---
+ CPP/7zip/Compress/Rar3Decoder.h   |  2 ++
+ 6 files changed, 42 insertions(+), 8 deletions(-)
+
+diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp 
b/CPP/7zip/Compress/Rar1Decoder.cpp
+index 1aaedcc..68030c7 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
 b/CPP/7zip/Compress/Rar1Decoder.cpp
+@@ -29,7 +29,7 @@ public:
+ };
+ */
+ 
+-CDecoder::CDecoder(): m_IsSolid(false) { }
++CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
+ 
+ void CDecoder::InitStructures()
+ {
+@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, 
ISequentialOutStream *
+   InitData();
+   if (!m_IsSolid)
+   {
++_errorMode = false;
+ InitStructures();
+ InitHuff();
+   }
++
++  if (_errorMode)
++return S_FALSE;
++
+   if (m_UnpackSize > 0)
+   {
+ GetFlagsBuf();
+@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, 
ISequentialOutStream
+ const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo 
*progress)
+ {
+   try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
+-  catch(const CInBufferException ) { return e.ErrorCode; }
+-  catch(const CLzOutWindowException ) { return e.ErrorCode; }
+-  catch(...) { return S_FALSE; }
++  catch(const CInBufferException ) { _errorMode = true; return e.ErrorCode; 
}
++  catch(const CLzOutWindowException ) { _errorMode = true; return 
e.ErrorCode; }
++  catch(...) { _errorMode = true; return S_FALSE; }
+ }
+ 
+ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
+diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
+index 630f089..01b606b 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.h
 b/CPP/7zip/Compress/Rar1Decoder.h
+@@ -39,6 +39,7 @@ public:
+ 
+   Int64 m_UnpackSize;
+   bool m_IsSolid;
++  bool _errorMode;
+ 
+   UInt32 ReadBits(int numBits);
+   HRESULT CopyBlock(UInt32 distance, UInt32 len);
+diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp 
b/CPP/7zip/Compress/Rar2Decoder.cpp
+index b3f2b4b..0580c8d 100644
+--- a/CPP/7zip/Compress/Rar2Decoder.cpp
 b/CPP/7zip/Compress/Rar2Decoder.cpp
+@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
+ static const UInt32 kWindowReservSize = (1 << 22) + 256;
+ 
+ CDecoder::CDecoder():
+-  m_IsSolid(false)
++  m_IsSolid(false),
++  m_TablesOK(false)
+ {
+ }
+ 
+@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return 
m_InBitStream.ReadBits(numB
+ 
+ bool CDecoder::ReadTables(void)
+ {
++  m_TablesOK = false;
++
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/

2017-08-08 Thread Matt Thode

commit: aa7064408e7631603897acfee9e6ba869896e553
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Aug  8 22:43:27 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Aug  8 22:43:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa706440

app-arch/p7zip: cleanup, from mm1ke's PR, manually done

https://github.com/gentoo/gentoo/pull/5360

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-arch/p7zip/files/9.04-makefile.patch   |  19 --
 app-arch/p7zip/files/p7zip |  73 -
 .../p7zip/files/p7zip-15.09-CVE-2015-1038.patch| 290 ---
 app-arch/p7zip/files/p7zip-15.14-darwin.patch  |  25 --
 app-arch/p7zip/files/p7zip-15.14.1-darwin.patch|  11 -
 .../p7zip/files/p7zip-9.20.1-CVE-2015-1038.patch   | 315 -
 app-arch/p7zip/files/p7zip-9.20.1-QA.patch |  17 --
 app-arch/p7zip/files/p7zip-9.20.1-execstack.patch  |  24 --
 .../p7zip/files/p7zip-9.38.1-CVE-2015-1038.patch   | 283 --
 app-arch/p7zip/files/p7zip-9.38.1-osversion.patch  |  28 --
 10 files changed, 1085 deletions(-)

diff --git a/app-arch/p7zip/files/9.04-makefile.patch 
b/app-arch/p7zip/files/9.04-makefile.patch
deleted file mode 100644
index 93a99cc9014..000
--- a/app-arch/p7zip/files/9.04-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.orig 2010-01-04 
13:58:54.527887746 +0100
-+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile  2010-01-04 
13:59:10.290868343 +0100
-@@ -247,8 +247,6 @@
-   MyAes.o \
-   Pbkdf2HmacSha1.o \
-   RandGen.o \
--  Rar20Crypto.o \
--  RarAes.o \
-   Sha1.o \
-   WzAes.o \
-   ZipCrypto.o \
-@@ -298,7 +296,6 @@
-   $(HFS_OBJS) \
-   $(ISO_OBJS) \
-   $(NSIS_OBJS) \
--  $(RAR_OBJS) \
-   $(TAR_OBJS) \
-   $(UDF_OBJS) \
-   $(WIM_OBJS) \

diff --git a/app-arch/p7zip/files/p7zip b/app-arch/p7zip/files/p7zip
deleted file mode 100644
index 9aaf078cbe0..000
--- a/app-arch/p7zip/files/p7zip
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-# gzip-like CLI wrapper for p7zip
-set -e
-
-compress=true
-file=
-
-usage ()
-  {
-echo "Usage: $0 [-d] [-h|--help] [file]"
-exit 1
-  }
-
-while [ "$#" != "0" ] ; do
-  case "$1" in
--d) compress=false ;;
--c) echo "$0: ignoring $1 option (not yet implemented)" ;;
--h|--help) usage ;;
-*)
-  if [ "${file}" = "" ] ; then
-file="$1"
-  else
-usage
-  fi
-;;
-  esac
-  shift
-done
-
-# make sure they're present, before we screw up
-for i in mktemp 7z rm cat tty ; do
-  if ! which $i > /dev/null ; then
-echo "$0: $i: command not found"
-exit 1
-  fi
-done
-
-if [ "${file}" != "" ] ; then
-  if ${compress} ; then
-7z a ${file}.7z ${file}
-rm ${file}
-  else
-case ${file} in
-  *.7z)
-7z x ${file}
-rm ${file}
-  ;;
-  *)
-echo "$0: ${file}: unknown suffix -- ignored"
-  ;;
-esac
-  fi
-  exit 0
-fi
-
-tmp=`mktemp`
-trap "rm -f ${tmp}" 0
-
-if ${compress} ; then
-  if tty > /dev/null ; then
-echo "$0: compressed data not written to a terminal."
-echo "For help, type: $0 -h"
-exit 1
-  fi
-  rm -f ${tmp}
-  7z a ${tmp} -si >/dev/null
-  cat ${tmp}
-else
-  cat > ${tmp}
-  7z x ${tmp} -so 2>/dev/null | cat
-fi
-
-rm -f ${tmp}

diff --git a/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch 
b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
deleted file mode 100644
index 491ad13523f..000
--- a/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-Author: Ben Hutchings 
-Date: Tue, 19 May 2015 02:38:40 +0100
-Description: Delay creation of symlinks to prevent arbitrary file writes 
(CVE-2015-1038)
-Bug: https://sourceforge.net/p/p7zip/bugs/147/
-Bug-Debian: https://bugs.debian.org/774660
-
-Alexander Cherepanov discovered that 7zip is susceptible to a
-directory traversal vulnerability.  While extracting an archive, it
-will extract symlinks and then follow them if they are referenced in
-further entries.  This can be exploited by a rogue archive to write
-files outside the current directory.
-
-We have to create placeholder files (which we already do) and delay
-creating symlinks until the end of extraction.
-
-Due to the possibility of anti-items (deletions) in the archive, it is
-possible for placeholders to be deleted and replaced before we create
-the symlinks.  It's not clear that this can be used for mischief, but
-GNU tar guards against similar problems by checking that the placeholder
-still exists and is the same inode.  XXX It also checks 'birth time' but
-this isn't portable.  We can probably get away with comparing ctime
-since we don't support hard links.
-
-diff -rup p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp 
p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp
 p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp   2015-09-17 
20:02:35.0 +0100
-+++

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2017-07-10 Thread Alexis Ballier

commit: 631de3c7d7d163a27141daf86074bf5de592f0ac
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jul 10 15:49:51 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jul 10 15:50:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631de3c7

app-arch/p7zip: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-arch/p7zip/p7zip-16.02-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r1.ebuild 
b/app-arch/p7zip/p7zip-16.02-r1.ebuild
index 3955575eed1..9f3c5aac923 100644
--- a/app-arch/p7zip/p7zip-16.02-r1.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 
~x86-fbsd ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2017-01-09 Thread Matt Thode

commit: ea52ca11c704ae39e253890a89368032a7bd545c
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jan  9 17:39:06 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Mon Jan  9 17:39:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea52ca11

app-arch/p7zip: cleanup bug 582832 CVE-2016-2334, CVE-2016-2335

Package-Manager: portage-2.3.0

 app-arch/p7zip/Manifest   |   5 --
 app-arch/p7zip/p7zip-15.09-r2.ebuild  | 161 --
 app-arch/p7zip/p7zip-15.09.ebuild | 156 
 app-arch/p7zip/p7zip-15.14.1.ebuild   | 158 -
 app-arch/p7zip/p7zip-15.14.ebuild | 158 -
 app-arch/p7zip/p7zip-9.20.1-r5.ebuild | 155 
 app-arch/p7zip/p7zip-9.38.1-r2.ebuild | 156 
 app-arch/p7zip/p7zip-9.38.1-r3.ebuild | 157 -
 8 files changed, 1106 deletions(-)

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index fb57004..df39623 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,6 +1 @@
-DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 
8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 
4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd
 WHIRLPOOL 
71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
-DIST p7zip_15.14.1_src_all.tar.bz2 4147911 SHA256 
699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4 SHA512 
30d0ef47bd6938cdd5d9d80ec6e7aed972655686a43adb0ae34bb9856ec7cd5a68a05c580352021055cefd6eeceb134ff6402f93686ce46e57f9757798e76abd
 WHIRLPOOL 
ace6204d3ab08002b6d5657ae280e22b7e26cdfe0af8099024ad8562a68aa5097a8f09d9d49904a06b9a6942d30fbf3d7a3872661433dd4f76c33dea03ccfb6a
-DIST p7zip_15.14_src_all.tar.bz2 4147609 SHA256 
b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8 SHA512 
3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5
 WHIRLPOOL 
52a397e4ea15cdd4c68156a0c32d449be78469d5704e0d4bb644a813b583422b3d7b0741284974ca22d9ea99a303dfadeccc23d74a77cac0c9b51153bd61e24b
 DIST p7zip_16.02_src_all.tar.bz2 4239909 SHA256 
5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f SHA512 
d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
 WHIRLPOOL 
b22f4dce96505094ffdee0963fa7e5fd75e92f2c920f2e69e18eff60a2ad9d4757c3512c8d4e7c4848a36212f54637a963ff41fc5c00bb7381f43220662108b9
-DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 
49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 
7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a
 WHIRLPOOL 
cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
-DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 
fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 
f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04
 WHIRLPOOL 
6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24

diff --git a/app-arch/p7zip/p7zip-15.09-r2.ebuild 
b/app-arch/p7zip/p7zip-15.09-r2.ebuild
deleted file mode 100644
index 3cd27bb..
--- a/app-arch/p7zip/p7zip-15.09-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit eutils multilib 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
-
-REQUIRED_USE="kde? ( wxwidgets )"
-
-RDEPEND="
-   kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 )
-   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-   amd64? ( dev-lang/yasm )
-   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
-   x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-CVE-2015-1038.patch
-
-   if ! use pch; then
-   sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" 
-i makefile.* || die
-   fi
-
-   sed

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2017-01-09 Thread Jeroen Roovers

commit: a78b6c8bba8c1c345715926f9b6c511cea8523e4
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jan  9 14:12:48 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jan  9 14:12:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a78b6c8b

app-arch/p7zip: Stable for HPPA (bug #582832).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 app-arch/p7zip/p7zip-16.02-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r1.ebuild 
b/app-arch/p7zip/p7zip-16.02-r1.ebuild
index 6c1a860..66fdc8e 100644
--- a/app-arch/p7zip/p7zip-16.02-r1.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-11-19 Thread Agostino Sarubbo

commit: 16d3cc901a799a5d8a35b7a5e0b5184af031e7c2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Nov 19 13:55:23 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Nov 19 13:55:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d3cc90

app-arch/p7zip: x86 stable wrt bug #582832

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r1.ebuild 
b/app-arch/p7zip/p7zip-16.02-r1.ebuild
index 00fcb5d..08b7939 100644
--- a/app-arch/p7zip/p7zip-16.02-r1.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-11-19 Thread Agostino Sarubbo

commit: f94c41efad9d0d00a4ef01b920253e66ce3e607c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Nov 19 13:53:02 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Nov 19 13:53:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94c41ef

app-arch/p7zip: amd64 stable wrt bug #582832

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/p7zip/p7zip-16.02-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r1.ebuild 
b/app-arch/p7zip/p7zip-16.02-r1.ebuild
index e0e7011..00fcb5d 100644
--- a/app-arch/p7zip/p7zip-16.02-r1.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~x86-interix ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-11-15 Thread Tobias Klausmann

commit: 432c5a9550b76c72c00721cbd7fe2a1dbd0ac1da
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Nov 15 14:51:58 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Nov 15 14:52:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432c5a95

app-arch/p7zip-16.02-r1: stable on alpha

Gentoo-Bug: 593986

 app-arch/p7zip/p7zip-16.02-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r1.ebuild 
b/app-arch/p7zip/p7zip-16.02-r1.ebuild
index 6f478c1..e0e7011 100644
--- a/app-arch/p7zip/p7zip-16.02-r1.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~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 )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-10-01 Thread Matt Thode

commit: 1a9dfeb8fc863ab5a145af245288911f5e4ebabb
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Oct  1 19:27:05 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sat Oct  1 19:27:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9dfeb8

app-arch/p7zip: remove unneeded eclasses bug 595802

Package-Manager: portage-2.3.0

 app-arch/p7zip/p7zip-16.02-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02-r1.ebuild 
b/app-arch/p7zip/p7zip-16.02-r1.ebuild
index dd37e65..6f478c1 100644
--- a/app-arch/p7zip/p7zip-16.02-r1.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 
 WX_GTK_VER="3.0"
 
-inherit eutils multilib toolchain-funcs wxwidgets
+inherit toolchain-funcs wxwidgets
 
 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="http://p7zip.sourceforge.net/;

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/, app-arch/p7zip/files/

2016-07-25 Thread Matt Thode

commit: 6793838e850e22d03a9c3cc33da21b919968f9e7
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Jul 24 16:57:03 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Mon Jul 25 22:40:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6793838e

app-arch/p7zip: Drop kdelibs (R)DEPEND, sort DEPEND/IUSE, EAPI=6

kde-base/kdelibs:4 is not required here as p7zip only (manually) installs
a bunch of desktop files that may or may not be picked up by applications.
wxGTK[X] is already enforced by REQUIRED_USE, so there is no reason
to duplicate that.

Reversed symlink logic for ServiceMenu as kservices5 is here to stay and
kde4/services is deprecated.

Package-Manager: portage-2.2.28

Signed-off-by: Matthew Thode  gentoo.org>

 app-arch/p7zip/files/p7zip-16.02-darwin.patch  |  4 ++--
 .../{p7zip-16.02.ebuild => p7zip-16.02-r1.ebuild}  | 25 +++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app-arch/p7zip/files/p7zip-16.02-darwin.patch 
b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
index e7f40f5..1ee5d34 100644
--- a/app-arch/p7zip/files/p7zip-16.02-darwin.patch
+++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
@@ -1,5 +1,5 @@
 p7zip_15.14.1/CPP/myWindows/StdAfx.h
-+++ p7zip_15.14.1/CPP/myWindows/StdAfx.h
+--- a/CPP/myWindows/StdAfx.h
 b/CPP/myWindows/StdAfx.h
 @@ -32,7 +32,7 @@
  #include 
  #include 

diff --git a/app-arch/p7zip/p7zip-16.02.ebuild 
b/app-arch/p7zip/p7zip-16.02-r1.ebuild
similarity index 88%
rename from app-arch/p7zip/p7zip-16.02.ebuild
rename to app-arch/p7zip/p7zip-16.02-r1.ebuild
index c34eb86..dd37e65 100644
--- a/app-arch/p7zip/p7zip-16.02.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 WX_GTK_VER="3.0"
 
@@ -15,22 +15,24 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
 
-RDEPEND="
-   kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
-   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}
-   amd64? ( dev-lang/yasm )
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 )
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-darwin.patch
+   default
 
if ! use pch; then
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" 
-i makefile.* || die
@@ -128,12 +130,12 @@ src_install() {
 
if use kde; then
rm GUI/kde4/p7zip_compress.desktop || die
-   insinto /usr/share/kde4/services/ServiceMenus
+   insinto /usr/share/kservices5/ServiceMenus
doins GUI/kde4/*.desktop
-   dodir /usr/share/kservices5/ServiceMenus
-   for item in 
"${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do
+   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 
"/usr/share/kde4/services/ServiceMenus/${item}" 
"/usr/share/kservices5/ServiceMenus/${item}"
+   dosym 
"/usr/share/kservices5/ServiceMenus/${item}" 
"/usr/share/kde4/services/ServiceMenus/${item}"
done
fi
fi
@@ -150,7 +152,6 @@ src_install() {
fi
 
doman man1/7z.1 man1/7za.1 man1/7zr.1
-   dodoc ChangeLog README TODO
 
if use doc; then
dodoc DOC/*.txt

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-07-15 Thread Lars Wendler

commit: 42db0ebf0a4ee0468476106079c2d7cd0df855d3
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul 15 07:43:04 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 15 07:43:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42db0ebf

app-arch/p7zip: Fixed installation of manual.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/p7zip/p7zip-16.02.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-16.02.ebuild 
b/app-arch/p7zip/p7zip-16.02.ebuild
index a2efa29..c34eb86 100644
--- a/app-arch/p7zip/p7zip-16.02.ebuild
+++ b/app-arch/p7zip/p7zip-16.02.ebuild
@@ -120,7 +120,8 @@ src_install() {
doexe bin/7zG
 
insinto /usr/$(get_libdir)/${PN}
-   doins -r GUI/{Lang,help}
+   doins -r GUI/Lang
+   doins -r DOC/MANUAL
 
insinto /usr/share/icons/hicolor/16x16/apps/
newins GUI/p7zip_16_ok.png p7zip.png

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/, app-arch/p7zip/files/

2016-07-14 Thread Matt Thode

commit: 98be5eb1827845a1551e998392c603e692815ccc
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jul 15 02:32:05 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Jul 15 02:32:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98be5eb1

app-arch/p7zip: bup for bug 582832

Package-Manager: portage-2.2.28

 app-arch/p7zip/Manifest   |   1 +
 app-arch/p7zip/files/p7zip-16.02-darwin.patch |  11 ++
 app-arch/p7zip/p7zip-16.02.ebuild | 158 ++
 3 files changed, 170 insertions(+)

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 7f85deb..fb57004 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,5 +1,6 @@
 DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 
8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 
4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd
 WHIRLPOOL 
71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
 DIST p7zip_15.14.1_src_all.tar.bz2 4147911 SHA256 
699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4 SHA512 
30d0ef47bd6938cdd5d9d80ec6e7aed972655686a43adb0ae34bb9856ec7cd5a68a05c580352021055cefd6eeceb134ff6402f93686ce46e57f9757798e76abd
 WHIRLPOOL 
ace6204d3ab08002b6d5657ae280e22b7e26cdfe0af8099024ad8562a68aa5097a8f09d9d49904a06b9a6942d30fbf3d7a3872661433dd4f76c33dea03ccfb6a
 DIST p7zip_15.14_src_all.tar.bz2 4147609 SHA256 
b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8 SHA512 
3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5
 WHIRLPOOL 
52a397e4ea15cdd4c68156a0c32d449be78469d5704e0d4bb644a813b583422b3d7b0741284974ca22d9ea99a303dfadeccc23d74a77cac0c9b51153bd61e24b
+DIST p7zip_16.02_src_all.tar.bz2 4239909 SHA256 
5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f SHA512 
d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
 WHIRLPOOL 
b22f4dce96505094ffdee0963fa7e5fd75e92f2c920f2e69e18eff60a2ad9d4757c3512c8d4e7c4848a36212f54637a963ff41fc5c00bb7381f43220662108b9
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 
49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 
7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a
 WHIRLPOOL 
cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 
fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 
f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04
 WHIRLPOOL 
6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24

diff --git a/app-arch/p7zip/files/p7zip-16.02-darwin.patch 
b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
new file mode 100644
index 000..e7f40f5
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
@@ -0,0 +1,11 @@
+--- p7zip_15.14.1/CPP/myWindows/StdAfx.h
 p7zip_15.14.1/CPP/myWindows/StdAfx.h
+@@ -32,7 +32,7 @@
+ #include 
+ #include 
+ 
+-#ifdef __NETWARE__
++#if defined(__NETWARE__) || defined(__MACH__)
+ #include 
+ #endif
+ 

diff --git a/app-arch/p7zip/p7zip-16.02.ebuild 
b/app-arch/p7zip/p7zip-16.02.ebuild
new file mode 100644
index 000..a2efa29
--- /dev/null
+++ b/app-arch/p7zip/p7zip-16.02.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+   kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+   amd64? ( dev-lang/yasm )
+   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-darwin.patch
+
+   if ! use pch; then
+   sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" 
-i makefile.* || die
+   fi
+
+   sed \
+   -e

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/

2016-07-03 Thread Patrice Clement

commit: ac6036efa7017066f002def3205048eec2f8c066
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Jul  1 19:55:35 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Jul  3 11:28:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6036ef

app-arch/p7zip: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/1812

Signed-off-by: Patrice Clement  gentoo.org>

 app-arch/p7zip/files/p7zip-9.20.1-long_rar_pwd.patch | 17 -
 1 file changed, 17 deletions(-)

diff --git a/app-arch/p7zip/files/p7zip-9.20.1-long_rar_pwd.patch 
b/app-arch/p7zip/files/p7zip-9.20.1-long_rar_pwd.patch
deleted file mode 100644
index ea7a90b..000
--- a/app-arch/p7zip/files/p7zip-9.20.1-long_rar_pwd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 ./CPP/7zip/Crypto/Sha1.cpp 2010-10-20 06:56:08.0 +0200
-+++ CPP/7zip/Crypto/Sha1.cpp.new   2013-09-15 09:19:51.0 +0200
-@@ -148,10 +148,10 @@
- for (int i = 0; i < kBlockSizeInWords; i++)
- {
-   UInt32 d = _buffer[i];
--  data[i * 4 + 0 - kBlockSize] = (Byte)(d);
--  data[i * 4 + 1 - kBlockSize] = (Byte)(d >>  8);
--  data[i * 4 + 2 - kBlockSize] = (Byte)(d >> 16);
--  data[i * 4 + 3 - kBlockSize] = (Byte)(d >> 24);
-+  data[(int)i * 4 + 0 - (int)kBlockSize] = (Byte)(d);
-+  data[(int)i * 4 + 1 - (int)kBlockSize] = (Byte)(d >>  8);
-+  data[(int)i * 4 + 2 - (int)kBlockSize] = (Byte)(d >> 16);
-+  data[(int)i * 4 + 3 - (int)kBlockSize] = (Byte)(d >> 24);
- }
-   returnRes = rar350Mode;
- }

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-05-13 Thread Agostino Sarubbo

commit: 0db41e267380f0ebf56a097cfac4780f23282f3d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 13 08:39:10 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 13 08:41:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db41e26

app-arch/p7zip: amd64 stable wrt bug #582364

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/p7zip/p7zip-15.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/p7zip/p7zip-15.14.1.ebuild 
b/app-arch/p7zip/p7zip-15.14.1.ebuild
index a2efa29..6026420 100644
--- a/app-arch/p7zip/p7zip-15.14.1.ebuild
+++ b/app-arch/p7zip/p7zip-15.14.1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
 
 REQUIRED_USE="kde? ( wxwidgets )"

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/

2016-04-10 Thread Lars Wendler

commit: 08e65ecd1abfafd2acdb6fbc44f5d2807d86d11e
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Apr 10 09:48:44 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Apr 10 09:48:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e65ecd

app-arch/p7zip: Added missing darwin patch (bug #579482).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/p7zip/files/p7zip-15.14.1-darwin.patch | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/app-arch/p7zip/files/p7zip-15.14.1-darwin.patch 
b/app-arch/p7zip/files/p7zip-15.14.1-darwin.patch
new file mode 100644
index 000..e7f40f5
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-15.14.1-darwin.patch
@@ -0,0 +1,11 @@
+--- p7zip_15.14.1/CPP/myWindows/StdAfx.h
 p7zip_15.14.1/CPP/myWindows/StdAfx.h
+@@ -32,7 +32,7 @@
+ #include 
+ #include 
+ 
+-#ifdef __NETWARE__
++#if defined(__NETWARE__) || defined(__MACH__)
+ #include 
+ #endif
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-04-09 Thread Matt Thode

commit: a0b9f83ba0ee0b5e1e29ec3477ee67d7c62e5bae
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Apr 10 02:17:53 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sun Apr 10 02:18:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b9f83b

app-arch/p7zip: bup for bug 579196

Package-Manager: portage-2.2.26

 app-arch/p7zip/Manifest |   1 +
 app-arch/p7zip/p7zip-15.14.1.ebuild | 158 
 2 files changed, 159 insertions(+)

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 6e258b4..7f85deb 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,4 +1,5 @@
 DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 
8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 
4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd
 WHIRLPOOL 
71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
+DIST p7zip_15.14.1_src_all.tar.bz2 4147911 SHA256 
699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4 SHA512 
30d0ef47bd6938cdd5d9d80ec6e7aed972655686a43adb0ae34bb9856ec7cd5a68a05c580352021055cefd6eeceb134ff6402f93686ce46e57f9757798e76abd
 WHIRLPOOL 
ace6204d3ab08002b6d5657ae280e22b7e26cdfe0af8099024ad8562a68aa5097a8f09d9d49904a06b9a6942d30fbf3d7a3872661433dd4f76c33dea03ccfb6a
 DIST p7zip_15.14_src_all.tar.bz2 4147609 SHA256 
b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8 SHA512 
3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5
 WHIRLPOOL 
52a397e4ea15cdd4c68156a0c32d449be78469d5704e0d4bb644a813b583422b3d7b0741284974ca22d9ea99a303dfadeccc23d74a77cac0c9b51153bd61e24b
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 
49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 
7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a
 WHIRLPOOL 
cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 
fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 
f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04
 WHIRLPOOL 
6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24

diff --git a/app-arch/p7zip/p7zip-15.14.1.ebuild 
b/app-arch/p7zip/p7zip-15.14.1.ebuild
new file mode 100644
index 000..a2efa29
--- /dev/null
+++ b/app-arch/p7zip/p7zip-15.14.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+   kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+   amd64? ( dev-lang/yasm )
+   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-darwin.patch
+
+   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 '/ALLFLAGS/s:-s ::' \
+   -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+   -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

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/

2016-03-28 Thread Fabian Groffen

commit: 8c427497e8b041bb0908964e10b71ea21dcb7216
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Mar 28 07:24:53 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Mar 28 07:25:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c427497

app-arch/p7zip: fix compilation on OSX El Capitan also, bug #577344

Package-Manager: portage-2.2.28-prefix

 app-arch/p7zip/files/p7zip-15.14-darwin.patch | 12 
 1 file changed, 12 insertions(+)

diff --git a/app-arch/p7zip/files/p7zip-15.14-darwin.patch 
b/app-arch/p7zip/files/p7zip-15.14-darwin.patch
index 2db6de9..412b838 100644
--- a/app-arch/p7zip/files/p7zip-15.14-darwin.patch
+++ b/app-arch/p7zip/files/p7zip-15.14-darwin.patch
@@ -1,4 +1,5 @@
 Darwin has wchar_h and wctypes_h.
+El Capitan needs  for ino_t.
 
 --- CPP/myWindows/config.h
 +++ CPP/myWindows/config.h
@@ -11,3 +12,14 @@ Darwin has wchar_h and wctypes_h.
  
  /*  */
  /* ENV_HAVE_WCHAR__H and not ENV_HAVE_WCHAR_H to avoid warning with 
wxWidgets */
+--- CPP/myWindows/StdAfx.h
 CPP/myWindows/StdAfx.h
+@@ -32,7 +32,7 @@
+ #include 
+ #include 
+ 
+-#ifdef __NETWARE__
++#if defined(__NETWARE__) || defined(__MACH__)
+ #include 
+ #endif
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/, app-arch/p7zip/

2016-03-26 Thread Fabian Groffen

commit: ed70c7578c8f321f58b1c6c81ea478804b3fc0a6
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Mar 26 08:33:42 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Mar 26 08:34:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed70c757

app-arch/p7zip: fix compilation on Darwin, bug #577344

Package-Manager: portage-2.2.28-prefix

 app-arch/p7zip/files/p7zip-15.14-darwin.patch | 13 +
 app-arch/p7zip/p7zip-15.14.ebuild | 20 ++--
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app-arch/p7zip/files/p7zip-15.14-darwin.patch 
b/app-arch/p7zip/files/p7zip-15.14-darwin.patch
new file mode 100644
index 000..2db6de9
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-15.14-darwin.patch
@@ -0,0 +1,13 @@
+Darwin has wchar_h and wctypes_h.
+
+--- CPP/myWindows/config.h
 CPP/myWindows/config.h
+@@ -5,7 +5,7 @@
+   #define FILESYSTEM_IS_CASE_SENSITIVE 1
+ #endif
+ 
+-  #if !defined(ENV_MACOSX) && !defined(ENV_BEOS)
++  #if !defined(ENV_BEOS)
+ 
+ /*  */
+ /* ENV_HAVE_WCHAR__H and not ENV_HAVE_WCHAR_H to avoid warning with 
wxWidgets */

diff --git a/app-arch/p7zip/p7zip-15.14.ebuild 
b/app-arch/p7zip/p7zip-15.14.ebuild
index bd19893..a2efa29 100644
--- a/app-arch/p7zip/p7zip-15.14.ebuild
+++ b/app-arch/p7zip/p7zip-15.14.ebuild
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}_${PV}
 
 src_prepare() {
+   epatch "${FILESDIR}"/${P}-darwin.patch
+
if ! use pch; then
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" 
-i makefile.* || die
fi
@@ -38,8 +40,6 @@ src_prepare() {
-e 's:-m32 ::g' \
-e 's:-m64 ::g' \
-e 's:-pipe::g' \
-   -e "/^CXX=/s:g++:$(tc-getCXX):" \
-   -e "/^CC=/s:gcc:$(tc-getCC):" \
-e '/ALLFLAGS/s:-s ::' \
-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
-i makefile* || die
@@ -63,17 +63,17 @@ src_prepare() {
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
-   [[ ${CHOST} == *64-* ]] \
-   && cp -f makefile.macosx_64bits makefile.machine \
-   || cp -f makefile.macosx_32bits makefile.machine
+   # 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 \
-   $(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
+   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
@@ -91,9 +91,9 @@ src_prepare() {
 }
 
 src_compile() {
-   emake all3
+   emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
if use kde || use wxwidgets; then
-   emake -- 7zG
+   emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
 #  emake -- 7zFM
fi
 }

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-03-14 Thread Patrick Lauer

commit: bba6900d39cf182eb0a5ae345f4b7a29933ebf86
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Mar 14 06:33:05 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Mon Mar 14 06:33:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba6900d

app-arch/p7zip: Remove unneeded/broken patching

Package-Manager: portage-2.2.28

 app-arch/p7zip/p7zip-15.14.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-arch/p7zip/p7zip-15.14.ebuild 
b/app-arch/p7zip/p7zip-15.14.ebuild
index 8d7950b..bd19893 100644
--- a/app-arch/p7zip/p7zip-15.14.ebuild
+++ b/app-arch/p7zip/p7zip-15.14.ebuild
@@ -30,9 +30,6 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}_${PV}
 
 src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-CVE-2015-1038.patch
-
if ! use pch; then
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" 
-i makefile.* || die
fi

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-03-13 Thread Matt Thode

commit: 91be02d7debfd41e0ceea02a7f07547779c29f98
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Mar 14 03:13:47 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Mon Mar 14 03:13:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91be02d7

app-arch/p7zip: bup

Package-Manager: portage-2.2.26

 app-arch/p7zip/Manifest   |   1 +
 app-arch/p7zip/p7zip-15.14.ebuild | 161 ++
 2 files changed, 162 insertions(+)

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 9b0a188..6e258b4 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,3 +1,4 @@
 DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 
8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 
4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd
 WHIRLPOOL 
71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
+DIST p7zip_15.14_src_all.tar.bz2 4147609 SHA256 
b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8 SHA512 
3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5
 WHIRLPOOL 
52a397e4ea15cdd4c68156a0c32d449be78469d5704e0d4bb644a813b583422b3d7b0741284974ca22d9ea99a303dfadeccc23d74a77cac0c9b51153bd61e24b
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 
49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 
7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a
 WHIRLPOOL 
cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 
fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 
f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04
 WHIRLPOOL 
6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24

diff --git a/app-arch/p7zip/p7zip-15.14.ebuild 
b/app-arch/p7zip/p7zip-15.14.ebuild
new file mode 100644
index 000..8d7950b
--- /dev/null
+++ b/app-arch/p7zip/p7zip-15.14.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+   kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+   amd64? ( dev-lang/yasm )
+   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+   epatch \
+   "${FILESDIR}"/${P}-CVE-2015-1038.patch
+
+   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 "/^CXX=/s:g++:$(tc-getCXX):" \
+   -e "/^CC=/s:gcc:$(tc-getCC):" \
+   -e '/ALLFLAGS/s:-s ::' \
+   -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+   -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
+   [[ ${CHOST} == *64-* ]] \
+   && cp -f makefile.macosx_64bits

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-02-26 Thread Matt Thode

commit: 6027a0b4e2932640d43af819c2f0da34340386cf
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Feb 26 16:46:56 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Feb 26 16:46:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6027a0b4

app-arch/p7zip: finishing up bug 575622

Package-Manager: portage-2.2.26

 app-arch/p7zip/{p7zip-15.09-r1.ebuild => p7zip-15.09-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/p7zip/p7zip-15.09-r1.ebuild 
b/app-arch/p7zip/p7zip-15.09-r2.ebuild
similarity index 97%
rename from app-arch/p7zip/p7zip-15.09-r1.ebuild
rename to app-arch/p7zip/p7zip-15.09-r2.ebuild
index 8ca5177..8d7950b 100644
--- a/app-arch/p7zip/p7zip-15.09-r1.ebuild
+++ b/app-arch/p7zip/p7zip-15.09-r2.ebuild
@@ -132,10 +132,10 @@ src_install() {
rm GUI/kde4/p7zip_compress.desktop || die
insinto /usr/share/kde4/services/ServiceMenus
doins GUI/kde4/*.desktop
-   dodir /usr/local/share/kservices5/ServiceMenus
+   dodir /usr/share/kservices5/ServiceMenus
for item in 
"${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do
item="$(basename ${item})"
-   dosym 
"/usr/share/kde4/services/ServiceMenus/${item}" 
"/usr/local/share/kservices5/ServiceMenus/${item}"
+   dosym 
"/usr/share/kde4/services/ServiceMenus/${item}" 
"/usr/share/kservices5/ServiceMenus/${item}"
done
fi
fi

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2016-02-25 Thread Matt Thode

commit: 0e3dd41a3f75ddaf3626773d70f636813b7c4b1f
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Feb 25 17:20:11 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Feb 25 17:21:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e3dd41a

app-arch/p7zip: fixing bug 575622

Package-Manager: portage-2.2.26

 app-arch/p7zip/p7zip-15.09-r1.ebuild | 161 +++
 1 file changed, 161 insertions(+)

diff --git a/app-arch/p7zip/p7zip-15.09-r1.ebuild 
b/app-arch/p7zip/p7zip-15.09-r1.ebuild
new file mode 100644
index 000..8ca5177
--- /dev/null
+++ b/app-arch/p7zip/p7zip-15.09-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+   kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+   amd64? ( dev-lang/yasm )
+   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+   epatch \
+   "${FILESDIR}"/${P}-CVE-2015-1038.patch
+
+   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 "/^CXX=/s:g++:$(tc-getCXX):" \
+   -e "/^CC=/s:gcc:$(tc-getCC):" \
+   -e '/ALLFLAGS/s:-s ::' \
+   -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+   -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
+   [[ ${CHOST} == *64-* ]] \
+   && cp -f makefile.macosx_64bits makefile.machine \
+   || cp -f makefile.macosx_32bits 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 \
+   $(use rar && echo CPP/7zip/Compress/Rar/makefile) || 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 depend
+   fi
+}
+
+src_compile() {
+   emake all3
+   if use kde || use wxwidgets; then
+   emake -- 7zG
+#  emake -- 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}

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/files/

2015-12-03 Thread Justin Lecher

commit: 63d6e0fccc6f26ec4b0ba5cd6046b6a3fd4ca073
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Dec  3 10:43:00 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Dec  3 10:44:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d6e0fc

app-arch/p7zip: Add upstream version of CVE patch

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 .../p7zip/files/p7zip-15.09-CVE-2015-1038.patch| 98 --
 1 file changed, 52 insertions(+), 46 deletions(-)

diff --git a/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch 
b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
index dc81317..5da28c5 100644
--- a/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
+++ b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
@@ -1,17 +1,30 @@
- CPP/7zip/UI/Agent/Agent.cpp   |  2 +-
- CPP/7zip/UI/Client7z/Client7z.cpp | 19 ++-
- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp | 14 +++--
- CPP/7zip/UI/Common/ArchiveExtractCallback.h   |  6 +++-
- CPP/7zip/UI/Common/Extract.cpp|  2 +-
- CPP/Windows/FileDir.cpp   | 45 +--
- CPP/Windows/FileDir.h | 31 +-
- 7 files changed, 109 insertions(+), 10 deletions(-)
+Author: Ben Hutchings 
+Date: Tue, 19 May 2015 02:38:40 +0100
+Description: Delay creation of symlinks to prevent arbitrary file writes 
(CVE-2015-1038)
+Bug: http://sourceforge.net/p/p7zip/bugs/147/
+Bug-Debian: https://bugs.debian.org/774660
 
-diff --git a/CPP/7zip/UI/Agent/Agent.cpp b/CPP/7zip/UI/Agent/Agent.cpp
-index 201e82c..b0b8316 100644
 a/CPP/7zip/UI/Agent/Agent.cpp
-+++ b/CPP/7zip/UI/Agent/Agent.cpp
-@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const UInt32 *indices,
+Alexander Cherepanov discovered that 7zip is susceptible to a
+directory traversal vulnerability.  While extracting an archive, it
+will extract symlinks and then follow them if they are referenced in
+further entries.  This can be exploited by a rogue archive to write
+files outside the current directory.
+
+We have to create placeholder files (which we already do) and delay
+creating symlinks until the end of extraction.
+
+Due to the possibility of anti-items (deletions) in the archive, it is
+possible for placeholders to be deleted and replaced before we create
+the symlinks.  It's not clear that this can be used for mischief, but
+GNU tar guards against similar problems by checking that the placeholder
+still exists and is the same inode.  XXX It also checks 'birth time' but
+this isn't portable.  We can probably get away with comparing ctime
+since we don't support hard links.
+
+diff -rup p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp 
p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp
+--- p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp   2015-09-17 
20:02:35.0 +0100
 p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp2015-12-03 02:22:47.073724194 
+
+@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const
HRESULT result = _agentSpec->GetArchive()->Extract((),
realIndices.Size(), testMode, extractCallback);
if (result == S_OK)
@@ -20,10 +33,9 @@ index 201e82c..b0b8316 100644
return result;
COM_TRY_END
  }
-diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp 
b/CPP/7zip/UI/Client7z/Client7z.cpp
-index c6522fe..1919389 100644
 a/CPP/7zip/UI/Client7z/Client7z.cpp
-+++ b/CPP/7zip/UI/Client7z/Client7z.cpp
+diff -rup p7zip_15.09.orig/CPP/7zip/UI/Client7z/Client7z.cpp 
p7zip_15.09/CPP/7zip/UI/Client7z/Client7z.cpp
+--- p7zip_15.09.orig/CPP/7zip/UI/Client7z/Client7z.cpp 2015-10-17 
15:52:30.0 +0100
 p7zip_15.09/CPP/7zip/UI/Client7z/Client7z.cpp  2015-12-03 
02:22:47.073724194 +
 @@ -230,8 +230,11 @@ private:
COutFileStream *_outFileStreamSpec;
CMyComPtr _outFileStream;
@@ -36,7 +48,7 @@ index c6522fe..1919389 100644
  
UInt64 NumErrors;
bool PasswordIsDefined;
-@@ -449,11 +452,23 @@ STDMETHODIMP 
CArchiveExtractCallback::SetOperationResult(Int32 operationResult)
+@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
}
_outFileStream.Release();
if (_extractMode && _processedFileInfo.AttribDefined)
@@ -61,7 +73,7 @@ index c6522fe..1919389 100644
  
  STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
  {
-@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const char *args[])
+@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const cha
// extractCallbackSpec->PasswordIsDefined = true;
// extractCallbackSpec->Password = L"1";
HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, 
extractCallback);
@@ -70,11 +82,10 @@ index c6522fe..1919389 100644
if (result != S_OK)
{
  PrintError("Extract Error");
-diff --git a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp 
b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2015-10-29 Thread Justin Lecher

commit: dc66baee3f174784ca7abe23580056f20cb52732
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Oct 29 08:20:06 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Oct 29 08:20:15 2015 +
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}

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/, app-arch/p7zip/files/

2015-10-28 Thread Justin Lecher

commit: 2b72affac85585328eb48f5933ea13345aa733bf
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Oct 28 13:44:09 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Oct 28 13:44:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b72affa

app-arch/p7zip: Version Bump

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564266

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 app-arch/p7zip/Manifest|   1 +
 .../p7zip/files/p7zip-15.09-CVE-2015-1038.patch| 284 +
 app-arch/p7zip/p7zip-15.09.ebuild  | 158 
 3 files changed, 443 insertions(+)

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 44c4c61..9b0a188 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,2 +1,3 @@
+DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 
8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 
4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd
 WHIRLPOOL 
71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 
49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 
7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a
 WHIRLPOOL 
cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 
fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 
f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04
 WHIRLPOOL 
6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24

diff --git a/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch 
b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
new file mode 100644
index 000..dc81317
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-15.09-CVE-2015-1038.patch
@@ -0,0 +1,284 @@
+ CPP/7zip/UI/Agent/Agent.cpp   |  2 +-
+ CPP/7zip/UI/Client7z/Client7z.cpp | 19 ++-
+ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp | 14 +++--
+ CPP/7zip/UI/Common/ArchiveExtractCallback.h   |  6 +++-
+ CPP/7zip/UI/Common/Extract.cpp|  2 +-
+ CPP/Windows/FileDir.cpp   | 45 +--
+ CPP/Windows/FileDir.h | 31 +-
+ 7 files changed, 109 insertions(+), 10 deletions(-)
+
+diff --git a/CPP/7zip/UI/Agent/Agent.cpp b/CPP/7zip/UI/Agent/Agent.cpp
+index 201e82c..b0b8316 100644
+--- a/CPP/7zip/UI/Agent/Agent.cpp
 b/CPP/7zip/UI/Agent/Agent.cpp
+@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const UInt32 *indices,
+   HRESULT result = _agentSpec->GetArchive()->Extract((),
+   realIndices.Size(), testMode, extractCallback);
+   if (result == S_OK)
+-result = extractCallbackSpec->SetDirsTimes();
++result = extractCallbackSpec->SetFinalAttribs();
+   return result;
+   COM_TRY_END
+ }
+diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp 
b/CPP/7zip/UI/Client7z/Client7z.cpp
+index c6522fe..1919389 100644
+--- a/CPP/7zip/UI/Client7z/Client7z.cpp
 b/CPP/7zip/UI/Client7z/Client7z.cpp
+@@ -230,8 +230,11 @@ private:
+   COutFileStream *_outFileStreamSpec;
+   CMyComPtr _outFileStream;
+ 
++  CObjectVector _delayedSymLinks;
++
+ public:
+   void Init(IInArchive *archiveHandler, const FString );
++  HRESULT SetFinalAttribs();
+ 
+   UInt64 NumErrors;
+   bool PasswordIsDefined;
+@@ -449,11 +452,23 @@ STDMETHODIMP 
CArchiveExtractCallback::SetOperationResult(Int32 operationResult)
+   }
+   _outFileStream.Release();
+   if (_extractMode && _processedFileInfo.AttribDefined)
+-SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib);
++SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, 
&_delayedSymLinks);
+   PrintNewLine();
+   return S_OK;
+ }
+ 
++HRESULT CArchiveExtractCallback::SetFinalAttribs()
++{
++  HRESULT result = S_OK;
++
++  for (int i = 0; i != _delayedSymLinks.Size(); ++i)
++if (!_delayedSymLinks[i].Create())
++  result = E_FAIL;
++
++  _delayedSymLinks.Clear();
++
++  return result;
++}
+ 
+ STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
+ {
+@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const char *args[])
+   // extractCallbackSpec->PasswordIsDefined = true;
+   // extractCallbackSpec->Password = L"1";
+   HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, 
extractCallback);
++  if (result == S_OK)
++  result = extractCallbackSpec->SetFinalAttribs();
+   if (result != S_OK)
+   {
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/p7zip/

2015-10-24 Thread Pacho Ramos

commit: e7e252c020ecd349e6f35c5020e5e66604cf0484
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct 24 10:24:12 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct 24 10:24:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e252c0

app-arch/p7zip: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 app-arch/p7zip/p7zip-9.38.1-r3.ebuild | 157 ++
 1 file changed, 157 insertions(+)

diff --git a/app-arch/p7zip/p7zip-9.38.1-r3.ebuild 
b/app-arch/p7zip/p7zip-9.38.1-r3.ebuild
new file mode 100644
index 000..8c2486e
--- /dev/null
+++ b/app-arch/p7zip/p7zip-9.38.1-r3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib 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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+   kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+   wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+   amd64? ( dev-lang/yasm )
+   abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+   x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+   epatch \
+   "${FILESDIR}"/${P}-osversion.patch \
+   "${FILESDIR}"/${P}-CVE-2015-1038.patch
+
+   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:-O::g' \
+   -e 's:-pipe::g' \
+   -e "/^CXX=/s:g++:$(tc-getCXX):" \
+   -e "/^CC=/s:gcc:$(tc-getCC):" \
+   -e '/ALLFLAGS/s:-s ::' \
+   -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+   -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*
+   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
+   [[ ${CHOST} == *64-* ]] \
+   && cp -f makefile.macosx_64bits makefile.machine \
+   || cp -f makefile.macosx_32bits 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 \
+   $(use rar && echo CPP/7zip/Compress/Rar/makefile) || 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 depend
+   fi
+}
+
+src_compile() {
+   emake all3
+   if use kde || use wxwidgets; then
+   emake -- 7zG
+   emake -- 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"
+
+

76 matches

Mail list logo