| 1 |
commit: d571361d89b9b940732419faf25337dc89518cc0 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 30 23:48:16 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 3 03:14:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d571361d |
| 7 |
|
| 8 |
www-client/chromium: update to EAPI 7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/chromium/chromium-71.0.3559.6.ebuild | 28 ++++++++++++++----------- |
| 14 |
1 file changed, 16 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-client/chromium/chromium-71.0.3559.6.ebuild b/www-client/chromium/chromium-71.0.3559.6.ebuild |
| 17 |
index a46167b6ff4..71d7284a09c 100644 |
| 18 |
--- a/www-client/chromium/chromium-71.0.3559.6.ebuild |
| 19 |
+++ b/www-client/chromium/chromium-71.0.3559.6.ebuild |
| 20 |
@@ -1,14 +1,14 @@ |
| 21 |
# Copyright 1999-2018 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="6" |
| 25 |
+EAPI=7 |
| 26 |
PYTHON_COMPAT=( python2_7 ) |
| 27 |
|
| 28 |
CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
| 29 |
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr |
| 30 |
sv sw ta te th tr uk vi zh-CN zh-TW" |
| 31 |
|
| 32 |
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils |
| 33 |
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils |
| 34 |
|
| 35 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
| 36 |
HOMEPAGE="http://chromium.org/" |
| 37 |
@@ -89,6 +89,8 @@ RDEPEND="${COMMON_DEPEND} |
| 38 |
# dev-vcs/git - https://bugs.gentoo.org/593476 |
| 39 |
# sys-apps/sandbox - https://crbug.com/586444 |
| 40 |
DEPEND="${COMMON_DEPEND} |
| 41 |
+" |
| 42 |
+BDEPEND=" |
| 43 |
>=app-arch/gzip-1.7 |
| 44 |
!arm? ( |
| 45 |
dev-lang/yasm |
| 46 |
@@ -108,7 +110,7 @@ DEPEND="${COMMON_DEPEND} |
| 47 |
: ${CHROMIUM_FORCE_CLANG=yes} |
| 48 |
|
| 49 |
if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then |
| 50 |
- DEPEND+=" >=sys-devel/clang-5" |
| 51 |
+ BDEPEND+=" >=sys-devel/clang-5" |
| 52 |
fi |
| 53 |
|
| 54 |
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
| 55 |
@@ -159,14 +161,12 @@ pre_build_checks() { |
| 56 |
# Check build requirements, bug #541816 and bug #471810 . |
| 57 |
CHECKREQS_MEMORY="3G" |
| 58 |
CHECKREQS_DISK_BUILD="5G" |
| 59 |
- eshopts_push -s extglob |
| 60 |
- if is-flagq '-g?(gdb)?([1-9])'; then |
| 61 |
+ if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then |
| 62 |
CHECKREQS_DISK_BUILD="25G" |
| 63 |
if ! use component-build; then |
| 64 |
CHECKREQS_MEMORY="16G" |
| 65 |
fi |
| 66 |
fi |
| 67 |
- eshopts_pop |
| 68 |
check-reqs_pkg_setup |
| 69 |
} |
| 70 |
|
| 71 |
@@ -682,17 +682,21 @@ src_install() { |
| 72 |
readme.gentoo_create_doc |
| 73 |
} |
| 74 |
|
| 75 |
-pkg_preinst() { |
| 76 |
- gnome2_icon_savelist |
| 77 |
-} |
| 78 |
- |
| 79 |
pkg_postrm() { |
| 80 |
- gnome2_icon_cache_update |
| 81 |
+ if type gtk-update-icon-cache &>/dev/null; then |
| 82 |
+ ebegin "Updating GTK icon cache" |
| 83 |
+ gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
| 84 |
+ eend $? |
| 85 |
+ fi |
| 86 |
xdg_desktop_database_update |
| 87 |
} |
| 88 |
|
| 89 |
pkg_postinst() { |
| 90 |
- gnome2_icon_cache_update |
| 91 |
+ if type gtk-update-icon-cache &>/dev/null; then |
| 92 |
+ ebegin "Updating GTK icon cache" |
| 93 |
+ gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
| 94 |
+ eend $? |
| 95 |
+ fi |
| 96 |
xdg_desktop_database_update |
| 97 |
readme.gentoo_print_elog |
| 98 |
} |
Archives