From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1268438-garchives=archives.gentoo.org@lists.gentoo.org>
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 300F41382C5
	for <garchives@archives.gentoo.org>; Wed,  7 Apr 2021 08:51:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C99DFE09F7;
	Wed,  7 Apr 2021 08:51:41 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 A5943E09F7
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Apr 2021 08:51:41 +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 96B6B340D30
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Apr 2021 08:51:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E7973644
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Apr 2021 08:51:36 +0000 (UTC)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
Message-ID: <1617739795.e6ebfd7ce6514b54c0b48b31261a34b1b9a3f6ab.andrewammerlaan@gentoo>
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-editors/atom/
X-VCS-Repository: repo/proj/guru
X-VCS-Files: app-editors/atom/atom-1.55.0-r1.ebuild app-editors/atom/atom-1.55.0.ebuild
X-VCS-Directories: app-editors/atom/
X-VCS-Committer: andrewammerlaan
X-VCS-Committer-Name: Andrew Ammerlaan
X-VCS-Revision: e6ebfd7ce6514b54c0b48b31261a34b1b9a3f6ab
X-VCS-Branch: master
Date: Wed,  7 Apr 2021 08:51:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f06b1953-837a-46c4-be57-3b972fc75ca3
X-Archives-Hash: 97536bff477835f4a98285a87169e937

commit:     e6ebfd7ce6514b54c0b48b31261a34b1b9a3f6ab
Author:     Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Tue Apr  6 16:55:09 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Apr  6 20:09:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e6ebfd7c

app-editors/atom: various fixes

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>

 app-editors/atom/atom-1.55.0-r1.ebuild | 72 ++++++++++++++++++++++++++++++++++
 app-editors/atom/atom-1.55.0.ebuild    | 37 -----------------
 2 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/app-editors/atom/atom-1.55.0-r1.ebuild b/app-editors/atom/atom-1.55.0-r1.ebuild
new file mode 100644
index 000000000..9a12627b1
--- /dev/null
+++ b/app-editors/atom/atom-1.55.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io/"
+SRC_URI="https://github.com/atom/atom/releases/download/v1.55.0/${PN}-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa cups ssl test X"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P}-amd64"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/nss
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	ssl? ( dev-libs/openssl )
+	X? (
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libxkbfile
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libXtst
+		x11-libs/pango
+	)
+"
+
+QA_PREBUILT="/opt/atom/*"
+
+src_prepare(){
+	default
+
+	# Remove useless license files.
+	rm LICENSE LICENSES.chromium.html version
+}
+
+src_install(){
+	insinto /opt/"${PN}"
+	doins -r "${S}"/*
+	dosym ../../opt/"${PN}"/atom "${EPREFIX}"/usr/bin/atom
+	fperms +x /opt/"${PN}"/atom
+	dosym ../../opt/"${PN}"/resources/app/apm/bin/apm "${EPREFIX}"/usr/bin/apm
+	fperms +x /opt/"${PN}"/resources/app/apm/bin/apm
+	dosym ../../opt/"${PN}"/resources/app/apm/bin/node "${EPREFIX}"/usr/bin/node
+	fperms +x /opt/"${PN}"/resources/app/apm/bin/node
+	dosym ../../opt/"${PN}"/resources/app/apm/bin/npm "${EPREFIX}"/usr/bin/npm
+	fperms +x /opt/"${PN}"/resources/app/apm/bin/npm
+	make_desktop_entry /opt/atom/atom Atom atom Utility
+	doicon atom.png
+}

diff --git a/app-editors/atom/atom-1.55.0.ebuild b/app-editors/atom/atom-1.55.0.ebuild
deleted file mode 100644
index 50e2c9233..000000000
--- a/app-editors/atom/atom-1.55.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A hackable text editor for the 21st Century"
-
-HOMEPAGE="https://atom.io/"
-SRC_URI="https://github.com/atom/atom/releases/download/v1.55.0/${PN}-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-inherit desktop xdg
-
-S="${WORKDIR}/${P}-amd64"
-
-DEPEND="net-print/cups" # Requested by electron
-
-QA_PREBUILT="/opt/atom/*"
-
-src_prepare(){
-	default
-
-	# Remove useless license files.
-	rm LICENSE LICENSES.chromium.html version
-}
-
-src_install(){
-	insinto /opt/"${PN}"
-	doins -r "${S}"/*
-	dosym ../../opt/"${PN}"/atom "${EPREFIX}"/usr/bin/atom
-	fperms +x /opt/"${PN}"/atom
-	make_desktop_entry /opt/atom/atom Atom atom Utility
-	doicon atom.png
-}