Merge updates from master

2026-07-16 18:43:18 -04:00 · 2020-12-11 09:05:07 +00:00
parent 2f7e51f792 828be86ca5
commit fa016f18c6
16 changed files with 344 additions and 69 deletions
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1,2 @@
-DIST open62541-1.0.2.tar.gz 2689341 BLAKE2B 68d7eda848e980156c18706706b99a30b70bafacc27b57aba99f8e1b6ae202cf719b94ec09417c10ad86df00c7adf1f5f03f74fa84071fa83c141236e65c00bd SHA512 39da1556a9155a461c2d0f351ada78ef878a3688e4ab570d41decdf8a3213c8fd160618f81ca80fb467ec41d5de0d61743d2289473f60ae1547785acf738945f
-DIST open62541-1.1.2.tar.gz 2916517 BLAKE2B 60ee78630ee74fbe9d2dee894f3b5f6b5209b823f8e24236e2f6ceb13ddc68df9c0065d57fe14096cdf822755979053201b6901540082aac3d69135c3dc54b67 SHA512 090f24b77211ef8e0a45c7b74de948db6ea64290fc591ae0131871119d826c8b385769ab4c1dad0f8ba663acafd7df3b4b288759623eb6f4a3fbd00ab65abedc
+DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf
+DIST open62541-1.1.3.tar.gz 2925631 BLAKE2B 1314d51c1153a2e2785e8eccf363ef8285142b0e2af1890047eae079bd6d36583c0fa91661da4bf68c1dfa980c6b708fa7c6f7192bea06b234b98428074fd1c8 SHA512 e0574b9273002b22c042534dc8e177800bee87f8b48d3de4a627dc255211e67489531905cac41a8a15d337e2a958815b59be23c96163d3305cd43a8da18c390f
--- a/dev-libs/open62541/files/open62541-1.0.3-tests.patch
+++ b/dev-libs/open62541/files/open62541-1.0.3-tests.patch
--- a/dev-libs/open62541/files/open62541-1.1.3-etf.patch
+++ b/dev-libs/open62541/files/open62541-1.1.3-etf.patch
--- a/dev-libs/open62541/files/open62541-1.1.3-headers.patch
+++ b/dev-libs/open62541/files/open62541-1.1.3-headers.patch
--- a/dev-libs/open62541/files/open62541-1.1.3-tests.patch
+++ b/dev-libs/open62541/files/open62541-1.1.3-tests.patch
--- a/dev-libs/open62541/open62541-1.0.3.ebuild
+++ b/dev-libs/open62541/open62541-1.0.3.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )

 inherit cmake python-single-r1

--- a/dev-libs/open62541/open62541-1.1.3.ebuild
+++ b/dev-libs/open62541/open62541-1.1.3.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )

 inherit cmake python-single-r1

