gentoo resync : 15.01.2020

3 files changed, 2 insertions, 81 deletions

diff --git a/net-im/libcommuni/Manifest b/net-im/libcommuni/Manifest
index 4fa4426c8649..bda0591d9af7 100644
--- a/net-im/libcommuni/Manifest
+++ b/net-im/libcommuni/Manifest
@@ -1,5 +1,3 @@
-DIST libcommuni-3.5.0_p20180116.tar.gz 471286 BLAKE2B 9f89a5eea2444c207b54f6b820c7cef89ff2e578d34ad751fdbfe558af2bcf0e52238ef63b244fb321baa7716c0119ca084c547cc0161a08b46af4c9d604dd0e SHA512 f7ce9c92acbd67b3d75b9b7fc1cef55796a3d44294024da591c7b0c21fc065ec484dbc6a4c83af96fcb6fd6e725a7b6ed4219bd09e2aa0de303b82d64741efba
 DIST libcommuni-3.5.0_p20190110.tar.gz 471278 BLAKE2B 2836a5ae01b08aac624c899a40712a9c452fc5b8f242906063936e48bd59306758cc70ea07beaf8488d228d6029c8128e343bbd59b1bfeff9bb2dccda0153b59 SHA512 9da065ef6b0589f7406d8c66b46f9f8d3d16325b59b7281153233b1a8d2bf98cdd35ee4e416237ac760dfc07531578aa7432226932976b9bbf36209bed5db72c
-EBUILD libcommuni-3.5.0_p20180116.ebuild 2155 BLAKE2B 322c5ea2d0466ef9e9b6277cf65a91156c0def34e442551211b69148da30d7937fb2db0dc74784103c52eb072ce0f78c5f70a17179eef437365faf9c71c70cf4 SHA512 582dd3f71635656c23f5ff70cb52786a429657c10f50b72cfa50203b52cbad2dac719812e546b8295d8745c6cd8d802df8da00ef301dd28b69ce300b0944379a
-EBUILD libcommuni-3.5.0_p20190110.ebuild 2389 BLAKE2B 5e7c2045877172bcc95217342644a718b231a427ce52778be417e7795728675fe4af5ad52e61b737332e5ac537a4d6a58a2972f645c6cbbfff9bab478c2f0c4f SHA512 74ed4904d7c161077d99677beb58bf87b6865be4ce8b1ae79d30bef0319ee338e81f74d62e398fecb33b5bc0e3408782cfbf2027d360eccd871f45cf1061c02b
+EBUILD libcommuni-3.5.0_p20190110.ebuild 2388 BLAKE2B 4ad09197cb61e80d2002ec7f02c95bc4d6063821ecd52c77f003b9fa2f8b8b715f467b4c4755a201373e384774d823ece3aa777470f93cf4197119e46d2a13de SHA512 e10d90dd77cd4ac2aef770a3601784ba0b42df0dd3c9bdbcf612b248e86e1507c425d1a23987569bbe0bd87d591a7138a4a04151fd391c79ddef459a7dfb0055
 MISC metadata.xml 678 BLAKE2B febd32dfdcd5f0513d47d2ada5600344bde61be84b436910a984d6bffe83b76e211bb1e58412a93e54a1e3ca63e226991a8ea89a68b9c0ff0902c416c9193159 SHA512 20b149d2d59a8b8b119d8144f80d28b5d02797b3b3bb6ab09412085b7aafffe9bb6fb46bd79d0951ab5c7fca8987dc3b6fd973e57179c3cac162da9601eb631b
diff --git a/net-im/libcommuni/libcommuni-3.5.0_p20180116.ebuild b/net-im/libcommuni/libcommuni-3.5.0_p20180116.ebuild
deleted file mode 100644
index a43946947bff..000000000000
--- a/net-im/libcommuni/libcommuni-3.5.0_p20180116.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qml test +uchardet"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	uchardet? ( app-i18n/uchardet )
-	!uchardet? ( dev-libs/icu:= )
-	"
-
-DEPEND="
-	${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# 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() {
-	local myqmakeargs=( libcommuni.pro
-		# Disables compile run-time benchmarks, as they don't make any sense
-		-config no_benchmarks
-		# Disables examples, as no new files are installed
-		-config no_examples
-		# Is needed for fixing the QA Notice: The following files contain insecure RUNPATHs
-		-config no_rpath
-		# Compile libcommuni always in Release mode, as Debug seems to do nothing
-		-config release
-		# Don't silence all compile messages
-		-config verbose
-		-config $(usex qml '' 'no_')install_imports
-		-config $(usex qml '' 'no_')install_qml
-		-config $(usex test '' 'no_')tests
-		-config $(usex uchardet 'no_' '')icu
-		-config $(usex uchardet '' 'no_')uchardet )
-
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
-	# This is a hack to delete the existing LD_LIBRARY_PATH and set a new one,
-	# otherwise a test will fail, because it uses the system installed lib instead of the new compiled lib.
-	# The test will fail, when libcommuni is emerged with USE="uchardet" and
-	# libcommuni is already installed with USE="-uchardat", or the other way around.
-	find "${S}" -type f -name 'target_wrapper.sh' -exec sed -i -e "/.*LD_LIBRARY_PATH.*/d" {} \; || die
-	local -x LD_LIBRARY_PATH="${S}/lib"
-
-	default
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
diff --git a/net-im/libcommuni/libcommuni-3.5.0_p20190110.ebuild b/net-im/libcommuni/libcommuni-3.5.0_p20190110.ebuild
index 64037cd59be3..e07da594ab07 100644
--- a/net-im/libcommuni/libcommuni-3.5.0_p20190110.ebuild
+++ b/net-im/libcommuni/libcommuni-3.5.0_p20190110.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/communi/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples qml test +uchardet"
 RESTRICT="!test? ( test )"