[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

[Michael Palimaka]

commit:     1621ee760ff8b1b45751424efc762fc427fd6b19
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 10:45:12 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 10:45:23 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1621ee76

net-libs/jreen: sync with main tree

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/jreen/jreen-9999.ebuild | 52 +++++++---------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

diff --git a/net-libs/jreen/jreen-9999.ebuild b/net-libs/jreen/jreen-9999.ebuild
index 28f97670c7..e71c537a02 100644
--- a/net-libs/jreen/jreen-9999.ebuild
+++ b/net-libs/jreen/jreen-9999.ebuild
@@ -8,66 +8,32 @@ if [[ ${PV} != *9999* ]]; then
        KEYWORDS="~amd64 ~ppc ~x86"
 else
        GIT_ECLASS="git-r3"
-       EGIT_REPO_URI=( "https://github.com/euroelessar/${PN}"; )
+       EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git";
 fi
 
-inherit cmake-utils multibuild ${GIT_ECLASS}
+inherit cmake-utils ${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 )"
+IUSE="debug"
 
 DEPEND="
+       dev-qt/qtcore:5
+       dev-qt/qtnetwork:5
        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_test() {
-       multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-       multibuild_foreach_variant cmake-utils_src_install
+       local mycmakeargs=(
+               -DJREEN_FORCE_QT4=OFF
+       )
+       cmake-utils_src_configure
 }