--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -0,0 +1,2 @@
+DIST megasync-4.3.7.tar.gz 16020207 BLAKE2B f38b40594c0cb1ed3e93715842f3c161e09ef66deb017d2e5fa03d9d0ac2863ba02b88d1fe779960c07664b19250fa29115a87d62d0934157370c1faa85345a5 SHA512 6852390e05da13effd059a5e0dc7fe400f3456668925fbed5e34bc5018b3664d72aebd78847dfdb4f6dda39fe615a79e5c0eb99e72a401fb833d4eba8216010c
+DIST megasync-sdk-4.3.7.tar.gz 3362032 BLAKE2B 36ab643252d27475f34c7a5ee0e71a6470f2c830ea5c8331a094b79da5cd751699390c36e107cb0da06e6f46932e10e5fefbfc8eec3e8645ba84c365835088f3 SHA512 45dcc285c194cc347d9d562638658d2f0dd8099371e7408995cad68811e720905ad6f9810b24079c1112d16bfb87f7986cf3180520dc7edd611e703c251b182a
--- a/net-misc/megasync/megasync-4.3.7.ebuild
+++ b/net-misc/megasync/megasync-4.3.7.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 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="http://mega.co.nz"
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
+else
+	MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule
+	SRC_URI="
+		https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz
+		https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/MEGAsync-${PV}.0_Linux
+fi
+
+LICENSE="MEGA"
+SLOT="0"
+IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java libressl nautilus php python readline threads thunar"
+
+RDEPEND="
+	app-arch/xz-utils
+	dev-libs/libgcrypt
+	dev-libs/libsodium
+	dev-libs/libuv
+	media-libs/libpng
+	net-dns/c-ares
+	x11-themes/hicolor-icon-theme
+	cryptopp? ( dev-libs/crypto++ )
+	curl? (
+		!libressl? ( net-misc/curl[ssl,curl_ssl_openssl] )
+		libressl? ( net-misc/curl[ssl,curl_ssl_libressl] )
+	)
+	dolphin? ( kde-apps/dolphin )
+	freeimage? ( media-libs/freeimage )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	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
+"
+BDEPEND="
+	app-doc/doxygen
+	dev-lang/swig
+	dev-qt/linguist-tools
+"
+
+DOCS=( CREDITS.md README.md )
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir src/MEGASync/mega
+		mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega
+	fi
+	default
+	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
+}
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -3,27 +3,53 @@

 EAPI=7

-inherit eutils multilib qmake-utils autotools git-r3 desktop cmake-multilib
+inherit autotools desktop qmake-utils xdg cmake

 DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
 HOMEPAGE="http://mega.co.nz"
-RTAG="_Linux"
-if [[ ${PV} == *9999* ]];then
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
-	KEYWORDS=""
-	EGIT_SUBMODULES=( '*' )
 else
-	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
-	EGIT_COMMIT="v${PV}.0${RTAG}"
-	EGIT_SUBMODULES=( '*' )
+	MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule
+	SRC_URI="
+		https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz
+		https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz
+	"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/MEGAsync-${PV}.0_Linux
 fi

 LICENSE="MEGA"
 SLOT="0"
-IUSE="dolphin nautilus thunar +cryptopp +sqlite +zlib +curl freeimage readline examples threads java php python gnome"
+IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java libressl nautilus php python readline threads thunar"

-CDEPEND="
+RDEPEND="
+	app-arch/xz-utils
+	dev-libs/libgcrypt
+	dev-libs/libsodium
+	dev-libs/libuv
+	media-libs/libpng
+	net-dns/c-ares
+	x11-themes/hicolor-icon-theme
+	cryptopp? ( dev-libs/crypto++ )
+	curl? (
+		!libressl? ( net-misc/curl[ssl,curl_ssl_openssl] )
+		libressl? ( net-misc/curl[ssl,curl_ssl_libressl] )
+	)
+	dolphin? ( kde-apps/dolphin )
+	freeimage? ( media-libs/freeimage )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	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
@@ -35,57 +61,26 @@ CDEPEND="
 	dev-qt/qtimageformats:5
 	dev-qt/qtsvg:5
 "
-
-BDEPEND="${CDEPEND}
-	dev-lang/swig
+BDEPEND="
 	app-doc/doxygen
+	dev-lang/swig
 	dev-qt/linguist-tools
 "

-RDEPEND="${CDEPEND}
-	x11-themes/hicolor-icon-theme
-	dev-libs/openssl
-	dev-libs/libgcrypt
-	media-libs/libpng
-	net-dns/c-ares
-	cryptopp? ( dev-libs/crypto++ )
-	app-arch/xz-utils
-	dev-libs/libuv
-	sqlite? ( dev-db/sqlite:3 )
-	dev-libs/libsodium
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl[ssl,curl_ssl_openssl] )
-	freeimage? ( media-libs/freeimage )
-	readline? ( sys-libs/readline:0 )
-	dolphin? ( kde-apps/dolphin )
-	nautilus? ( >=gnome-base/nautilus-3 )
-	thunar? ( xfce-base/thunar )
-"
-
 DOCS=( CREDITS.md README.md )
