Make spectrum and deps compilable

net-im/libcommuni/ChangeLog

@@ -1,52 +0,0 @@
-# ChangeLog for net-im/libcommuni
-# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  12 Feb 2017; rion <rion4ik@gmail.com> -libcommuni-2.2.0.ebuild,
-  -libcommuni-3.4.0.ebuild, +libcommuni-3.5.0.ebuild:
-  version bump
-
-*libcommuni-3.1.0 (26 Apr 2014)
-
-  26 Apr 2014; rion <rion4ik@gmail.com> libcommuni-2.2.0.ebuild,
-  +libcommuni-3.1.0.ebuild:
-  version bump
-
-*libcommuni-2.2.0 (15 Aug 2013)
-
-  15 Aug 2013; rion <rion4ik@gmail.com> +libcommuni-2.2.0.ebuild,
-  +metadata.xml:
-  version bump and new report and new name
-
-  23 Apr 2013; rion <rion4ik@gmail.com> communi-2.0.0.ebuild:
-  external uchardet support
-
-*communi-2.0.0 (07 Apr 2013)
-
-  07 Apr 2013; rion <rion4ik@gmail.com> -communi-1.2.0.ebuild,
-  +communi-2.0.0.ebuild:
-  version bump
-
-*communi-1.2.0 (20 Nov 2012)
-
-  20 Nov 2012; rion <rion4ik@gmail.com> -communi-1.1.2.ebuild,
-  +communi-1.2.0.ebuild:
-  version bump
-
-*communi-1.1.2 (05 Sep 2012)
-
-  05 Sep 2012; rion <rion4ik@gmail.com> -communi-1.1.1.ebuild,
-  +communi-1.1.2.ebuild:
-  version bump
-
-*communi-1.1.1 (05 Sep 2012)
-
-  05 Sep 2012; rion <rion4ik@gmail.com> -communi-1.0.0.ebuild,
-  +communi-1.1.1.ebuild:
-  version bump
-
-*communi-1.0.0 (27 Mar 2012)
-
-  27 Mar 2012; rion <rion4ik@gmail.com> +communi-1.0.0.ebuild, +metadata.xml:
-  initial import
-

net-im/libcommuni/Manifest

@@ -1 +0,0 @@
-DIST libcommuni-3.5.0.tar.gz 646734 SHA256 cc0690129c7963578df9be2127ca5ba9f1e182bfe6c138d84612382e2dc80177 SHA512 4d62f7e5edd32b9121f2b69d15a4022ad5d6cf7136dc48d0a1ca4bd413b3334533d7734d6939906fa3426f8db9bc255696107ecada19875c60ce59990b54dee4 WHIRLPOOL ed0c8b38b75140d8ef7a746cbc52c816829538f3f5f8539190d4caba4aceeb6653db93b86ce0afe17e6ba1f7a9f1a58bd82dc8a4b1bacf940d1a7cb35a54c416

net-im/libcommuni/libcommuni-3.5.0.ebuild

@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples icu qt4 qt5 qml test +uchardet"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		qml? ( dev-qt/qtdeclarative:4 )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		qml? ( dev-qt/qtdeclarative:5 )
-	)
-	icu? ( dev-libs/icu )
-	uchardet? ( app-i18n/uchardet )"
-
-DEPEND="${RDEPEND}
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-
-	)"
-
-src_prepare() {
-	UCHD="${S}"/src/3rdparty/uchardet-0.0.1/uchardet.pri
-	echo "CONFIG *= link_pkgconfig" > "$UCHD"
-	echo "PKGCONFIG += uchardet" >> "$UCHD"
-
-	use qml || sed -i -e '/SUBDIRS/s| imports||' ./src/src.pro
-
-	eapply_user
-}
-
-src_configure() {
-	myargs=(
-		libcommuni.pro
-		-config no_rpath
-		-config $(use examples || echo "no_")examples
-		-config $(use icu || echo "no_")icu
-		-config $(use test || echo "no_")tests
-		-config $(use uchardet || echo "no_")uchardet
-	)
-
-	use qt4 && eqmake4 "${myargs[@]}"
-	use qt5 && eqmake5 "${myargs[@]}"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}

