diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
tree | 76e74807bc479502e13866b581b6bf86734ec634 /www-client/google-chrome-beta | |
parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) |
gentoo resync : 13.10.2019
Diffstat (limited to 'www-client/google-chrome-beta')
-rw-r--r-- | www-client/google-chrome-beta/Manifest | 9 | ||||
-rw-r--r-- | www-client/google-chrome-beta/google-chrome-beta-78.0.3904.34.ebuild | 131 | ||||
-rw-r--r-- | www-client/google-chrome-beta/google-chrome-beta-78.0.3904.50.ebuild (renamed from www-client/google-chrome-beta/google-chrome-beta-78.0.3904.21.ebuild) | 2 |
3 files changed, 4 insertions, 138 deletions
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest index 8c0a0054eed6..a801ee038f15 100644 --- a/www-client/google-chrome-beta/Manifest +++ b/www-client/google-chrome-beta/Manifest @@ -1,8 +1,3 @@ -<<<<<<< HEAD -DIST google-chrome-beta_78.0.3904.21-1_amd64.deb 64127558 BLAKE2B 6be143cdfeed71a2af35bb3e899fe274d35ea85c735ed4e8b4ed249c15d06379a496668de060c25c95043e4675dc8e45922ef6de4f9468c837864fd39b1124b3 SHA512 70f86d835b181edfe7a350ccb5b6c7813744cf900521c589e8c45434ec4c5540e2ef21f2b77f169c918f817f921d874b2e70c2502e1b2412f2b89ebfbb7cddce -EBUILD google-chrome-beta-78.0.3904.21.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740 -======= -DIST google-chrome-beta_78.0.3904.34-1_amd64.deb 64476112 BLAKE2B c7a97ac3c6035101cc98b15f1df006267e9cd6d6449e35f50832db3df26781a6adf4c38e3ae8bce22673f99a61aed7cbfe26caec6aec84dd1654f4401be2051e SHA512 5fb7bc112d10c0909d9c4cb5e9432bd4fbb4384d29cd509d87f6041ab6dd61ebdb7dbd2526602aef01ae67a05e569a2e884e1cea1c9f298ee9529d4618ea5e3e -EBUILD google-chrome-beta-78.0.3904.34.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740 ->>>>>>> next +DIST google-chrome-beta_78.0.3904.50-1_amd64.deb 64518778 BLAKE2B 3f41a7ec429ab7447fdab4d6b9fd434d0eb1875bdd4a481684a8f77c1796117f686a8d664f0fcf9ee992749f8ca296ca67126940323aefe23987211bcc48e96e SHA512 6994da44680b9b58d00d7b35b8bdcbda9dff33dbbc3654e26d7686c5fac38c0fd40a2e728af44a826dc0a3a0ba32c8629819b7a6955faedd9b1e3adfbc6d8f74 +EBUILD google-chrome-beta-78.0.3904.50.ebuild 2950 BLAKE2B 96c28a441b7d937e45cf28fcf65a241c71475692522b60ad37389d3de23676a7df62e5ca70e2c4bf778ac3de36a9ff60cb7386bf97546b5520ca6132a6a6dfc7 SHA512 c53df3088dbeeaab7aa99b21ae3f5dcb83a185edc774f1ae6aae866ef71cec8d7e0038211d3cd2560bcebde8a85ff9cf2dd01bfd0c2d25722f4525e79529604b MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57 diff --git a/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.34.ebuild b/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.34.ebuild deleted file mode 100644 index fa060d36e118..000000000000 --- a/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.34.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 2011-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he - 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 - sv sw ta te th tr uk vi zh-CN zh-TW" - -inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils - -DESCRIPTION="The web browser from Google" -HOMEPAGE="https://www.google.com/chrome" - -if [[ ${PN} == google-chrome ]]; then - KEYWORDS="-* amd64" - MY_PN=${PN}-stable -else - KEYWORDS="-* ~amd64" - MY_PN=${PN} -fi - -MY_P="${MY_PN}_${PV}-1" - -SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" - -LICENSE="google-chrome" -SLOT="0" -RESTRICT="bindist mirror strip" - -DEPEND="" -RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-arch/bzip2 - app-misc/ca-certificates - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - >=dev-libs/nss-3.26 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype:2 - net-print/cups - sys-apps/dbus - sys-libs/libcap - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[X] - >=x11-libs/libX11-1.5.0 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/libxcb - x11-libs/pango - x11-misc/xdg-utils -" - -QA_PREBUILT="*" -QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop" -S=${WORKDIR} -CHROME_HOME="opt/google/chrome${PN#google-chrome}" - -pkg_nofetch() { - eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures." -} - -pkg_pretend() { - # Protect against people using autounmask overzealously - use amd64 || die "google-chrome only works on amd64" -} - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - : -} - -src_install() { - dodir / - cd "${ED}" || die - unpacker - - rm -r etc usr/share/menu || die - mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die - - gzip -d usr/share/doc/${PF}/changelog.gz || die - gzip -d usr/share/man/man1/${MY_PN}.1.gz || die - if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then - rm usr/share/man/man1/google-chrome.1.gz || die - dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1 - fi - - pushd "${CHROME_HOME}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - local suffix= - [[ ${PN} == google-chrome-beta ]] && suffix=_beta - [[ ${PN} == google-chrome-unstable ]] && suffix=_dev - - local size - for size in 16 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png - done - - pax-mark m "${CHROME_HOME}/chrome" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.21.ebuild b/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.50.ebuild index fa060d36e118..c0bed062daa7 100644 --- a/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.21.ebuild +++ b/www-client/google-chrome-beta/google-chrome-beta-78.0.3904.50.ebuild @@ -26,6 +26,7 @@ SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd LICENSE="google-chrome" SLOT="0" +IUSE="selinux" RESTRICT="bindist mirror strip" DEPEND="" @@ -61,6 +62,7 @@ RDEPEND=" x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils + selinux? ( sec-policy/selinux-chromium ) " QA_PREBUILT="*" |