-PATCHES=( )

-if [[ ${PV} != *9999* ]];then
-	src_prepare(){
-		if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then
-			EPATCH_OPTS="-p0" epatch "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch"
-		fi
-		if [ ! -z ${PATCHES} ]; then
-			epatch ${PATCHES}
-		fi
-		if use gnome; then
-			if [ -e "${FILESDIR}${P}-gnome.patch" ]; then
-				epatch "${FILESDIR}/${P}-gnome.patch"
-			fi
-		fi
-		eapply_user
-		cd src/MEGASync/mega
-		eautoreconf
-	}
-fi
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir src/MEGASync/mega
+		mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega
+	fi
+	default
+	cd src/MEGASync/mega
+	eautoreconf
+}

-src_configure(){
-	cd "${S}"/src/MEGASync/mega
+src_configure() {
+	cd src/MEGASync/mega
 	econf \
 		"--disable-silent-rules" \
 		"--disable-curl-checks" \
@@ -107,30 +102,30 @@ src_configure(){
 		"--enable-chat" \
 		"--enable-gcc-hardening"
 	cd ../..
+
 	local myeqmakeargs=(
 		MEGA.pro
 		CONFIG+="release"
 	)
+
 	eqmake5 ${myeqmakeargs[@]}
-	use dolphin && cmake-utils_src_configure
+	use dolphin && cmake_src_configure
 	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
 }

-src_compile(){
+src_compile() {
 	emake -C src INSTALL_ROOT="${D}" || die
-	use dolphin && cmake-utils_src_compile
+	use dolphin && cmake_src_compile
 }

-src_install(){
-	use dolphin && cmake-utils_src_install
+src_install() {
+	use dolphin && cmake_src_install
 	einstalldocs
+	dobin src/MEGASync/${PN}
 	insinto usr/share/licenses/${PN}
 	doins LICENCE.md installer/terms.txt
-	cd src/MEGASync
-	dobin ${PN}
-	cd platform/linux/data
-	domenu ${PN}.desktop
-	cd icons/hicolor
+	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
--- a/sys-fs/dwarfs/dwarfs-0.2.3-r4.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.2.3-r4.ebuild
@@ -73,7 +73,7 @@ src_prepare(){
 }

 src_install(){
-	default
+	cmake_src_install
 	dolib.so libmetadata_thrift.so libthrift_light.so
 	dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so
 }
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1 +1,2 @@
 DIST erofs-utils-1.1.tar.gz 46133 BLAKE2B 24a2f16059e39bd65203f4a28721b8aad70599d6201ead02c291234de631bd3def1c403fa8b50b6dce4af3eea2768b912c4f56ad20c3c26db3853ba3174775ac SHA512 f300b536f0ba91a05a7eb3dc9a9ec402c98966ad7c0e1f2f664a650caaffce6c4433722374418c6d03e69ce2e74785e55f9bcc45e6717a8bc67e5352e450806b
+DIST erofs-utils-1.2.tar.gz 60991 BLAKE2B 08b9bea397f52d158a40f095811853315a3b553618f380d1ece012c813d708c2331b2a445bb59c4b86d81edab33c834e37aeb0aeeb9acb157b7aebed309cb591 SHA512 167311beb2d4722436051956076d670f6a54da72e1690d19d43e0c46dd972f9f61427b4792b469813a6a4ff2e3c445646cf063d37b4ee2b52f88eb14e7bf2713
--- a/sys-fs/erofs-utils/erofs-utils-1.2.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Userspace tools for EROFS images"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
+SRC_URI="${HOMEPAGE}/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="fuse lz4 selinux +uuid"
+
+RDEPEND="
+	fuse? ( sys-fs/fuse:0 )
+	lz4? ( >=app-arch/lz4-1.9 )
+	selinux? ( sys-libs/libselinux )
+	uuid? ( sys-apps/util-linux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-common.patch"
+)
+
+src_prepare() {
+	default
+	use fuse && use selinux && sed -i \
+		-e 's/.*CFLAGS}.*/& ${libselinux_CFLAGS}/' \
+		-e 's/.*LIBS}.*/& ${libselinux_LIBS}/' \
+		fuse/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable fuse) \
+		$(use_enable lz4) \
+		$(use_with selinux) \
+		$(use_with uuid)
+}
--- a/sys-fs/erofs-utils/erofs-utils-9999.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools git-r3
+
+DESCRIPTION="Userspace tools for EROFS images"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
+EGIT_BRANCH="experimental"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="fuse lz4 selinux +uuid"
+
+RDEPEND="
+	fuse? ( sys-fs/fuse:0 )
+	lz4? ( >=app-arch/lz4-1.9 )
+	selinux? ( sys-libs/libselinux )
+	uuid? ( sys-apps/util-linux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable fuse) \
+		$(use_enable lz4) \
+		$(use_with selinux) \
+		$(use_with uuid)
+}
--- a/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch
+++ b/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch
@@ -0,0 +1,61 @@
+From ac0d13efa1fe673e677343cda4795d820500da6b Mon Sep 17 00:00:00 2001
+From: Gao Xiang <hsiangkao@aol.com>
+Date: Tue, 8 Dec 2020 18:57:41 +0800
+Subject: erofs-utils: fix multiple definition of `sbi'
+
+As nl6720 reported [1], lib/inode.o (mkfs) and lib/super.o (erofsfuse)
+could be compiled together by some options. Fix it now.
+
+[1] https://lore.kernel.org/r/10789285.Na0ui7I3VY@walnut
+
+Link: https://lore.kernel.org/r/20201208105741.9614-1-hsiangkao@aol.com
+Fixes: 5e35b75ad499 ("erofs-utils: introduce fuse implementation")
+Reported-by: nl6720 <nl6720@gmail.com>
+Signed-off-by: Gao Xiang <hsiangkao@aol.com>
+---
+ lib/config.c | 1 +
+ lib/inode.c  | 2 --
+ lib/super.c  | 2 --
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/lib/config.c b/lib/config.c
+index 3155112..3ecd481 100644
+--- a/lib/config.c
+++ b/lib/config.c
+@@ -11,6 +11,7 @@
+ #include "erofs/internal.h"
+ 
+ struct erofs_configure cfg;
+struct erofs_sb_info sbi;
+ 
+ void erofs_init_configure(void)
+ {
+diff --git a/lib/inode.c b/lib/inode.c
+index 3d634fc..0c4839d 100644
+--- a/lib/inode.c
+++ b/lib/inode.c
+@@ -22,8 +22,6 @@
+ #include "erofs/xattr.h"
+ #include "erofs/exclude.h"
+ 
+-struct erofs_sb_info sbi;
+-
+ #define S_SHIFT                 12
+ static unsigned char erofs_ftype_by_mode[S_IFMT >> S_SHIFT] = {
+ 	[S_IFREG >> S_SHIFT]  = EROFS_FT_REG_FILE,
+diff --git a/lib/super.c b/lib/super.c
+index 2d36692..025cefe 100644
+--- a/lib/super.c
+++ b/lib/super.c
+@@ -11,8 +11,6 @@
+ #include "erofs/io.h"
+ #include "erofs/print.h"
+ 
+-struct erofs_sb_info sbi;
+-
+ static bool check_layout_compatibility(struct erofs_sb_info *sbi,
+ 				       struct erofs_super_block *dsb)
+ {
+-- 
+cgit 1.2.3-1.el7
+
--- a/sys-fs/erofs-utils/metadata.xml
+++ b/sys-fs/erofs-utils/metadata.xml
@@ -32,5 +32,6 @@
 	</longdescription>
 	<use>
 		<flag name="uuid">Allow interaction with libuuid in sys-apps/util-linux. It's recommended turn on</flag>
+		<flag name="fuse">Enable support for Filesystem in Userspace via sys-fs/fuse</flag>
 	</use>
 </pkgmetadata>