Merge updates from master

This commit is contained in:
Repository mirror & CI
2021-05-22 12:35:00 +00:00
8 changed files with 143 additions and 102 deletions

View File

@@ -1,3 +0,0 @@
DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
DIST minecraft-launcher-921.tar.gz 1323509 BLAKE2B b90035767aaacc9f3a4a57216413c70e5eaef7b4aab2883befe966cbac56926cbe00c7683b2adba377b695c1da472751a131ab723a0b8e8dc8555370cab58f5d SHA512 be9c766fdae9f3fc37347cbdd430487ea01f480b41a48f99f586727ddd81e571118a078f6737cc4b694b7b92d16dfcfc4bc3732a3d38819d20d50a3654956eb1
DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a

View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>andrewammerlaan@gentoo.org</email>
<name>Andrew Ammerlaan</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,34 +0,0 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit desktop java-pkg-2 xdg
DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
HOMEPAGE="https://www.minecraft.net/"
SRC_URI="https://launcher.mojang.com/v1/objects/eabbff5ff8e21250e33670924a0c5e38f47c840b/launcher.jar -> ${P}.jar
https://launcher.mojang.com/download/minecraft-launcher.svg"
KEYWORDS="~amd64 ~x86"
LICENSE="Mojang"
SLOT="1"
RESTRICT="bindist mirror"
RDEPEND="virtual/jre:1.8"
S="${WORKDIR}"
src_unpack() {
# do not unpack jar file
true
}
src_install() {
java-pkg_newjar "${DISTDIR}/${P}.jar" ${PN}-legacy.jar
java-pkg_dolauncher ${PN}-legacy --jar ${PN}-legacy.jar --java_args "\${JAVA_OPTS}"
newicon -s scalable "${DISTDIR}/${PN}.svg" "${PN}-legacy.svg"
make_desktop_entry ${PN}-legacy "Minecraft (legacy)" ${PN}-legacy Game
}

View File

@@ -1,56 +0,0 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit desktop xdg
DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
HOMEPAGE="https://www.minecraft.net/"
SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV}.tar.gz -> ${P}.tar.gz
https://launcher.mojang.com/download/minecraft-launcher.svg"
KEYWORDS="~amd64 ~x86"
LICENSE="Mojang"
SLOT="2"
RESTRICT="bindist mirror"
RDEPEND="
>=x11-libs/gtk+-2.24.32-r1[X(+)]
dev-libs/nss
dev-libs/libbsd
dev-libs/libffi
dev-libs/libpcre
media-libs/alsa-lib
media-libs/openal
net-libs/gnutls[idn]
net-print/cups
sys-apps/dbus
virtual/jre:1.8
virtual/opengl
x11-apps/xrandr
x11-libs/libXScrnSaver
x11-libs/libXcomposite
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libXrender
x11-libs/libXtst
x11-libs/xcb-util
"
S="${WORKDIR}/${PN}"
QA_PREBUILT="
/usr/bin/minecraft-launcher
"
src_install() {
dobin minecraft-launcher
doicon -s scalable "${DISTDIR}/${PN}.svg"
make_desktop_entry ${PN} "Minecraft" ${PN} Game
}

View File

@@ -1 +1 @@
DIST discord-canary-0.0.121.deb 71531068 BLAKE2B e76b1264815baea297fb6bab645580bc7b7e2612df0d46fd28b8545034c98845d2f89b8fb190f205e37dfee380fbc35c812c35bffc4289df918910bf71d78e2f SHA512 884aa0305c532f0bd0bfee08c76abaf203ff3f09fb83d4e47c18ac4d395591b5d865384da68640d5350815d382b7a0e635f72cbc5ed58979df25dff15f66929b
DIST discord-canary-0.0.122.deb 71647956 BLAKE2B ec92479f6f9ff27c2e644bcad55ef007b39b91bc24c4ce3c76515cdc93480053349418be70ccbe39afa68e8b7bbf81b422cf633497d47ac73177aacab1934162 SHA512 900ee7eb42469864aaa6dfcb2b66b133149828161b45c89575013c2062de23cc0a6de7430711e0f9b12988d4923050147f7f691061b4d4441fe807ca01a75eb0

View File

