summaryrefslogtreecommitdiff
path: root/www-client/opera-beta
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/opera-beta')
-rw-r--r--www-client/opera-beta/Manifest7
-rw-r--r--www-client/opera-beta/opera-beta-64.0.3417.32.ebuild (renamed from www-client/opera-beta/opera-beta-64.0.3417.11.ebuild)0
-rw-r--r--www-client/opera-beta/opera-beta-64.0.3417.8.ebuild115
3 files changed, 7 insertions, 115 deletions
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index fe931426816f..4fe1049d793a 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,7 +1,14 @@
+<<<<<<< HEAD
DIST opera-beta_64.0.3417.11_amd64.deb 67591076 BLAKE2B 2826b68521274ef148c88f16bd19659826bd013a82bb84b6d4ca9317cb1ab121c2fdcd7ecb51fdb368f5ba87671b721f21701838688c1dc236a386cd1ae2571e SHA512 3110c502cf3bb74f5122e9d97ef9d278e1aaab24aeb42da989705efed85dd05815e0b4b2004e6e9d7c01aa7acae8b035a83bb32449a514ec833ac5d803b98fe3
DIST opera-beta_64.0.3417.19_amd64.deb 66568892 BLAKE2B 20897486d69140f5db89ccb7e93492712b76fa4b035b2a63da88bc047ac92ffab66be67598850e177fcc6e264222da497f520d905a18f4c0ec7f95456a991c05 SHA512 7ec028311ccdcb49681336f3951616c645356373e6cf0b8976c43e8b4580a0818ee8b8d26bc8edcacfcdab4b8b0890cd27b8e539bec7eda01cdb8c769250aee1
DIST opera-beta_64.0.3417.8_amd64.deb 66468202 BLAKE2B cacfce4db714ef83e7130bb2d5729541aa4e86d1645e0b80009c7b6a354fbf459976a692b4b24a5f5a4afabb292a87f5be8c5b1f74d6ac5ba0e2724f2bc52569 SHA512 783d875986f0ca64bbe049370cac718982075412fa07e27830452b0b6df630f9121add83caa5dae5758bf6f67d71876aea36ef0011739eaf98980bb053680569
EBUILD opera-beta-64.0.3417.11.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
EBUILD opera-beta-64.0.3417.19.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
EBUILD opera-beta-64.0.3417.8.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
+=======
+DIST opera-beta_64.0.3417.19_amd64.deb 66568892 BLAKE2B 20897486d69140f5db89ccb7e93492712b76fa4b035b2a63da88bc047ac92ffab66be67598850e177fcc6e264222da497f520d905a18f4c0ec7f95456a991c05 SHA512 7ec028311ccdcb49681336f3951616c645356373e6cf0b8976c43e8b4580a0818ee8b8d26bc8edcacfcdab4b8b0890cd27b8e539bec7eda01cdb8c769250aee1
+DIST opera-beta_64.0.3417.32_amd64.deb 67607274 BLAKE2B 465824c7227049f769b74089bbaa8d077736ea8a02a2e4b8eb6c590b0696c932b9c02dedd647350f12a475c585fd5f838c756f1cb6e0b410e83c863ac3a603a9 SHA512 86f188a0ffd651e92a1f3f2f4587d7c2323c898377474ccba583088dd2087b6c6fb7cd0253b0e824715d1cdbf570cbe76a0f2488e2d30086478d42a19e4c0d0d
+EBUILD opera-beta-64.0.3417.19.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
+EBUILD opera-beta-64.0.3417.32.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
+>>>>>>> next
MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-64.0.3417.11.ebuild b/www-client/opera-beta/opera-beta-64.0.3417.32.ebuild
index 59a8587ec4bd..59a8587ec4bd 100644
--- a/www-client/opera-beta/opera-beta-64.0.3417.11.ebuild
+++ b/www-client/opera-beta/opera-beta-64.0.3417.32.ebuild
diff --git a/www-client/opera-beta/opera-beta-64.0.3417.8.ebuild b/www-client/opera-beta/opera-beta-64.0.3417.8.ebuild
deleted file mode 100644
index 59a8587ec4bd..000000000000
--- a/www-client/opera-beta/opera-beta-64.0.3417.8.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
- be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
- ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
- zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
- https://download1.operacdn.com/pub/
- https://download2.operacdn.com/pub/
- https://download3.operacdn.com/pub/
- https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
- "${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- gnome-base/gconf:2
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- net-misc/curl
- net-print/cups
- sys-apps/dbus
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/libXScrnSaver
- 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/libXtst
- x11-libs/libnotify
- x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
- OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_prepare() {
- default
-
- case ${ARCH} in
- amd64)
- mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
- rm -r usr/lib || die
- ;;
- x86)
- mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
- ;;
- esac
-
- mv usr/share/doc/${PN} usr/share/doc/${PF} || die
- gunzip usr/share/doc/${PF}/changelog.gz || die
-
- rm usr/bin/${PN} || die
-
- pushd "${OPERA_HOME}/localization" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- sed -i \
- -e 's|^TargetEnvironment|X-&|g' \
- usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
- mv * "${D}" || die
- dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
- fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}