gentoo resync : 03.03.2019

4 files changed, 2 insertions, 184 deletions

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 583c57c3f560..90eccd14c241 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,10 +1,7 @@
 AUX spectrum2-2.0.9-remove_debug_cflags.patch 376 BLAKE2B 21a4c230d57398d8ce5ff39cd1ad103fa1f7df332b88cf0024e2a505ecf9be7378da99eb83941122d5cf6a835bff9dfa7b9a10a2583299c91d8506dccc548c85 SHA512 3ec75a4ae915b7d2e2aa594fafcc559aa8b09b5cb8948931797088340d722bfb074ac8e0f77fea1258a7b2c3f0816d001aee63b4fd7cc334927a8431fb6a5611
-AUX spectrum2-2.0.9-use_qt5_libcommuni.patch 2428 BLAKE2B d6f377f9ac1d99d5af51a60d5b837bca6acd3d88c4b6cef9716f1f74198c3b5f2e3c4e153be9094c0af1b315f03b3e50c49fc9c93f262a76a0d137636e142b33 SHA512 fc08e37256782db97f7e067d6a3a51f1244c9f0610f69900711d706e6fa50591e200451432ee99691d899a2e6e95c987baa56d3708f2fd172524865dd07a51e5
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles 44 BLAKE2B c0cef689f5b483d16461bf50edbe8a17c8269440a43a3ccf04c45e028704ad4861e7bd340b85b0daf11b5e41a51e19fd04f2dcd1f2446e00b9a6a3b1e08d2206 SHA512 b995bf8c97a98dc6c887d6d4bb4b53cfee85461cfe65770013d2a412729d164894201ad0e3b69868b94c159ecd524d7bd0eccfedbc27c81969c3ed640ae32785
 DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c
-DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B 32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939 SHA512 f111133d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982
-EBUILD spectrum2-2.0.10.ebuild 2862 BLAKE2B 10a32320909ffcacd099979062f557f6e5b9bc9f9c0a4fb1c698d2ce2845741b6f6b89d7370b61b93263440f07dbde67dd2561b6b12afc25a12740df81c0b8c4 SHA512 3a37a2fa257f54b422cc4a3f60bf3ee725dbce7fd311b55159a52ea70511c4094f305066234083714411652b384853af0aade34ca3ec12647ff4ff3c48598c7a
-EBUILD spectrum2-2.0.9.ebuild 2901 BLAKE2B c0dedfd2f7693469ce936daf90ce512546239343a387a453798e5c48e964b886df8355d0716c6e447a8bf378098994ca403f35b271a7e3a742b81ab15a44a844 SHA512 2f9c427748e3ccbeac88986e82b83ed785b6f950a04ba18fc6049309e494b9f4f9bd0d72df2eb7757eba80a07e6f3431479a3bce86bd00537f3ae734ef172f07
+EBUILD spectrum2-2.0.10.ebuild 2867 BLAKE2B 726cb2fe344b54c715bfc103cbf8710328d51a55be7106155d3fb63e40acf2bad682ea4a0283ab5ebc3f8244d6fe05f36b7dcbb1c328f7daf208ef8cf9c99ad6 SHA512 752a1d934d04c9b61a18bd71f9e278db15ecfbea50aa0a20fa4a78627cc8415b9f8770850a2326e27a9a01155af7f5855fed46c864333c2710aa73a114b9e621
 MISC metadata.xml 1259 BLAKE2B e885a8348122a70994d3b04387d64fa88d2e02075554849d427f18b2b39b6ae1eeab543066cd587031f8eae9842f0d727f297d7b6cbe744c8d1424d9fb3640ce SHA512 be2129a4b76017ce3d84aa48589d54ac3863e1d9b7a1aa2a5d98341f962bda3f2e9507497056add0b4f280545ed0c511c8f50eff35d46cf9cadd2c6fba7b5ed6
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch b/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
deleted file mode 100644
index 27e23db44848..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.9-use_qt5_libcommuni.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/CMakeLists.txt	2018-09-17 09:46:40.000000000 +0200
-+++ b/CMakeLists.txt	2018-09-20 20:57:35.000000000 +0200
-@@ -182,8 +182,7 @@
- if(ENABLE_IRC)
- 	find_package(Communi)
- 
--	INCLUDE(FindQt4)
--	FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
-+	FIND_PACKAGE(Qt5 COMPONENTS Core Network)
- 	# ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
- 	ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
- 	# ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
-@@ -321,7 +320,6 @@
- 		message("IRC plugin        : yes")
- 		include_directories(${QT_QTNETWORK_INCLUDE_DIR})
- 		include_directories(${IRC_INCLUDE_DIR})
--		include(${QT_USE_FILE})
- 	else()
- 		if(ENABLE_IRC)
- 			message("IRC plugin        : no (install libCommuni and libprotobuf-dev)")
---- a/backends/libcommuni/CMakeLists.txt	2018-09-17 09:46:40.000000000 +0200
-+++ b/backends/libcommuni/CMakeLists.txt	2018-09-20 20:59:31.000000000 +0200
-@@ -1,14 +1,14 @@
- cmake_minimum_required(VERSION 2.6)
- FILE(GLOB SRC *.cpp)
- FILE(GLOB HEADERS *.h)
--QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
--add_definitions(-DQT_NO_KEYWORDS)
-+QT5_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
-+include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
- 
- if (NOT WIN32)
--	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport pthread)
-+	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport pthread)
- else ()
--	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt4::QtNetwork Qt4::QtCore transport)
-+	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} Qt5::Network Qt5::Core transport)
- endif()
- INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin)
- 
---- a/cmake_modules/FindCommuni.cmake	2018-09-17 09:46:40.000000000 +0200
-+++ b/cmake_modules/FindCommuni.cmake	2018-09-20 21:00:04.000000000 +0200
-@@ -1,8 +1,7 @@
--find_package(Qt4)
--include( ${QT_USE_FILE} )
-+find_package(Qt5Network)
- 
- FIND_LIBRARY(IRC_LIBRARY NAMES IrcCore PATHS ${QT_LIBRARY_DIR})
--FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${QT_INCLUDE_DIR} PATH_SUFFIXES Communi)
-+FIND_PATH(IRC_INCLUDE_DIR NAMES "IrcCore/ircglobal.h" PATHS ${Qt5Core_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}"/.." PATH_SUFFIXES Communi)
- 
- # message( STATUS ${IRC_LIBRARY})
- if( IRC_LIBRARY AND IRC_INCLUDE_DIR )
diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild
index 285dd6d49820..ddc335eca687 100644
--- a/net-im/spectrum2/spectrum2-2.0.10.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild
@@ -18,7 +18,7 @@ IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsap
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-libs/boost:=
+	dev-libs/boost:=[nls]
 	dev-libs/expat
 	dev-libs/libev:=
 	dev-libs/log4cxx
