fixes
This commit is contained in:
parent
5c977c696a
commit
c4d7fac096
@ -1,8 +1,4 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
=======
|
|
||||||
# Copyright 2020 Gentoo Authors
|
# Copyright 2020 Gentoo Authors
|
||||||
>>>>>>> upstream/master
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
@ -19,14 +15,9 @@ then
|
|||||||
inherit git-r3
|
inherit git-r3
|
||||||
EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
|
EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
|
||||||
else
|
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"
|
SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
|
||||||
KEYWORDS="~amd64"
|
KEYWORDS="~amd64"
|
||||||
S="${WORKDIR}/libqtolm-v${PV}"
|
S="${WORKDIR}/libqtolm-v${PV}"
|
||||||
>>>>>>> upstream/master
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LICENSE="GPL-3"
|
LICENSE="GPL-3"
|
||||||
@ -37,14 +28,8 @@ RDEPEND=""
|
|||||||
DEPEND="
|
DEPEND="
|
||||||
${RDEPEND}
|
${RDEPEND}
|
||||||
dev-qt/qtcore
|
dev-qt/qtcore
|
||||||
<<<<<<< HEAD
|
|
||||||
dev-libs/olm"
|
|
||||||
|
|
||||||
S="${WORKDIR}"/libqtolm-v3.0.1
|
|
||||||
=======
|
|
||||||
dev-libs/olm
|
dev-libs/olm
|
||||||
"
|
"
|
||||||
>>>>>>> upstream/master
|
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
local mycmakeargs=(
|
local mycmakeargs=(
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
=======
|
|
||||||
# Copyright 2020 Gentoo Authors
|
# Copyright 2020 Gentoo Authors
|
||||||
>>>>>>> upstream/master
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
=======
|
|
||||||
# Copyright 2020 Gentoo Authors
|
# Copyright 2020 Gentoo Authors
|
||||||
>>>>>>> upstream/master
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
@ -12,26 +8,14 @@ HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
|
|||||||
|
|
||||||
inherit eutils cmake-utils
|
inherit eutils cmake-utils
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]];
|
|
||||||
then
|
|
||||||
EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
|
|
||||||
=======
|
|
||||||
MY_PV="$(ver_rs 2 '-')"
|
MY_PV="$(ver_rs 2 '-')"
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
if [[ ${PV} == "9999" ]]; then
|
||||||
>>>>>>> upstream/master
|
|
||||||
inherit git-r3
|
inherit git-r3
|
||||||
EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
|
EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
|
||||||
else
|
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"
|
SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||||
KEYWORDS="~amd64"
|
KEYWORDS="~amd64"
|
||||||
>>>>>>> upstream/master
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LICENSE="GPL-3"
|
LICENSE="GPL-3"
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
=======
|
|
||||||
# Copyright 2020 Gentoo Authors
|
# Copyright 2020 Gentoo Authors
|
||||||
>>>>>>> upstream/master
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
# Copyright 1999-2019 Gentoo Foundation
|
|
||||||
=======
|
|
||||||
# Copyright 2020 Gentoo Authors
|
# Copyright 2020 Gentoo Authors
|
||||||
>>>>>>> upstream/master
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
@ -8,11 +8,7 @@ HOMEPAGE="https://gitlab.com/spectral-im/spectral"
|
|||||||
|
|
||||||
inherit cmake-utils
|
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"
|
COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.tar.gz"
|
||||||
>>>>>>> upstream/master
|
|
||||||
|
|
||||||
if [[ ${PV} == 9999 ]]
|
if [[ ${PV} == 9999 ]]
|
||||||
then
|
then
|
||||||
@ -49,21 +45,6 @@ DEPEND="
|
|||||||
"
|
"
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
<<<<<<< HEAD
|
|
||||||
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
|
|
||||||
|
|
||||||
cmake-utils_src_prepare
|
|
||||||
=======
|
|
||||||
if [[ ${PV} != 9999 ]]
|
if [[ ${PV} != 9999 ]]
|
||||||
then
|
then
|
||||||
move_lib() {
|
move_lib() {
|
||||||
@ -79,7 +60,6 @@ src_prepare() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cmake-utils_src_prepare
|
cmake-utils_src_prepare
|
||||||
>>>>>>> upstream/master
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg_postinst() {
|
pkg_postinst() {
|
||||||
|
Loading…
Reference in New Issue
Block a user