From 8be70107efbb417f839292165ee39d07a062046f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jan 2018 06:19:51 +0000 Subject: gentoo resync : 13.01.2018 --- dev-libs/log4cplus/Manifest | 4 ++-- dev-libs/log4cplus/log4cplus-1.2.0.ebuild | 23 +++++++++++++---------- dev-libs/log4cplus/metadata.xml | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) (limited to 'dev-libs/log4cplus') diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest index f68286ff053f..d2580cc38655 100644 --- a/dev-libs/log4cplus/Manifest +++ b/dev-libs/log4cplus/Manifest @@ -2,5 +2,5 @@ AUX log4cplus-1.2.0-fix-c++14.patch 897 BLAKE2B c4067272e84b2e442ef61c5468734ee9 DIST log4cplus-1.1.3-rc7.tar.bz2 562969 BLAKE2B c67365a3e12b037014b9ec876b5725d74cd3856fa92aacb084dc3fad8557eb1b5c49a77fb5abf0833ee99bdcd646fea1f09bbd14fc7aa8b574ff396424195cfc SHA512 6854a966dfd5a2b807778e34957ea33c43a340b8be71a1a989941ec6c6fdc22d181dc2f0bb0e87910c77417a9f5c4f07d4fbd8f13eadffe82adef10a1e00ef02 DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626 EBUILD log4cplus-1.1.3_rc7.ebuild 1693 BLAKE2B 5cf2c0d0b6e8d4a110e7a9c2555184d05e037e7ab5d996267841314acb0668cf173237363db44a65a863cb3277e2ff72358ad5d582b9a72748bf24773d8e72bb SHA512 39023966bd1b696e5c8d7a7739f7323b78eb60018869bfb59698cf51abe5ebe3577fcc65c5dc0e0b3ac53666839360db60d9ccb8ab63a996bd7f7700c366e66d -EBUILD log4cplus-1.2.0.ebuild 1553 BLAKE2B 3b52ff63445820be20d86cf22fcb53203aee735676484f8470db1d30efb83728f254fb709873259eae766d49323e1db7d1e47a700d62a1bc70cf63513f5c6e8d SHA512 cf300f50eb336f3c430d148f52b7ba838c13790b6a1c669afafc43bc218900fc730ed86693034827052e9f497edf17d52c09c92b1f5fc1a16caad3d4e94ca3b6 -MISC metadata.xml 690 BLAKE2B d49b395a962f0f8b1e0fceec5ae8bc602b770556c30ad6dc8fc0725b1c230ed9c8f2d2f503d5b2cd250051d8dd07a9f716f9d077e6081bd0cdbbf6912dd217a1 SHA512 21d2eabfdb5675aad9e9be7aa237b570ef78abe4e4f7142d1e8d638b2854e07e1e51724316abb7f796419da6f5a2e03dd09f26d1d2fe17b17c961c8c8e2551da +EBUILD log4cplus-1.2.0.ebuild 1593 BLAKE2B d8b6eeea0ca194e78461cdee7ac8d695d5a2265c7e7c25447adcc72db328b48672089ae1c96e6dbb32702be1edd1c7ddb1da4c5df41ca75b51db2efb9cd05271 SHA512 63614e3b68805a4f01b710f6c56a82e4bfffad86477e2e326da6c27fde9361b7a0c70562708b17b446c12196a5502490e50ceecadcb8a3079d20391c5b9ee1b6 +MISC metadata.xml 749 BLAKE2B 896a9b8fb91d74d3ddcad1b2d775ad65cb0de33a16961fd96096ba7ab59cf624a83a01c13f1263f17eaeb8ee578474fe067ac1e13d2a0f991b1988081c325ce5 SHA512 9fd7d13a36875f50fa784dd61b775cda0834d8e76302b9e6a6fec6e843131b869831ce4d9eb5c93c6b3eb1c58bf3514b4d5b6c3ac9bf70c95cd877d28b29fa96 diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild index 20d7a8533148..2ba2caac6fc9 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 99ab0fff8a6c..ccbce42becd1 100644 --- a/dev-libs/log4cplus/metadata.xml +++ b/dev-libs/log4cplus/metadata.xml @@ -8,6 +8,7 @@ Use inconv for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation + log4cplus/log4cplus log4cplus -- cgit v1.2.3