src_prepare/src_prepare-overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net-im/spectral: fixed issues

Browse Source
This commit is contained in:
Parona 2020-06-01 15:32:29 +03:00
parent ee0bb1524f
commit b43b74fe27
3 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-im/spectral/Manifest
View File

@ -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 DIST spectral-854.tar.gz 846106 BLAKE2B 6dc95d52f0acff646e6114e85c16dc9881edbc96eda1168094a477ef3b23d459c9d77aeedbd317cfa225317a9a83cd089539ccafff76df2da3104ef457034b20 SHA512 c8e5c65829a6fae07371461da1f91f33c01194db43a72dda5a35492bcd23595b5270f578494835ca484f9d9de24ab264754fb28f3483fd8ba4c190540416a0cd

34
net-im/spectral/spectral-854.ebuild
View File

@ -8,9 +8,7 @@ HOMEPAGE="https://gitlab.com/spectral-im/spectral"
inherit cmake-utils inherit cmake-utils
COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.zip" COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.tar.gz"
if [[ ${PV} == 9999 ]] if [[ ${PV} == 9999 ]]
then then
@ -46,28 +44,24 @@ DEPEND="
>=dev-qt/qtcore-5.12 >=dev-qt/qtcore-5.12
" "
src_prepare() { src_prepare() {
move_lib() { if [[ ${PV} != 9999 ]]
local IN_DIR="${1}" then
local OUT_DIR move_lib() {
[ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR="${2%/}/${IN_DIR}" local IN_DIR="${1}"
mv "${WORKDIR}/${IN_DIR}"*/* "${S}/${OUT_DIR}" || die 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
local thirdparty_libs=" SortFilterProxyModel" cmake-utils_src_prepare
for thirdparty_lib in ${thirdparty_libs} ; do
move_lib "${thirdparty_lib}" include
done
cmake-utils_src_prepare
} }
pkg_postinst() { pkg_postinst() {
xdg_icon_cache_update xdg_icon_cache_update
} }

40
net-im/spectral/spectral-9999.ebuild
View File

@ -1,18 +1,24 @@
# Copyright 2020 Gentoo Authors # Copyright 2020 Gentoo Authors
# 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
DESCRIPTION="A glossy client for Matrix, written in QtQuick Controls 2 and C++." 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
EGIT_REPO_URI="https://gitlab.com/b0/spectral.git"
EGIT_SUBMODULES=("include/SortFilterProxyModel") COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.tar.gz"
if [[ ${PV} != "9999" ]]; then
EGIT_COMMIT="${PV}" if [[ ${PV} == 9999 ]]
KEYWORDS="~amd64 ~x86" then
EGIT_REPO_URI="https://gitlab.com/b0/spectral.git"
inherit git-r3
else
SRC_URI="https://gitlab.com/spectral-im/spectral/-/archive/${PV}/${P}.tar.gz
${COMMON_URI}"
KEYWORDS="~amd64"
fi fi
LICENSE="GPL-3" LICENSE="GPL-3"
@ -38,6 +44,24 @@ DEPEND="
>=dev-qt/qtcore-5.12 >=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() { pkg_postinst() {
xdg_icon_cache_update xdg_icon_cache_update
} }