[gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/

["Theo Anderson" <telans@posteo.de>]

commit:     4f8fa2320d6fb0b8b66c28f70d9080f258179f82
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Thu Dec 10 21:47:24 2020 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Thu Dec 10 21:59:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4f8fa232

net-misc/megasync: bump to 4.3.7; update live ebuild

- uses tag archives instead of the git repo
- removed multilib (was it even used?)
- libressl support
- general ebuild cleanup

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 net-misc/megasync/Manifest                         |   2 +
 ...{megasync-9999.ebuild => megasync-4.3.7.ebuild} | 122 ++++++++++-----------
 net-misc/megasync/megasync-9999.ebuild             | 122 ++++++++++-----------
 3 files changed, 118 insertions(+), 128 deletions(-)

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
new file mode 100644
index 00000000..2e3f9444
--- /dev/null
+++ 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

diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-4.3.7.ebuild
similarity index 60%
copy from net-misc/megasync/megasync-9999.ebuild
copy to net-misc/megasync/megasync-4.3.7.ebuild
index a1edfca1..390ce338 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-4.3.7.ebuild
@@ -3,27 +3,54 @@
 
 EAPI=7
 
-inherit eutils multilib qmake-utils autotools git-r3 desktop cmake-multilib
+inherit autotools cmake desktop qmake-utils
+
+MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule
 
 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=( '*' )
+	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 +62,24 @@ 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() {
+	rmdir src/MEGASync/mega
+	mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega
+	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 +101,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

diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
index a1edfca1..5a8311e0 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -3,27 +3,54 @@
 
 EAPI=7
 
-inherit eutils multilib qmake-utils autotools git-r3 desktop cmake-multilib
+inherit autotools desktop qmake-utils xdg cmake
+
+MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule
 
 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=( '*' )
+	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 +62,24 @@ 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() {
+	rmdir src/MEGASync/mega
+	mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega
+	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 +101,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