@@ -1,2 +1,4 @@
DIST megasync-4.3.8.0.tar.gz 16019709 BLAKE2B 493ac0df0e8ca5c6617e493b5b3d81e45cedf2212a83ec9f5f6c07eee6fdf1d749b3735e10082b89f376f261ebfb825a3a7c457b8aa3be64702cddca34558558 SHA512 597b1d4a5a806514449b55e8bf81688b3c6d275372ebb56a45841b2f4c7caf8d9db363cf627fa0b6b84f4c662dc8cf87179b4478cd50b7b7efa1e23a9dca3389
DIST megasync-4.5.0.0.tar.gz 16162074 BLAKE2B 9ad09b61614992fc48572c168bb3b9692145289b945c01e371babe78a3b75bcc20a842f524279f6db35f8d93c914e9ba68ee5d187614b5041638813cb304531e SHA512 f0c78d741be4a9ee9411be63667ea76cca3ff50ab70a81c904011e1ce1c6f0287ab5c90fc2b1a7a7c040b2d568819f91ecd10f8d570b22231df7b99166eacb11
DIST megasync-sdk-4.3.8.0.tar.gz 3363057 BLAKE2B fbc7006a5559a5e2220cd9f9f398c835a1de919624e4d00d052580cf7e3ac4bae2ec1acbd6650b1eaef1218363203837cad562875067e524e067a53d5553567b SHA512 e6ec612fb11be4566d091d4159429ee50574081753caae3b1dd4e22221f2b213cfc0787b52051cbcdf9b0069869df6c95aa80951bdc3fa5098dd26fa0a2e7f7e
DIST megasync-sdk-4.5.0.0.tar.gz 3363057 BLAKE2B fbc7006a5559a5e2220cd9f9f398c835a1de919624e4d00d052580cf7e3ac4bae2ec1acbd6650b1eaef1218363203837cad562875067e524e067a53d5553567b SHA512 e6ec612fb11be4566d091d4159429ee50574081753caae3b1dd4e22221f2b213cfc0787b52051cbcdf9b0069869df6c95aa80951bdc3fa5098dd26fa0a2e7f7e

View File

@@ -0,0 +1,140 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools desktop qmake-utils xdg cmake
DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
HOMEPAGE="
https://mega.io
https://github.com/meganz/MEGAsync
"
if [[ ${PV} == 9999 ]];then
inherit git-r3
EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
else
MEGA_SDK_REV="37b346c2e119559e40c08f43e1a8f54353e7ad59" # commit of src/MEGASync/mega submodule
SRC_URI="
https://github.com/meganz/MEGAsync/archive/v${PV}_Win.tar.gz -> ${P}.tar.gz
https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
"
KEYWORDS="~amd64 ~x86"
# 4.3.8.0 has no dedicated linux tag
S="${WORKDIR}"/MEGAsync-${PV}_Win
fi
LICENSE="MEGA"
SLOT="0"
IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java nautilus php python readline threads thunar"
RDEPEND="
app-arch/xz-utils
dev-libs/libgcrypt
dev-libs/libsodium
dev-libs/libuv
dev-libs/openssl:0=
media-libs/libpng
net-dns/c-ares
x11-themes/hicolor-icon-theme
cryptopp? ( dev-libs/crypto++ )
curl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
dolphin? ( kde-apps/dolphin )
freeimage? ( media-libs/freeimage )
nautilus? ( >=gnome-base/nautilus-3 )
readline? ( sys-libs/readline:0 )
sqlite? ( dev-db/sqlite:3 )
thunar? ( xfce-base/thunar )
zlib? ( sys-libs/zlib )
"
DEPEND="
${RDEPEND}
media-libs/libmediainfo
media-libs/libraw
dev-qt/qtcore:5
dev-qt/qtwidgets:5
dev-qt/qtgui:5
dev-qt/qtconcurrent:5
dev-qt/qtnetwork:5
dev-qt/qtdbus:5
dev-qt/qtimageformats:5
dev-qt/qtsvg:5
dev-qt/qtx11extras:5
"
BDEPEND="
dev-lang/swig
dev-qt/linguist-tools
"
DOCS=( CREDITS.md README.md )
CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
src_prepare() {
if [[ ${PV} != 9999 ]]; then
rmdir src/MEGASync/mega
mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega
fi
if use dolphin; then
# use the kde5 CMakeLists instead of the kde 4 version
mv src/MEGAShellExtDolphin/CMakeLists_kde5.txt src/MEGAShellExtDolphin/CMakeLists.txt || die
cmake_src_prepare
else
default
fi
cd src/MEGASync/mega
eautoreconf
}
src_configure() {
cd src/MEGASync/mega
econf \
"--disable-silent-rules" \
"--disable-curl-checks" \
"--disable-megaapi" \
$(use_with zlib) \
$(use_with sqlite) \
$(use_with cryptopp) \
"--with-cares" \
$(use_with curl) \
"--without-termcap" \
$(use_enable threads posix-threads) \
"--with-sodium" \
$(use_with freeimage) \
$(use_with readline) \
$(use_enable examples) \
$(use_enable java) \
$(use_enable php) \
$(use_enable python) \
"--enable-chat" \
"--enable-gcc-hardening"
cd ../..
local myeqmakeargs=(
MEGA.pro
CONFIG+="release"
)
eqmake5 ${myeqmakeargs[@]}
use dolphin && cmake_src_configure
$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
}
src_compile() {
emake -C src INSTALL_ROOT="${D}" || die
use dolphin && cmake_src_compile
}
src_install() {
use dolphin && cmake_src_install
einstalldocs
dobin src/MEGASync/${PN}
insinto usr/share/licenses/${PN}
doins LICENCE.md installer/terms.txt
domenu src/MEGASync/platform/linux/data/${PN}.desktop
cd src/MEGASync/platform/linux/data/icons/hicolor
for size in 16x16 32x32 48x48 128x128 256x256;do
doicon -s $size $size/apps/mega.png
done
}