Merge updates from master

This commit is contained in:
Repository mirror & CI
2021-04-16 19:05:10 +00:00
3 changed files with 61 additions and 68 deletions

View File

@@ -12,9 +12,7 @@ SRC_URI="https://github.com/atom/atom/releases/download/v${PV}/atom-amd64.tar.gz
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="alsa cups ssl test X"
RESTRICT="!test? ( test )"
RESTRICT="test"
S="${WORKDIR}/atom-${PV}-amd64"
@@ -24,33 +22,29 @@ RDEPEND="
app-crypt/libsecret
dev-libs/atk
dev-libs/nss
dev-libs/openssl
dev-libs/openssl-compat
dev-vcs/git
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
ssl? (
dev-libs/openssl
dev-libs/openssl-compat
)
X? (
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+
x11-libs/libnotify
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
)
media-libs/alsa-lib
net-print/cups
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+
x11-libs/libnotify
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/${PN}/*"
@@ -70,9 +64,7 @@ src_install(){
# I will use only npm provided with package itself
# as nodejs is not required to make it working (and it is really big).
fperms +x /opt/"${PN}"/resources/app/apm/bin/apm
fperms +x /opt/"${PN}"/resources/app/apm/bin/node
fperms +x /opt/"${PN}"/resources/app/apm/bin/npm
fperms +x /opt/"${PN}"/resources/app/apm/bin/*
doicon atom.png
make_desktop_entry "/opt/atom-bin/atom %U" "Atom" "atom" \
@@ -85,6 +77,7 @@ src_install(){
}
pkg_postinst(){
xdg_desktop_database_update
optfeature_header "If you want to use atom-beautify please install following packages:"
optfeature "python code beautifier" dev-python/autopep8
optfeature "python code beautifier" dev-python/black

View File

@@ -15,8 +15,6 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="alsa cups X"
S="${WORKDIR}/${MY_P}"
DEPEND="
@@ -25,23 +23,21 @@ DEPEND="
dev-libs/atk
dev-libs/libappindicator
dev-libs/nss
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
X? (
media-libs/mesa
x11-libs/gdk-pixbuf
x11-libs/gtk+
x11-libs/libdrm
x11-libs/libnotify
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/libxshmfence
x11-libs/libXtst
x11-libs/pango
)
media-libs/alsa-lib
net-print/cups
media-libs/mesa
x11-libs/gdk-pixbuf
x11-libs/gtk+
x11-libs/libdrm
x11-libs/libnotify
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/libxshmfence
x11-libs/libXtst
x11-libs/pango
"
QA_PREBUILT="/opt/nuclear-bin/*"
@@ -74,3 +70,7 @@ src_install(){
mv nuclear-icon.svg nuclear.svg || die
doicon nuclear.svg
}
pkg_postinst(){
xdg_desktop_database_update
}

View File

@@ -18,8 +18,6 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="alsa cups X"
S="${WORKDIR}/${MY_P}-linux"
DEPEND="
@@ -27,21 +25,19 @@ DEPEND="
app-accessibility/at-spi2-core
dev-libs/atk
dev-libs/nss
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
X? (
media-libs/mesa
x11-libs/gdk-pixbuf
x11-libs/gtk+
x11-libs/libdrm
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/libxshmfence
x11-libs/pango
)
media-libs/alsa-lib
net-print/cups
media-libs/mesa
x11-libs/gdk-pixbuf
x11-libs/gtk+
x11-libs/libdrm
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/libxshmfence
x11-libs/pango
"
QA_PREBUILT="/opt/terminus-bin/*"
@@ -64,3 +60,7 @@ src_install(){
doicon -s "${i}" ../terminus-"${i}".png
done
}
pkg_postinst(){
xdg_desktop_database_update
}