From dec2dc9c175f8f1c6aea85c098f1587c2ccb8c15 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Thu, 19 Mar 2020 11:35:39 +0100 Subject: net-im/nheko-9999: remove failing patch and update required mtxclient --- dev-libs/mtxclient/mtxclient-9999.ebuild | 7 ++++--- dev-libs/tweeny/Manifest | 2 +- dev-libs/tweeny/tweeny-3.1.0.ebuild | 26 ++++++++++++++++++++++++++ dev-libs/tweeny/tweeny-3.ebuild | 26 -------------------------- net-im/nheko/nheko-9999.ebuild | 6 +----- 5 files changed, 32 insertions(+), 35 deletions(-) create mode 100644 dev-libs/tweeny/tweeny-3.1.0.ebuild delete mode 100644 dev-libs/tweeny/tweeny-3.ebuild diff --git a/dev-libs/mtxclient/mtxclient-9999.ebuild b/dev-libs/mtxclient/mtxclient-9999.ebuild index a44651d..eea34c8 100644 --- a/dev-libs/mtxclient/mtxclient-9999.ebuild +++ b/dev-libs/mtxclient/mtxclient-9999.ebuild @@ -23,14 +23,15 @@ IUSE="-test" RDEPEND=" dev-libs/libsodium >=dev-libs/boost-1.66.0 - dev-libs/olm" + dev-libs/olm + " DEPEND="${RDEPEND} dev-libs/spdlog dev-cpp/nlohmann_json >=dev-util/cmake-3.11 test? ( dev-cpp/gtest ) -" -#cmake >= 3.11 needed for boost deps + " + src_configure() { local mycmakeargs=( -DBUILD_LIB_TESTS="$(usex test)" diff --git a/dev-libs/tweeny/Manifest b/dev-libs/tweeny/Manifest index ab2308a..f11cb85 100644 --- a/dev-libs/tweeny/Manifest +++ b/dev-libs/tweeny/Manifest @@ -1 +1 @@ -DIST tweeny-3.tar.gz 48997 BLAKE2B d9431f3135b763365bb679a964bdc73a0fa16a993a1b784381722d30bd9855f1467761796bad0b7894a4fc5434463e232b4f911707a7252a15a9f208106b697c SHA512 41f2562a0e55b0fd2c219fab384bf46f70432abb47953b5ac768a29b2ea7b790c6aa56fd44c1fef583f6fa2011010d7dd7e637bcd2d8a9be5c9638a7f2ce7436 +DIST tweeny-3.1.0.tar.gz 49467 BLAKE2B 7b1a3b7a7dba22d291c89dc3b2ee07458070aa55f2e77adfc1f0de4095187d2a2e0e0960a17a17fd96cccdd114d42d5e1bb4a6a76edc4b97500b2615c0eb574e SHA512 8109c241f866b565d15f1f5f87837f178a4fd3c5169d73e73e18334c54274024b48c9baed1f1935201ab872687bacb9ff3f8ecbae8078de4e1b459242450b9a5 diff --git a/dev-libs/tweeny/tweeny-3.1.0.ebuild b/dev-libs/tweeny/tweeny-3.1.0.ebuild new file mode 100644 index 0000000..3fd2a37 --- /dev/null +++ b/dev-libs/tweeny/tweeny-3.1.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A modern C++ tweening library" +HOMEPAGE="http://mobius3.github.io/tweeny" + +inherit eutils cmake-utils + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + + SRC_URI="" + EGIT_REPO_URI="https://github.com/mobius3/${PN}.git" +else + SRC_URI="https://github.com/mobius3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-libs/tweeny/tweeny-3.ebuild b/dev-libs/tweeny/tweeny-3.ebuild deleted file mode 100644 index 3fd2a37..0000000 --- a/dev-libs/tweeny/tweeny-3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A modern C++ tweening library" -HOMEPAGE="http://mobius3.github.io/tweeny" - -inherit eutils cmake-utils - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - - SRC_URI="" - EGIT_REPO_URI="https://github.com/mobius3/${PN}.git" -else - SRC_URI="https://github.com/mobius3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/net-im/nheko/nheko-9999.ebuild b/net-im/nheko/nheko-9999.ebuild index 6c85109..b8c1fc4 100644 --- a/net-im/nheko/nheko-9999.ebuild +++ b/net-im/nheko/nheko-9999.ebuild @@ -18,10 +18,6 @@ LICENSE="GPL-3" SLOT="0" IUSE="" -PATCHES=( - "${FILESDIR}/const_lmdb_vals.patch" -) - RDEPEND=">=dev-qt/qtgui-5.7.1 >=dev-qt/qtnetwork-5.7.1 dev-qt/qtmultimedia @@ -35,7 +31,7 @@ RDEPEND=">=dev-qt/qtgui-5.7.1 DEPEND="${RDEPEND} >=dev-qt/linguist-tools-5.7.1 dev-util/ninja - >=dev-libs/mtxclient-0.2.1" + >=dev-libs/mtxclient-0.3.0" CMAKE_BUILD_TYPE=Release -- cgit v1.2.3-65-gdbad