From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AD75F138335 for ; Sun, 16 Sep 2018 15:25:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 868FAE0B19; Sun, 16 Sep 2018 15:25:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45E77E0B19 for ; Sun, 16 Sep 2018 15:25:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18D0D335CE7 for ; Sun, 16 Sep 2018 15:25:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E17B3D9 for ; Sun, 16 Sep 2018 15:25:48 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1537111545.fb7f782d3306def13c2bd407c13c22b6a2bb54e4.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/opera-developer/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/opera-developer/Manifest www-client/opera-developer/opera-developer-57.0.3072.0-r1.ebuild www-client/opera-developer/opera-developer-57.0.3072.0.ebuild X-VCS-Directories: www-client/opera-developer/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: fb7f782d3306def13c2bd407c13c22b6a2bb54e4 X-VCS-Branch: master Date: Sun, 16 Sep 2018 15:25:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 17fe699d-a195-48f5-89f9-a1bf12f208bb X-Archives-Hash: 02ba8d557d5444b37ccb814d8064510b commit: fb7f782d3306def13c2bd407c13c22b6a2bb54e4 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Sep 16 15:24:39 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Sep 16 15:25:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7f782d www-client/opera-developer: Switch back to debs Package-Manager: Portage-2.3.49, Repoman-2.3.10 www-client/opera-developer/Manifest | 2 +- ....ebuild => opera-developer-57.0.3072.0-r1.ebuild} | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest index e591da71699..0964593c050 100644 --- a/www-client/opera-developer/Manifest +++ b/www-client/opera-developer/Manifest @@ -1,2 +1,2 @@ DIST opera-developer_57.0.3065.0_amd64.rpm 55367540 BLAKE2B 62809c5b986c11517bbac2f941964df07dba2feae16cb974b189fad6fdd29d92c3f198c09ae58aba751c8abb3e3301b87a6c8aca8c1eca0fc6d3f04ca402b489 SHA512 c328381fe9f303e35fae3e3d995c5a186fe885edeb7e86c6de4542133793e7885dbd579e2451a21d95cbdf0941f7a891523486d0b410b9d2b740c3589083ef28 -DIST opera-developer_57.0.3072.0_amd64.rpm 55503092 BLAKE2B 9e326fa416e707057895257aeb3e248aca57e3b3d748d707684e2392f331b3a166bdceac7e8b66e74312442438a71161ff9dab38eeb89a5316c47d60e6a38869 SHA512 4645a6edcf6cb52203637e316930f670f3c08cc4c2ca4c90234daa12e63b91051a5e4bf80e824c1d516f1e771476e4fa2d96b1b1eedf23740c8254fd7fc80a20 +DIST opera-developer_57.0.3072.0_amd64.deb 57858176 BLAKE2B 338f5eea5585c774cd32f2216fd3877ca940c2fbc71a1ae30cf50afaa63e31ae5e00a6a5de298ade5df51de47fa09eb3752b1b0a00326bbf3ebe540d5dd12e52 SHA512 d01f5e898b54aedb73d05fec77926d4c7a3033c3b7bac9931cbd923989ab81aa7a7f152ba80940694e9dc12a3bda1b3b0c3d3c97cf1e93c7cc5cf55fb8c619e7 diff --git a/www-client/opera-developer/opera-developer-57.0.3072.0.ebuild b/www-client/opera-developer/opera-developer-57.0.3072.0-r1.ebuild similarity index 84% rename from www-client/opera-developer/opera-developer-57.0.3072.0.ebuild rename to www-client/opera-developer/opera-developer-57.0.3072.0-r1.ebuild index 6fcc60aa4c6..bb41cc9d6e5 100644 --- a/www-client/opera-developer/opera-developer-57.0.3072.0.ebuild +++ b/www-client/opera-developer/opera-developer-57.0.3072.0-r1.ebuild @@ -7,7 +7,7 @@ CHROMIUM_LANGS=" 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 gnome2-utils multilib rpm xdg-utils +inherit chromium-2 gnome2-utils multilib unpacker xdg-utils DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/" @@ -22,7 +22,7 @@ SRC_URI_BASE=" SRC_URI="amd64? (" for uri in ${SRC_URI_BASE}; do SRC_URI+=" - "${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.rpm" + "${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" " done SRC_URI+=")" @@ -62,7 +62,23 @@ QA_PREBUILT="*" S=${WORKDIR} OPERA_HOME="usr/$(get_libdir)/${PN}" +src_unpack() { + unpack_deb ${A} +} + src_prepare() { + epatch_user + + 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 + rm usr/bin/${PN} || die pushd "${OPERA_HOME}/localization" > /dev/null || die