| 1 |
commit: 6793838e850e22d03a9c3cc33da21b919968f9e7 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 24 16:57:03 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 25 22:40:34 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6793838e |
| 7 |
|
| 8 |
app-arch/p7zip: Drop kdelibs (R)DEPEND, sort DEPEND/IUSE, EAPI=6 |
| 9 |
|
| 10 |
kde-base/kdelibs:4 is not required here as p7zip only (manually) installs |
| 11 |
a bunch of desktop files that may or may not be picked up by applications. |
| 12 |
wxGTK[X] is already enforced by REQUIRED_USE, so there is no reason |
| 13 |
to duplicate that. |
| 14 |
|
| 15 |
Reversed symlink logic for ServiceMenu as kservices5 is here to stay and |
| 16 |
kde4/services is deprecated. |
| 17 |
|
| 18 |
Package-Manager: portage-2.2.28 |
| 19 |
|
| 20 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 21 |
|
| 22 |
app-arch/p7zip/files/p7zip-16.02-darwin.patch | 4 ++-- |
| 23 |
.../{p7zip-16.02.ebuild => p7zip-16.02-r1.ebuild} | 25 +++++++++++----------- |
| 24 |
2 files changed, 15 insertions(+), 14 deletions(-) |
| 25 |
|
| 26 |
diff --git a/app-arch/p7zip/files/p7zip-16.02-darwin.patch b/app-arch/p7zip/files/p7zip-16.02-darwin.patch |
| 27 |
index e7f40f5..1ee5d34 100644 |
| 28 |
--- a/app-arch/p7zip/files/p7zip-16.02-darwin.patch |
| 29 |
+++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch |
| 30 |
@@ -1,5 +1,5 @@ |
| 31 |
---- p7zip_15.14.1/CPP/myWindows/StdAfx.h |
| 32 |
-+++ p7zip_15.14.1/CPP/myWindows/StdAfx.h |
| 33 |
+--- a/CPP/myWindows/StdAfx.h |
| 34 |
++++ b/CPP/myWindows/StdAfx.h |
| 35 |
@@ -32,7 +32,7 @@ |
| 36 |
#include <errno.h> |
| 37 |
#include <math.h> |
| 38 |
|
| 39 |
diff --git a/app-arch/p7zip/p7zip-16.02.ebuild b/app-arch/p7zip/p7zip-16.02-r1.ebuild |
| 40 |
similarity index 88% |
| 41 |
rename from app-arch/p7zip/p7zip-16.02.ebuild |
| 42 |
rename to app-arch/p7zip/p7zip-16.02-r1.ebuild |
| 43 |
index c34eb86..dd37e65 100644 |
| 44 |
--- a/app-arch/p7zip/p7zip-16.02.ebuild |
| 45 |
+++ b/app-arch/p7zip/p7zip-16.02-r1.ebuild |
| 46 |
@@ -2,7 +2,7 @@ |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
# $Id$ |
| 49 |
|
| 50 |
-EAPI=5 |
| 51 |
+EAPI=6 |
| 52 |
|
| 53 |
WX_GTK_VER="3.0" |
| 54 |
|
| 55 |
@@ -15,22 +15,24 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" |
| 56 |
LICENSE="LGPL-2.1 rar? ( unRAR )" |
| 57 |
SLOT="0" |
| 58 |
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" |
| 59 |
-IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" |
| 60 |
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets" |
| 61 |
|
| 62 |
REQUIRED_USE="kde? ( wxwidgets )" |
| 63 |
|
| 64 |
-RDEPEND=" |
| 65 |
- kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs ) |
| 66 |
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" |
| 67 |
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" |
| 68 |
DEPEND="${RDEPEND} |
| 69 |
- amd64? ( dev-lang/yasm ) |
| 70 |
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) |
| 71 |
+ amd64? ( dev-lang/yasm ) |
| 72 |
x86? ( dev-lang/nasm )" |
| 73 |
|
| 74 |
S=${WORKDIR}/${PN}_${PV} |
| 75 |
|
| 76 |
+DOCS=( ChangeLog README TODO ) |
| 77 |
+ |
| 78 |
+PATCHES=( "${FILESDIR}"/${P}-darwin.patch ) |
| 79 |
+ |
| 80 |
src_prepare() { |
| 81 |
- epatch "${FILESDIR}"/${P}-darwin.patch |
| 82 |
+ default |
| 83 |
|
| 84 |
if ! use pch; then |
| 85 |
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die |
| 86 |
@@ -128,12 +130,12 @@ src_install() { |
| 87 |
|
| 88 |
if use kde; then |
| 89 |
rm GUI/kde4/p7zip_compress.desktop || die |
| 90 |
- insinto /usr/share/kde4/services/ServiceMenus |
| 91 |
+ insinto /usr/share/kservices5/ServiceMenus |
| 92 |
doins GUI/kde4/*.desktop |
| 93 |
- dodir /usr/share/kservices5/ServiceMenus |
| 94 |
- for item in "${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do |
| 95 |
+ dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone |
| 96 |
+ for item in "${ED}"usr/share/kservices5/ServiceMenus/*.desktop; do |
| 97 |
item="$(basename ${item})" |
| 98 |
- dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/share/kservices5/ServiceMenus/${item}" |
| 99 |
+ dosym "/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}" |
| 100 |
done |
| 101 |
fi |
| 102 |
fi |
| 103 |
@@ -150,7 +152,6 @@ src_install() { |
| 104 |
fi |
| 105 |
|
| 106 |
doman man1/7z.1 man1/7za.1 man1/7zr.1 |
| 107 |
- dodoc ChangeLog README TODO |
| 108 |
|
| 109 |
if use doc; then |
| 110 |
dodoc DOC/*.txt |
Archives