[gentoo-commits] repo/gentoo:master commit in: dev-libs/log4cplus/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     9eea36bc497a1c78db4523f6f6b997fce150aea4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 22:59:45 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 23:00:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eea36bc

dev-libs/log4cplus: Switch to Qt5

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/log4cplus/log4cplus-1.2.0.ebuild | 23 +++++++++++++----------
 dev-libs/log4cplus/metadata.xml           |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
index 20d7a853314..2ba2caac6fc 100644
--- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
+++ b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
-HOMEPAGE="http://log4cplus.sourceforge.net/"
+HOMEPAGE="http://log4cplus.sourceforge.net/ https://github.com/log4cplus/log4cplus"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0/1.2-5"
 KEYWORDS="~amd64 ~x86"
-IUSE="iconv qt4 threads working-locale working-c-locale"
+IUSE="iconv qt5 threads working-locale working-c-locale"
 REQUIRED_USE="?? ( iconv working-locale working-c-locale )"
 
-RDEPEND="iconv? ( virtual/libiconv )
-	qt4? ( dev-qt/qtcore:4 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 PATCHES=( "${FILESDIR}/${PN}-1.2.0-fix-c++14.patch" )
 
 src_configure() {
 	econf \
 		--disable-static \
-		$(use_enable threads) \
 		$(use_with iconv) \
+		$(use_with qt5) \
+		$(use_enable threads) \
 		$(use_with working-locale) \
-		$(use_with working-c-locale) \
-		$(use_with qt4 qt)
+		$(use_with working-c-locale)
 }
 
 src_test() {

diff --git a/dev-libs/log4cplus/metadata.xml b/dev-libs/log4cplus/metadata.xml
index 99ab0fff8a6..ccbce42becd 100644
--- a/dev-libs/log4cplus/metadata.xml
+++ b/dev-libs/log4cplus/metadata.xml
@@ -8,6 +8,7 @@
 		<flag name="iconv">Use inconv for wchar_t &lt;-&gt; char conversions. See also log4cplus's unicode.txt documentation</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">log4cplus/log4cplus</remote-id>
 		<remote-id type="sourceforge">log4cplus</remote-id>
 	</upstream>
 </pkgmetadata>