[gentoo-commits] repo/gentoo:master commit in: www-client/opera/

[Jeroen Roovers]

commit:     e6636efde898aeeee9137cead2f1f1bf361f091a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 06:49:11 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 06:49:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6636efd

www-client/opera: Depend on x11-libs/libnotify (bug #557528 by Jérôme Borme).

Package-Manager: portage-2.2.20.1

 www-client/opera/Manifest                   |  1 -
 www-client/opera/opera-31.0.1889.174.ebuild |  1 +
 www-client/opera/opera-31.0.1889.99.ebuild  | 84 -----------------------------
 3 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c71f370..f8598ed 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -3,4 +3,3 @@ DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 
dcd80ea7a8f090a47007fc
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 
df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 
a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 WHIRLPOOL 
ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 
b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 
c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
 WHIRLPOOL 
539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
 DIST opera-stable_31.0.1889.174_amd64.deb 41977716 SHA256 
4459bfa8b4469fe2ef68373dfd61616919266c87a18125973afee60c06beaf29 SHA512 
ac6c12a992637d79d67c0b48a276f0424c67de73bb8ea210eaca807e21fc7d2d20944737d6250094f690e014fff3fa58d9f79e128fbb5c5ccc18b793c8c43ab5
 WHIRLPOOL 
cf65cb6f7e09e3a31121b64a096ef9b2bd5010ecc9fd075fa6709989bf0dab28977f36357edcbc1062f782b72d0e1c4d2e0b51e0e69e14d7b76c81b6b2e5b9f1
-DIST opera-stable_31.0.1889.99_amd64.deb 42518088 SHA256 
51dc961957cd1b7169c6922f5433feee2320300f7c52f96bf349fa478b2b9745 SHA512 
7acb4b03850925b1b3d9083cdb436f7d3de13d73e95baf68294343cc0af9da2e6217d6cd685cdc0acdea1bb1173fe06065d9c7f1eedde98b4c0e8e14cc196656
 WHIRLPOOL 
83e2af8acafd9ad0c69b8b667fadcb34c9b6a0cabcacfa8adcc1a1f96d9680395d9190c3319e27d4b205eea5e27f018bb862110e6a96f0d7da68cf92b7ac52f3

diff --git a/www-client/opera/opera-31.0.1889.174.ebuild 
b/www-client/opera/opera-31.0.1889.174.ebuild
index cc6ee26..eb73eb4 100644
--- a/www-client/opera/opera-31.0.1889.174.ebuild
+++ b/www-client/opera/opera-31.0.1889.174.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
        x11-libs/libXrandr
        x11-libs/libXrender
        x11-libs/libXtst
+       x11-libs/libnotify
        x11-libs/pango[X]
 "
 

diff --git a/www-client/opera/opera-31.0.1889.99.ebuild 
b/www-client/opera/opera-31.0.1889.99.ebuild
deleted file mode 100644
index cc6ee26..0000000
--- a/www-client/opera/opera-31.0.1889.99.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
-       af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy 
gd
-       hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru 
sk
-       sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
-"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/";
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/";
-SRC_URI="
-       amd64? ( 
"${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" )
-"
-KEYWORDS="~amd64"
-
-RDEPEND="
-       dev-libs/expat
-       dev-libs/glib:2
-       dev-libs/nspr
-       dev-libs/nss
-       >=dev-libs/openssl-1.0.1:0
-       gnome-base/gconf:2
-       media-libs/alsa-lib
-       media-libs/fontconfig
-       media-libs/freetype
-       net-misc/curl
-       net-print/cups
-       sys-apps/dbus
-       sys-libs/libcap
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf
-       x11-libs/gtk+:2
-       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/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-       unpack_deb ${A}
-}
-
-src_prepare() {
-       mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-       rm -r usr/lib || die
-
-       rm usr/bin/${PN} || die
-
-       rm usr/share/doc/${PN}-stable/copyright || die
-       mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || 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
-}