From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- net-libs/qxmpp/Manifest | 6 ++-- net-libs/qxmpp/qxmpp-1.0.1.ebuild | 58 -------------------------------------- net-libs/qxmpp/qxmpp-1.2.0.ebuild | 59 +++++++++++++++++++++++++++++++++++++++ net-libs/qxmpp/qxmpp-9999.ebuild | 36 +++++++++++------------- 4 files changed, 78 insertions(+), 81 deletions(-) delete mode 100644 net-libs/qxmpp/qxmpp-1.0.1.ebuild create mode 100644 net-libs/qxmpp/qxmpp-1.2.0.ebuild (limited to 'net-libs/qxmpp') diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest index eba23d2096df..5e5a6da7b04c 100644 --- a/net-libs/qxmpp/Manifest +++ b/net-libs/qxmpp/Manifest @@ -1,6 +1,6 @@ DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71 -DIST qxmpp-1.0.1.tar.gz 259791 BLAKE2B 3687dd8f74db8a995bc37850f6988b1750219b2f683281d26990a430046cd1d7f1957c19604540a56c3110aa5b9a40d037388f9726f684a56a0d15c7de6a4849 SHA512 b6fb5fc0e3edfd978ac47b3ce32d8d0892678247479ba3e30beba3a7e67da1eb053bb95de07306920cf6ca5e744c12fd31f1a72612c5ee5b724a3eac7b8d6c6e +DIST qxmpp-1.2.0.tar.gz 310801 BLAKE2B a3d1c708fe33e6ecd226e867fc030c6cddb5009c90db46544a0081e1198f69b609239304f56aec00c7b399e7f74fa9bed82eb38db3439e092719a7a68b440a14 SHA512 9b9541dd2ffc689877969bdd1063e7ab21761e5feb7bf911acba3b0a0d953199b8bc08a1ad8c2031b0e135af7a127cbbc108bb3e8dbf1b7712ab8dc8f4cbd371 EBUILD qxmpp-0.9.3-r2.ebuild 1839 BLAKE2B 59c6021302117272c43f63ff6f372f4248224c58b50c1376b8ebe4e44242f351462ecb9b8feb3455e47e2b230f8692063b3608270c0723c45146b38f1098d280 SHA512 1c2aa58ce0dc71faf748032fa82bfdfed962a8d8bcad1fa36db786d4e82b0b191779ff1c84ea1a3509198afb5f5ab3df1c6d20bdfa3c4b3b1d1e1172e3f8eede -EBUILD qxmpp-1.0.1.ebuild 1380 BLAKE2B 744109d8c5fadd54231d67c47e03b468dad42df207475911af48a5bdb06338b552c85abffb7571fb162cb8e7bd5721066f8000aa7b9705ec10760ecbfd34f3b1 SHA512 d8c90421e145362accc6f12d7300e7a247c88ef061a430b60269a12825001b70ce9df04a247354db2b322ffe17fb95601c73001a09093c7f171291546502b0ae -EBUILD qxmpp-9999.ebuild 1370 BLAKE2B 4b29c5e54630679f9dbbfc04f773f3ce4a2c70b87f0774d8b144bfb6d8008b013a227714d37e30f444c518da37d70ee0fb125eedd84494211bc53034d3181eda SHA512 b196a0a6a2cafc320bff35528a92f05dd2821602b5cbaaea0b9cbe9773352b27816aa7da0049fe490fa75da2bcd99ce3f444dd2750218e6284500d000c905169 +EBUILD qxmpp-1.2.0.ebuild 1306 BLAKE2B b815077c61922b2d7eb87fdf76156c02252498e5d6b1970d1cc4357ff170b86db3d29aad2b69a3d3fa29bb075d006ef2018f88fa8a8e186b097368d9d7c40e24 SHA512 5ccc1c274df875fe028067a5ac36c068c91d7c069ba3d21fb77ccb75a578ec321e5739d6f60a9d9495a12606667c79b8059b6777cdd4d72b0446a0c4f7930f0e +EBUILD qxmpp-9999.ebuild 1271 BLAKE2B a5446fa77dc46c67ba1d0dce9dcaf06cc839b9b34bf4ad8824fee44c65141eccad0f07991055102e1b21c0fd4d62166633fde5d0d3a90744044e0b1daee7aa29 SHA512 cc44511dcc23f008226b1088a504b06e00e77684c013dd8a5a2217dfcabe9d54f30e14b34355fd6d1833fb1320d20eca0b814e12d0d25165304ad3779b54ed76 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426 diff --git a/net-libs/qxmpp/qxmpp-1.0.1.ebuild b/net-libs/qxmpp/qxmpp-1.0.1.ebuild deleted file mode 100644 index e56ca1cc2f44..000000000000 --- a/net-libs/qxmpp/qxmpp-1.0.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" -HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" -SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc opus +speex test theora vpx" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtxml:5 - opus? ( media-libs/opus ) - speex? ( media-libs/speex ) - theora? ( media-libs/libtheora ) - vpx? ( media-libs/libvpx:= ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" -BDEPEND=" - doc? ( app-doc/doxygen ) -" - -src_prepare() { - # requires network connection, bug #623708 - sed -e "/qxmppiceconnection/d" \ - -i tests/CMakeLists.txt || die "failed to drop single test" - sed -e "/qxmppserver/d" \ - -i tests/CMakeLists.txt || die "failed to drop single test" - sed -e "/qxmpptransfermanager/d" \ - -i tests/CMakeLists.txt || die "failed to drop single test" - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc) - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTS=$(usex test) - -DWITH_OPUS=$(usex opus) - -DWITH_SPEEX=$(usex speex) - -DWITH_THEORA=$(usex theora) - -DWITH_VPX=$(usex vpx) - ) - - cmake_src_configure -} diff --git a/net-libs/qxmpp/qxmpp-1.2.0.ebuild b/net-libs/qxmpp/qxmpp-1.2.0.ebuild new file mode 100644 index 000000000000..c9a44c3c89f1 --- /dev/null +++ b/net-libs/qxmpp/qxmpp-1.2.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" +HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" +SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc opus +speex test theora vpx" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtxml:5 + opus? ( media-libs/opus ) + speex? ( media-libs/speex ) + theora? ( media-libs/libtheora ) + vpx? ( media-libs/libvpx:= ) +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" +BDEPEND=" + doc? ( app-doc/doxygen ) +" + +src_prepare() { + # requires network connection, bug #623708 + sed \ + -e "/qxmppiceconnection/d" \ + -e "/qxmppserver/d" \ + -e "/qxmpptransfermanager/d" \ + -i tests/CMakeLists.txt \ + || die "failed to drop certain network tests" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc) + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=$(usex test) + -DBUILD_INTERNAL_TESTS=$(usex test) + -DWITH_OPUS=$(usex opus) + -DWITH_SPEEX=$(usex speex) + -DWITH_THEORA=$(usex theora) + -DWITH_VPX=$(usex vpx) + ) + + cmake_src_configure +} diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild index b1973ffc3cce..453364d6055c 100644 --- a/net-libs/qxmpp/qxmpp-9999.ebuild +++ b/net-libs/qxmpp/qxmpp-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp" - -inherit git-r3 cmake-utils +inherit git-r3 cmake DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" +EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp" LICENSE="LGPL-2.1" SLOT="0" @@ -26,17 +25,22 @@ RDEPEND=" vpx? ( media-libs/libvpx:= ) " DEPEND="${RDEPEND} - dev-util/cmake test? ( dev-qt/qttest:5 ) +" +BDEPEND=" doc? ( app-doc/doxygen ) " src_prepare() { # requires network connection, bug #623708 - sed -e "/qxmppiceconnection/d" \ - -i tests/CMakeLists.txt || die "failed to drop single test" - - cmake-utils_src_prepare + sed \ + -e "/qxmppiceconnection/d" \ + -e "/qxmppserver/d" \ + -e "/qxmpptransfermanager/d" \ + -i tests/CMakeLists.txt \ + || die "failed to drop certain network tests" + + cmake_src_prepare } src_configure() { @@ -44,20 +48,12 @@ src_configure() { -DBUILD_DOCUMENTATION=$(usex doc) -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=$(usex test) + -DBUILD_INTERNAL_TESTS=$(usex test) -DWITH_OPUS=$(usex opus) -DWITH_SPEEX=$(usex speex) -DWITH_THEORA=$(usex theora) -DWITH_VPX=$(usex vpx) ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if use doc; then - # Use proper path for documentation - mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed" - fi + cmake_src_configure } -- cgit v1.2.3