diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /net-im/libcommuni | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'net-im/libcommuni')
-rw-r--r-- | net-im/libcommuni/Manifest | 5 | ||||
-rw-r--r-- | net-im/libcommuni/files/uchardet.pri | 17 | ||||
-rw-r--r-- | net-im/libcommuni/libcommuni-3.5.0_p20180116.ebuild (renamed from net-im/libcommuni/libcommuni-3.5.0.ebuild) | 32 |
3 files changed, 19 insertions, 35 deletions
diff --git a/net-im/libcommuni/Manifest b/net-im/libcommuni/Manifest index 080dbb792f77..4f50a9a658c5 100644 --- a/net-im/libcommuni/Manifest +++ b/net-im/libcommuni/Manifest @@ -1,4 +1,3 @@ -AUX uchardet.pri 473 BLAKE2B 811ea967aa76d8c59b4077042819aa952d2b35364fc3d8f7d9b4922839f05c8f31a9a9d33d01a23d8de7b0d0f0c4273c0f60dd27458be120c53aa229c5292917 SHA512 9661b94e66ea1223a3b76927ff88f7d50710706f9183bce2a2f3b612c280e300a9e92fa5e16b3296c26c4ce365f6c93d650c0d2e96ddbfa0159f46b819f111b1 -DIST libcommuni-3.5.0.tar.gz 646734 BLAKE2B 81e2c783625a0befe2d364423e862967bc76e8a66e9b5d7f2f94f46f46530d54b030bfd3a48d7877532092c607295cff5a77ecd8bb669112d53507a1ea18c5b0 SHA512 4d62f7e5edd32b9121f2b69d15a4022ad5d6cf7136dc48d0a1ca4bd413b3334533d7734d6939906fa3426f8db9bc255696107ecada19875c60ce59990b54dee4 -EBUILD libcommuni-3.5.0.ebuild 2246 BLAKE2B 7b32a7bdc00b5e2e0423da7c8d12e040615d9be2ed73dbac4d42c03f0805b3d050eaf65ce98bf4a312911463fdbce5f91b2b41e3fb0ea7e86a888dc7be2cb901 SHA512 008c8942a62a2eeafa66b4d983875d51be1fbdaa42fcc648d120634cc35cae91cce359df08f74012de09c81cd3477ed60fab8b2addbbd29bc2f0a9d4de254f02 +DIST libcommuni-3.5.0_p20180116.tar.gz 471286 BLAKE2B 9f89a5eea2444c207b54f6b820c7cef89ff2e578d34ad751fdbfe558af2bcf0e52238ef63b244fb321baa7716c0119ca084c547cc0161a08b46af4c9d604dd0e SHA512 f7ce9c92acbd67b3d75b9b7fc1cef55796a3d44294024da591c7b0c21fc065ec484dbc6a4c83af96fcb6fd6e725a7b6ed4219bd09e2aa0de303b82d64741efba +EBUILD libcommuni-3.5.0_p20180116.ebuild 2130 BLAKE2B fc5db80ca47708b780a3b49b7d130a1c408935830735dc832319fd8b1bac80fa9061ab12c945775f57e7f990bfe9f009ef06cf958e65c27acc80c9573366ff85 SHA512 07cc592f3eb26899c838b61d7847a097b0d7acc59666867f510f1043d99065eab4da82adf56909ca42a96ed453a73e978800ded4687732c5b45244e02b03835b MISC metadata.xml 797 BLAKE2B 9dc5a8109d9b5421c2ae2b8fa49bef5012107e5356975fe3ec2879bf02395d0762b370400c19a9bcefb90583b985c91bfcc42b934849b964496b2857640bccc2 SHA512 61814cbb96bb1a263bdecdba5adf4620dd35d9444065499af20523674573c9297ea39f52b740e7bf19cabf6cb63a116209f95a9a6edc4d25fe7d2966c9e36d7e diff --git a/net-im/libcommuni/files/uchardet.pri b/net-im/libcommuni/files/uchardet.pri deleted file mode 100644 index d22393b76d26..000000000000 --- a/net-im/libcommuni/files/uchardet.pri +++ /dev/null @@ -1,17 +0,0 @@ -###################################################################### -# Communi -###################################################################### - -include(../pkg.pri) - -pkgExists(uchardet) { - CONFIG += link_pkgconfig - PKGCONFIG += uchardet -} - -isEmpty(PKGCONFIG) { - error("UChardet support has been enabled, but the UChardet installation has not been found. Did you emerged app-i18n/uchardet?") -} else { - LIBS += -luchardet - INCPATH += -isystem /usr/include/uchardet -} diff --git a/net-im/libcommuni/libcommuni-3.5.0.ebuild b/net-im/libcommuni/libcommuni-3.5.0_p20180116.ebuild index 166369b11ab3..2507c14514ab 100644 --- a/net-im/libcommuni/libcommuni-3.5.0.ebuild +++ b/net-im/libcommuni/libcommuni-3.5.0_p20180116.ebuild @@ -1,39 +1,41 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" + +MY_PV="d3e388de9a146faad3277b46e480b0f1415f9a24" inherit qmake-utils DESCRIPTION="A cross-platform IRC framework written with Qt" HOMEPAGE="http://communi.github.io/" -SRC_URI="https://github.com/communi/libcommuni/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/communi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="qml test +uchardet" -# Compiling with USE="test" is currently broken with dev-libs/icu -# See: https://github.com/communi/libcommuni/issues/60 -REQUIRED_USE="test? ( uchardet )" - -RDEPEND="dev-qt/qtcore:5 +RDEPEND=" + dev-qt/qtcore:5 dev-qt/qtdeclarative:5 uchardet? ( app-i18n/uchardet ) - !uchardet? ( dev-libs/icu:= )" + !uchardet? ( dev-libs/icu:= ) + " -DEPEND="test? ( dev-qt/qttest:5 ) - ${RDEPEND}" +DEPEND=" + ${RDEPEND} + test? ( dev-qt/qttest:5 ) +" -RESTRICT="!test? ( test )" +S="${WORKDIR}/${PN}-${MY_PV}" src_prepare() { default - # Don't use bundled uchardet, use instead app-i18n/uchardet - rm -rf src/3rdparty/uchardet-0.0.1/* || die - cp "${FILESDIR}"/uchardet.pri src/3rdparty/uchardet-0.0.1/uchardet.pri || die + # Currently the test tst_IrcLagTimer fails, so disabling + # See: https://github.com/communi/libcommuni/issues/63 + sed -e '/irclagtimer/d' -i tests/auto/auto.pro || die } src_configure() { |