Merge remote-tracking branch 'upstream/master'

fixes

dev-libs/libQtOlm/libQtOlm-3.0.1.ebuild

@@ -1,7 +1,11 @@
+<<<<<<< HEAD
 # Copyright 1999-2017 Gentoo Foundation
+=======
+# Copyright 2020 Gentoo Authors
+>>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A Qt wrapper for libolm"
 HOMEPAGE="https://gitlab.com/b0/libQtOlm"
@@ -12,12 +16,17 @@ SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v3.0.1/libqtolm-v3.0.1.tar.gz"
 
 if [[ ${PV} == 9999 ]]
 then
-	EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
-	EGIT_COMMIT="v${PV}"
 	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
 else
+<<<<<<< HEAD
     SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
     KEYWORDS="~amd64 ~x86"
+=======
+	SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/libqtolm-v${PV}"
+>>>>>>> upstream/master
 fi
 
 LICENSE="GPL-3"
@@ -25,11 +34,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qtcore
+<<<<<<< HEAD
 	dev-libs/olm"
 	
 S="${WORKDIR}"/libqtolm-v3.0.1
+=======
+	dev-libs/olm
+"
+>>>>>>> upstream/master
 
 src_configure() {
     local mycmakeargs=(

dev-libs/libQtOlm/libQtOlm-9999.ebuild

@@ -1,18 +1,27 @@
+<<<<<<< HEAD
 # Copyright 1999-2017 Gentoo Foundation
+=======
+# Copyright 2020 Gentoo Authors
+>>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A Qt wrapper for libolm"
 HOMEPAGE="https://gitlab.com/b0/libQtOlm"
 
-inherit eutils cmake-utils git-r3
+inherit eutils cmake-utils
 
-SRC_URI=""
+SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v3.0.1/libqtolm-v3.0.1.tar.gz"
+
+if [[ ${PV} == 9999 ]]
+then
+	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
-if [[ ${PV} != "9999" ]]; then
+else
-	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/libqtolm-v${PV}"
 fi
 
 LICENSE="GPL-3"
@@ -20,9 +29,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qtcore
-	dev-libs/olm"
+	dev-libs/olm
+"
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON

dev-libs/libQuotient/libQuotient-0.6_beta1.ebuild

@@ -1,21 +1,37 @@
+<<<<<<< HEAD
 # Copyright 1999-2017 Gentoo Foundation
+=======
+# Copyright 2020 Gentoo Authors
+>>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
 HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
 
 inherit eutils cmake-utils
 
+<<<<<<< HEAD
 
 if [[ ${PV} == "9999" ]];
 then
 	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+=======
+MY_PV="$(ver_rs 2 '-')"
+
+if [[ ${PV} == "9999" ]]; then
+>>>>>>> upstream/master
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
 else
+<<<<<<< HEAD
      SRC_URI="https://github.com/quotient-im/libQuotient/archive/0.6-beta1.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
+=======
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+>>>>>>> upstream/master
 fi
 
 LICENSE="GPL-3"
@@ -23,12 +39,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qtcore
 	dev-qt/qtmultimedia
-	!!dev-libs/libqmatrixclient"
+	!!dev-libs/libqmatrixclient
+"
 
-S="${WORKDIR}"/${PN}-${PV/_/\-}	
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_configure() {
 	local mycmakeargs=(

dev-libs/libQuotient/libQuotient-9999.ebuild

@@ -1,21 +1,25 @@
+<<<<<<< HEAD
 # Copyright 1999-2017 Gentoo Foundation
+=======
+# Copyright 2020 Gentoo Authors
+>>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
 HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
 
 inherit eutils cmake-utils
 
+MY_PV="$(ver_rs 2 '-')"
+
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-
-	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
 else
-	SRC_URI="https://github.com/quotient-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
@@ -23,10 +27,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qtcore
 	dev-qt/qtmultimedia
-	!!dev-libs/libqmatrixclient"
+	!!dev-libs/libqmatrixclient
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_configure() {
 	local mycmakeargs=(

dev-libs/olm/olm-3.1.4.ebuild

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Copyright 1999-2019 Gentoo Foundation
+=======
+# Copyright 2020 Gentoo Authors
+>>>>>>> upstream/master
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,9 +17,9 @@ if [[ "${PV}" == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.matrix.org/matrix-org/${PN}.git"
 else
 	SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1)"
-IUSE="debug"
+IUSE=""

net-im/spectral/Manifest

@@ -1,2 +1,2 @@
-DIST 36befddf5d57faad990e72c88c5844794f274145.zip 133452 BLAKE2B 24d94c68bf97f5e0bf986f7024bcef1a61d1bd0e6f27108f386139fe6bc3515faad87cf4d825b94a3c3254ae75a82e4292a49f0fdaf5115e13c1e6a21af64dc1 SHA512 5bcaa4463e9ea033b3b51ec0524daf0350693a8d2a54a7784fc7109c957c0952d924c95b5cb36d9a9facc10d0ee9e9008d14743f23fe744964b5daa8050d8534
+DIST 36befddf5d57faad990e72c88c5844794f274145.tar.gz 52369 BLAKE2B 02e2a85c5df7a173b1ec27f126474db0d1ddf2c5858d41b904d463277d134f6f301e25597fd71d61d4a512207eb739e094b44a6af7d9bb7deb65823ab6836691 SHA512 bfb7af36abd5ded014549042e760c1ec6779f46dd6c30e672ada21decc7a1b1a631ada1cc2c57d62d0daca4cccff9640077345b3661ef73021d5e2ee8058ae9b
 DIST spectral-854.tar.gz 846106 BLAKE2B 6dc95d52f0acff646e6114e85c16dc9881edbc96eda1168094a477ef3b23d459c9d77aeedbd317cfa225317a9a83cd089539ccafff76df2da3104ef457034b20 SHA512 c8e5c65829a6fae07371461da1f91f33c01194db43a72dda5a35492bcd23595b5270f578494835ca484f9d9de24ab264754fb28f3483fd8ba4c190540416a0cd

net-im/spectral/spectral-854.ebuild

@@ -8,7 +8,11 @@ HOMEPAGE="https://gitlab.com/spectral-im/spectral"
 
 inherit  cmake-utils
 
+<<<<<<< HEAD
 COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.zip"
+=======
+COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.tar.gz"
+>>>>>>> upstream/master
 
 if [[ ${PV} == 9999 ]]
 then
@@ -45,6 +49,7 @@ DEPEND="
 "
 
 src_prepare() {
+<<<<<<< HEAD
    move_lib() {
       local IN_DIR="${1}"
       local OUT_DIR
@@ -58,6 +63,23 @@ src_prepare() {
    done
 
    cmake-utils_src_prepare
+=======
+	if [[ ${PV} != 9999 ]]
+	then
+		move_lib() {
+			local IN_DIR="${1}"
+			local OUT_DIR[ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR="${2%/}/${IN_DIR}"
+			mv "${WORKDIR}/${IN_DIR}"*/* "${S}/${OUT_DIR}" || die
+		}
+
+		local thirdparty_libs=" SortFilterProxyModel"
+		for thirdparty_lib in ${thirdparty_libs} ; do
+			move_lib "${thirdparty_lib}" include
+		done
+	fi
+
+	cmake-utils_src_prepare
+>>>>>>> upstream/master
 }
 
 pkg_postinst() {

net-im/spectral/spectral-9999.ebuild

@@ -4,14 +4,21 @@
 EAPI=7
 
 DESCRIPTION="A glossy client for Matrix, written in QtQuick Controls 2 and C++."
-HOMEPAGE="https://gitlab.com/b0/spectral"
+HOMEPAGE="https://gitlab.com/spectral-im/spectral"
 
-inherit eutils cmake-utils git-r3
+inherit  cmake-utils
+
+COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.tar.gz"
+
+if [[ ${PV} == 9999 ]]
+then
 	EGIT_REPO_URI="https://gitlab.com/b0/spectral.git"
-EGIT_SUBMODULES=("include/SortFilterProxyModel")
+	inherit git-r3
-if [[ ${PV} != "9999" ]]; then
+else
-	EGIT_COMMIT="${PV}"
+	SRC_URI="https://gitlab.com/spectral-im/spectral/-/archive/${PV}/${P}.tar.gz
-	KEYWORDS="~amd64 ~x86"
+	${COMMON_URI}"
+
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
@@ -37,6 +44,24 @@ DEPEND="
 	>=dev-qt/qtcore-5.12
 "
 
+src_prepare() {
+	if [[ ${PV} != 9999 ]]
+	then
+		move_lib() {
+			local IN_DIR="${1}"
+			local OUT_DIR[ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR="${2%/}/${IN_DIR}"
+			mv "${WORKDIR}/${IN_DIR}"*/* "${S}/${OUT_DIR}" || die
+		}
+
+		local thirdparty_libs=" SortFilterProxyModel"
+		for thirdparty_lib in ${thirdparty_libs} ; do
+			move_lib "${thirdparty_lib}" include
+		done
+	fi
+
+	cmake-utils_src_prepare
+}
+
 pkg_postinst() {
 	xdg_icon_cache_update
 }