gentoo resync : 05.04.2019

5 files changed, 4 insertions, 120 deletions

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index f9bbbfffc882..2d285ddd06e3 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,8 +1,6 @@
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
-AUX spectrum2.tmpfiles 44 BLAKE2B c0cef689f5b483d16461bf50edbe8a17c8269440a43a3ccf04c45e028704ad4861e7bd340b85b0daf11b5e41a51e19fd04f2dcd1f2446e00b9a6a3b1e08d2206 SHA512 b995bf8c97a98dc6c887d6d4bb4b53cfee85461cfe65770013d2a412729d164894201ad0e3b69868b94c159ecd524d7bd0eccfedbc27c81969c3ed640ae32785
+AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.10.1.tar.gz 844983 BLAKE2B f10a057f35ecb865497e26b6d31d37c895b351d7c93e7c00bf9d58bf855b49ee1ce0acbeab841a442ab2ab702b022675ca4478521ecac2f6d0bdb9d7e00b9060 SHA512 dde84e67b2ade8649a38027c398defd4dc911ed402e913779aca0b29aa801f1c17ef89b1b3abf91c3189e75b32e9162d6e9d52f90ce537091b65fb791a826357
-DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c
-EBUILD spectrum2-2.0.10.1.ebuild 2525 BLAKE2B f6c455a26decab2f981213787da79ae98e966d6e8f79ab7a00bb998ade5291b4bdf9da0da8292fd584e085ca74533629fce782ddee7b27de1df4f79bc9812f53 SHA512 d372627f27f1f7ccfda8f092e07f46fec855532232c6ee4617c64873edcc99cd4aa3de2b1dde555f23d0b458e2a798e106174786fbadb314150e34cd0817c04f
-EBUILD spectrum2-2.0.10.ebuild 2525 BLAKE2B f6c455a26decab2f981213787da79ae98e966d6e8f79ab7a00bb998ade5291b4bdf9da0da8292fd584e085ca74533629fce782ddee7b27de1df4f79bc9812f53 SHA512 d372627f27f1f7ccfda8f092e07f46fec855532232c6ee4617c64873edcc99cd4aa3de2b1dde555f23d0b458e2a798e106174786fbadb314150e34cd0817c04f
+EBUILD spectrum2-2.0.10.1-r1.ebuild 2528 BLAKE2B 4c9b9a772c35c02c636b36b42a97bb0b5fc7cec9b102caa907aa93dca5d2bb35fbaec0b6387cddbb0304b9ea72ff52e90b78426f5ef53da36268fdeaa0021094 SHA512 410db756dd05a0235de56e71997e83647d0992dad992b550dd36b7cd65db5317bd38cb0ea2963769c714899de9f24bae7263fbd8bcb5d91c7d7d55cf81d9190f
 MISC metadata.xml 1259 BLAKE2B e885a8348122a70994d3b04387d64fa88d2e02075554849d427f18b2b39b6ae1eeab543066cd587031f8eae9842f0d727f297d7b6cbe744c8d1424d9fb3640ce SHA512 be2129a4b76017ce3d84aa48589d54ac3863e1d9b7a1aa2a5d98341f962bda3f2e9507497056add0b4f280545ed0c511c8f50eff35d46cf9cadd2c6fba7b5ed6
diff --git a/net-im/spectrum2/files/spectrum2.tmpfiles b/net-im/spectrum2/files/spectrum2.tmpfiles
deleted file mode 100644
index 4ce6f1c3ca75..000000000000
--- a/net-im/spectrum2/files/spectrum2.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/spectrum2 0700 specturm spectrum - -
diff --git a/net-im/spectrum2/files/spectrum2.tmpfiles-r1 b/net-im/spectrum2/files/spectrum2.tmpfiles-r1
new file mode 100644
index 000000000000..90c020f13d9d
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2.tmpfiles-r1
@@ -0,0 +1 @@
+d /run/spectrum2 0700 spectrum spectrum - -
diff --git a/net-im/spectrum2/spectrum2-2.0.10.1.ebuild b/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
index 317a25b2ab55..d528d2460792 100644
--- a/net-im/spectrum2/spectrum2-2.0.10.1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild
@@ -108,7 +108,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
 	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
-	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf
+	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
 
 	einstalldocs
 }
diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild
deleted file mode 100644
index 317a25b2ab55..000000000000
--- a/net-im/spectrum2/spectrum2-2.0.10.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-libs/boost:=[nls]
-	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
-	)
-"
-
-# 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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	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
-}