net-im/libcommuni/metadata.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rion4ik@gmail.com</email>
-		<name>rion</name>
-	</maintainer>
-	<longdescription>Communi, formerly known as LibIrcClient-Qt, is a cross-platform IRC client library written with Qt 4. IRC (Internet Relay Chat protocol) is a simple text-based communication protocol.</longdescription>
-	<use>
-		<flag name='qml'>Build QML/QtQuick bindings and imports</flag>
-		<flag name="uchardet">Enabled charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
-	</use>
-</pkgmetadata>

net-im/spectrum/spectrum-2.9999.ebuild

@@ -29,6 +29,7 @@ IUSE="debug doc libev log mysql postgres sqlite staticport symlinks test tools $
 
 RDEPEND="net-im/jabber-base
 	net-im/swiften
+	dev-libs/jsoncpp
 	dev-libs/popt
 	dev-libs/openssl:0
 	log? ( dev-libs/log4cxx )
@@ -36,7 +37,7 @@ RDEPEND="net-im/jabber-base
 	postgres? ( dev-libs/libpqxx )
 	sqlite? ( dev-db/sqlite:3 )
 	frotz? ( dev-libs/protobuf )
-	irc? ( net-im/libcommuni[qt4] dev-libs/protobuf )
+	irc? ( net-im/libcommuni dev-libs/protobuf )
 	purple? ( >=net-im/pidgin-2.6.0 dev-libs/protobuf )
 	skype? ( dev-libs/dbus-glib x11-base/xorg-server[xvfb] dev-libs/protobuf )
 	libev? ( dev-libs/libev dev-libs/protobuf )"

net-im/swiften/files/swiften-libdir-9999.patch

@@ -1,29 +0,0 @@
-diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
-index df15937..542511d 100644
---- a/BuildTools/SCons/SConscript.boot
-+++ b/BuildTools/SCons/SConscript.boot
-@@ -381,7 +381,7 @@ env["TEST_CREATE_LIBRARIES"] = "create_test_libraries" in ARGUMENTS
- 
- # Packaging
- env["DIST"] = "dist" in ARGUMENTS or env.GetOption("clean")
--for path in ["SWIFT_INSTALLDIR", "SWIFTEN_INSTALLDIR", "SLUIFT_INSTALLDIR"] :
-+for path in ["SWIFT_INSTALLDIR", "SWIFTEN_INSTALLDIR", "SLUIFT_INSTALLDIR", "SWIFTEN_LIBDIR"] :
-     if ARGUMENTS.get(path, "") :
-         if os.path.isabs(ARGUMENTS[path]) :
-             env[path] = Dir(ARGUMENTS[path]).abspath
-diff --git a/Swiften/SConscript b/Swiften/SConscript
-index 5270ac5..33ae4c6 100644
---- a/Swiften/SConscript
-+++ b/Swiften/SConscript
-@@ -594,8 +594,9 @@ if env["SCONS_STAGE"] == "build" :
- 
-     # Install swiften
-     if swiften_env.get("SWIFTEN_INSTALLDIR", "") :
--        swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib"), swiften_lib)
-+        libdir = swiften_env.get("SWIFTEN_LIBDIR", os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib"))
-+	swiften_env.Install(libdir, swiften_lib)
-         for alias in myenv["SWIFTEN_LIBRARY_ALIASES"] :
--            myenv.Command(myenv.File(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib", alias)), [env.Value(swiften_lib[0].name), swiften_lib[0]], symlink)
-+            myenv.Command(myenv.File(os.path.join(libdir, alias)), [env.Value(swiften_lib[0].name), swiften_lib[0]], symlink)
-         for include in swiften_includes :
-             swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "include", os.path.dirname(include)), "#/" + include)

net-im/swiften/swiften-9999.ebuild

@@ -31,7 +31,6 @@ else
 	KEYWORDS=""
 fi
 IUSE="avahi debug doc examples test"
-PATCHES=( ${FILESDIR}/swiften-libdir-9999.patch )
 
 RDEPEND="
 	avahi? ( net-dns/avahi )
@@ -95,7 +94,7 @@ src_test() {
 
 src_install() {
 	escons "${scons_vars[@]}" SWIFTEN_INSTALLDIR="${ED}/usr" \
-		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)" "${ED}/usr"
+		SWIFTEN_LIBDIR="$(get_libdir)" "${ED}/usr"
 
 	use doc && dohtml "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html"