gentoo resync : 01.12.2017

3 files changed, 40 insertions, 74 deletions

diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest
index 1f2924f9ef23..6235fe9d27b3 100644
--- a/net-libs/jreen/Manifest
+++ b/net-libs/jreen/Manifest
@@ -1,3 +1,3 @@
 DIST jreen-1.3.0.tar.gz 287827 SHA256 f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e SHA512 7b8267aa7d0e18c28dfeb6a1c7c0495d87bd2712fe10a0c6283f0cf89b72d2c67f98f97a812c9f34496af43eb00ddd94b7e60e942634fb03d0119f94a3d08464 WHIRLPOOL 6a6e0f469e344eab2f0c745411091867bddeaeabf0dad8ff8ebb58521d1d9a0b07d6bb389fb9cf937cfc2974b834951baf4de514eef6ae5c087f72c6c0d6f604
-EBUILD jreen-1.3.0.ebuild 1364 BLAKE2B 719a7c7c26b887cd7e4f043d7601764b50854874fda2f2937ef7ac8e89d04e2d4dae8e5dd0c543972c994faf3d22ad52555f8cc0618dfd58f5d60deaa0abded7 SHA512 5df25a082f5112b2f32ed4f3ef2d59335db868023f1eb4259adf5f635ea237144cb6a0dd430f76fb6367ceafc1d883dc027134dfc82bbbf707bc204bcfdd282e
+EBUILD jreen-1.3.0-r1.ebuild 756 BLAKE2B 0d26d8c4d3d59778260f9115b9fc11e1317f37da3417df3e0f927e26e6f64c8c68c89dbb909c5bf64fc88b3b42c651a408bb674ec8901fe64d066e3349762f50 SHA512 0357cbce2b6e4f75c5402f30b1affe715d01b9af86130542c1671e69f0c2747f4cf31f2b5af073b5b0a6eb08e6ac6b84af08d1b74af3ecfd6b5157a45472364a
 MISC metadata.xml 331 BLAKE2B 7b2a944d9d2af106a11e08cf6a7840acb1ef2a0464d43f56a32148c9edbace174b4b9cedcd4b58a442f6c99fb2a3a45d0e75c33ed7e900b424f0d4c7256163ea SHA512 0fdd8e27d2048fc9430b7f0e079794298095dc3987fe7bfedb81dbc6fb85490fd0642f6f7b1d669a00b2a657b64b0b7b0f155d9787f5082954ad2c840355d301
diff --git a/net-libs/jreen/jreen-1.3.0-r1.ebuild b/net-libs/jreen/jreen-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..d8834856d8fb
--- /dev/null
+++ b/net-libs/jreen/jreen-1.3.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git"
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Qt XMPP library"
+HOMEPAGE="https://github.com/euroelessar/jreen"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	media-libs/speex
+	net-libs/libgsasl
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DJREEN_FORCE_QT4=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-libs/jreen/jreen-1.3.0.ebuild b/net-libs/jreen/jreen-1.3.0.ebuild
deleted file mode 100644
index aea62ff61251..000000000000
--- a/net-libs/jreen/jreen-1.3.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git"
-fi
-
-inherit cmake-utils multibuild ${GIT_ECLASS}
-
-DESCRIPTION="Qt XMPP library"
-HOMEPAGE="https://github.com/euroelessar/jreen"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
-	media-libs/speex
-	net-libs/libgsasl
-	sys-libs/zlib
-	qt4? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=( -DJREEN_FORCE_QT4=ON )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=( -DJREEN_FORCE_QT4=OFF )
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}