diff --git a/net-im/spectrum2/spectrum2-2.0.9.ebuild b/net-im/spectrum2/spectrum2-2.0.9.ebuild
deleted file mode 100644
index 5533572a03cf..000000000000
--- a/net-im/spectrum2/spectrum2-2.0.9.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 systemd user
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im"
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	dev-libs/libev:=
-	dev-libs/log4cxx
-	dev-libs/jsoncpp:=
-	dev-libs/openssl:0=
-	dev-libs/popt
-	dev-libs/protobuf:=
-	net-dns/libidn:0=
-	net-im/swift:=
-	net-misc/curl
-	sys-libs/zlib:=
-	frotz? ( !games-engines/frotz )
-	irc? ( net-im/libcommuni )
-	mysql? (
-		|| (
-			dev-db/mariadb-connector-c
-			dev-db/mysql-connector-c
-		)
-	)
-	postgres? ( dev-libs/libpqxx:= )
-	purple? (
-		dev-libs/glib
-		net-im/pidgin:=
-	)
-	sms? ( app-mobilephone/smstools )
-	sqlite? ( dev-db/sqlite:3 )
-	twitter? ( net-misc/curl )
-	whatsapp? ( net-im/transwhat )"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-python/sleekxmpp[${PYTHON_USEDEP}]
-		dev-util/cppunit
-		net-irc/ngircd
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove_debug_cflags.patch"
-	"${FILESDIR}/${P}-use_qt5_libcommuni.patch"
-)
-
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup spectrum
-	enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
-
-	use test && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Respect users LDFLAGS
-	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
-
-	# Respect users CFLAGS, when compiling for debug mode
-	# Since Spectrum2 searches for a qt4 compiled libcommuni,
-	# it must be patched, to find the qt5 compiled libcommuni,
-	# See: https://github.com/SpectrumIM/spectrum2/pull/253
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
-	local mycmakeargs=(
-		-DENABLE_DOCS="$(usex doc)"
-		-DENABLE_FROTZ="$(usex frotz)"
-		-DENABLE_IRC="$(usex irc)"
-		-DENABLE_MYSQL="$(usex mysql)"
-		-DENABLE_PQXX="$(usex postgres)"
-		-DENABLE_PURPLE="$(usex purple)"
-		-DENABLE_SMSTOOLS3="$(usex sms)"
-		-DENABLE_SQLITE3="$(usex sqlite)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_TWITTER="$(usex twitter)"
-		-DENABLE_XMPP="$(usex xmpp)"
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd tests/libtransport && "${EPYTHON}" ../start.py || die
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	diropts -o spectrum -g spectrum
-	keepdir /var/log/spectrum2 /var/lib/spectrum2
-	diropts
-
-	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
-	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
-	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf
-
-	einstalldocs
-}