Merge updates from master

5 files changed, 115 insertions, 2 deletions

diff --git a/net-wireless/iwd/iwd-1.0.ebuild b/net-wireless/iwd/iwd-1.0.ebuild
index e8302612e254..ba253b609891 100644
--- a/net-wireless/iwd/iwd-1.0.ebuild
+++ b/net-wireless/iwd/iwd-1.0.ebuild
@@ -123,7 +123,8 @@ src_configure() {
 		--enable-external-ell \
 		--enable-systemd-service \
 		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
+		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d) \
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
 }
 
 src_install() {
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index f245bfde24cd..4f0eac82861b 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,2 @@
 DIST opera-beta_65.0.3467.16_amd64.deb 67605832 BLAKE2B 7eb0c5a98c56631b3cd1eaa0d9ac3c24ca7fe0c2bf88125a7015c818d1848e0d075f85e97ff340e3fbf12cfb428e5ab49716d36dc41cc5e06b769545079ba45f SHA512 c35a873ba39f745058b8a0698dfaa9111c97416d28a9fb97a495eec21893323f5a249a6882a6bacad3e74d3be23c8ec90a90a8073986c379075efc36b1bd0fcb
-DIST opera-beta_65.0.3467.7_amd64.deb 67026974 BLAKE2B 4065cb2fb8d7ce16b2de66b39a38c8a8e8ac1eb3a2e82e642c902833c456580dc5d8cc45271d1633942c8513460f49a1ca9377c61b8fd0e21ef8ab8b77c17edc SHA512 c30f294ce576b4faba82b64f4fee99b3ea9d318e99034d41110d34f15a7db919b781054b70e5cca66f5102a9ff57ecf9c58c86e1c96f4f4fcdc2f6915061c85c
+DIST opera-beta_65.0.3467.24_amd64.deb 67613890 BLAKE2B 54e8886bf04176decb8e9b50aed0eb829e01178574f4894fc3c6b7f7fa390d35fa162a07e75a28750ed51c5c19cb3278dc178acdd8757c6a2babe17681bd72a4 SHA512 c40a8c5dec4b9889b517807f5320470a504455934e747b627055c843621a54b51689448cd25c3a9681ff1300b411c3e10cc459bd24633652166cf4eb1e953f3f
diff --git a/www-client/opera-beta/opera-beta-65.0.3467.7.ebuild b/www-client/opera-beta/opera-beta-65.0.3467.24.ebuild
index 59a8587ec4bd..59a8587ec4bd 100644
--- a/www-client/opera-beta/opera-beta-65.0.3467.7.ebuild
+++ b/www-client/opera-beta/opera-beta-65.0.3467.24.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 2e46e6ee7eb4..a47300af5d69 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,2 +1,3 @@
 DIST opera-stable_64.0.3417.61_amd64.deb 66139492 BLAKE2B bdb6c8d622418a11bea98149c502145b9d39425f044d81885cc03fee395ed6dfe756c4817cf68d84bd97fdc7f79eb99ff47a2fa8395036519961a1e4cb526517 SHA512 443862bbf74769d7242350e974bba298ab2a39d05a169dbf9e5dbf8f9e75da2b57fa5595d29499010b3a05ffd111f6753a598ae5c05c1a374935c484b969eb24
 DIST opera-stable_64.0.3417.73_amd64.deb 65876834 BLAKE2B d6251d0d7b825fb2a71d95d76cca99c9ada0c27d7b1ac6ea60d1e1b5e9647469751bb4ebcc7ba7d300e848896f785215f414367be9a6ab5b06b0e72776b5ddd4 SHA512 7e2730c50c7d5ba7614ae2a6a014d60c5f9f63cae6ecf3c03d6ad01341d6e4a954c3c99c5d29dd46a56a1552d3b16ed9822935533df8c760a275dde06e361336
+DIST opera-stable_64.0.3417.83_amd64.deb 66537522 BLAKE2B 1061ddce5aa122753192be7296eb99e4897f1109da3ae2f76484f84bb5c78689635f6f4d95edd7ff7a4210269148b430a8c29a1733b7629103d8916e06aecd79 SHA512 0af7f1413c670a685797304766cf1c0f8b7fa7e56a6f9fa148662ac52be70665b8b8f6704d598683c6dc8f7dd388efc1bcbd3e4cf6182e3e8f4c67b25c7044e8
diff --git a/www-client/opera/opera-64.0.3417.83.ebuild b/www-client/opera/opera-64.0.3417.83.ebuild
new file mode 100644
index 000000000000..eec568e74cf4
--- /dev/null
+++ b/www-client/opera/opera-64.0.3417.83.ebuild
@@ -0,0 +1,111 @@
+# 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 en-US es-419 es fil fi fr-CA fr 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/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+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}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || 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() {
+	rm "${OPERA_HOME}"/${PN}_autoupdate || die
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /"${OPERA_HOME}"/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
+}