From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3529313877A for ; Thu, 24 Jul 2014 22:35:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC66BE0DBF; Thu, 24 Jul 2014 22:30:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1DEE6E0BE5 for ; Thu, 24 Jul 2014 22:30:18 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F0AE340D21 for ; Thu, 24 Jul 2014 01:05:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7DAE6193E6 for ; Thu, 24 Jul 2014 01:05:04 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1406156369.6c66f6520c0c69d32f1e3fc833ac846f67b0d38c.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/qtcore-5.3.1.ebuild dev-qt/qtcore/qtcore-5.3.9999.ebuild dev-qt/qtcore/qtcore-5.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 6c66f6520c0c69d32f1e3fc833ac846f67b0d38c X-VCS-Branch: master Date: Thu, 24 Jul 2014 01:05:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 01825472-7973-470b-98d3-4e925c9a46b5 X-Archives-Hash: daa1d982a591c59871a6efd78197e5c4 commit: 6c66f6520c0c69d32f1e3fc833ac846f67b0d38c Author: Davide Pesavento gentoo org> AuthorDate: Wed Jul 23 22:59:29 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Jul 23 22:59:29 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6c66f652 [dev-qt/qtcore:5] Convert to QT5_GENTOO_CONFIG. And remove redundant -iconv, now specified by eclass. Package-Manager: portage-2.2.10 --- dev-qt/qtcore/qtcore-5.3.1.ebuild | 13 +++-------- dev-qt/qtcore/qtcore-5.3.9999.ebuild | 13 +++-------- dev-qt/qtcore/qtcore-5.9999.ebuild | 44 +++--------------------------------- 3 files changed, 9 insertions(+), 61 deletions(-) diff --git a/dev-qt/qtcore/qtcore-5.3.1.ebuild b/dev-qt/qtcore/qtcore-5.3.1.ebuild index 8d12ffd..3ed8bb6 100644 --- a/dev-qt/qtcore/qtcore-5.3.1.ebuild +++ b/dev-qt/qtcore/qtcore-5.3.1.ebuild @@ -33,21 +33,14 @@ QT5_TARGET_SUBDIRS=( src/tools/rcc src/corelib ) -QCONFIG_DEFINE=( QT_ZLIB ) -pkg_setup() { - QCONFIG_REMOVE=( - $(usev !glib) - $(usev !icu) - ) - - qt5-build_pkg_setup -} +QT5_GENTOO_CONFIG=( + ::ZLIB +) src_configure() { local myconf=( $(qt_use glib) - -iconv $(qt_use icu) ) qt5-build_src_configure diff --git a/dev-qt/qtcore/qtcore-5.3.9999.ebuild b/dev-qt/qtcore/qtcore-5.3.9999.ebuild index 8d12ffd..3ed8bb6 100644 --- a/dev-qt/qtcore/qtcore-5.3.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.3.9999.ebuild @@ -33,21 +33,14 @@ QT5_TARGET_SUBDIRS=( src/tools/rcc src/corelib ) -QCONFIG_DEFINE=( QT_ZLIB ) -pkg_setup() { - QCONFIG_REMOVE=( - $(usev !glib) - $(usev !icu) - ) - - qt5-build_pkg_setup -} +QT5_GENTOO_CONFIG=( + ::ZLIB +) src_configure() { local myconf=( $(qt_use glib) - -iconv $(qt_use icu) ) qt5-build_src_configure diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild index 0395893..3ed8bb6 100644 --- a/dev-qt/qtcore/qtcore-5.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.9999.ebuild @@ -33,53 +33,15 @@ QT5_TARGET_SUBDIRS=( src/tools/rcc src/corelib ) -QCONFIG_DEFINE=( QT_ZLIB ) -pkg_setup() { - QCONFIG_REMOVE=( - $(usev !glib) - $(usev !icu) - ) - - qt5-build_pkg_setup -} +QT5_GENTOO_CONFIG=( + ::ZLIB +) src_configure() { local myconf=( $(qt_use glib) - -iconv $(qt_use icu) ) qt5-build_src_configure } - -# Test dependencies -# -# kernel/qobject/test/test.pro: network -# kernel/qpointer/qpointer.pro: widgets (opt) -# kernel/qmetaproperty/qmetaproperty.pro: gui -# kernel/qeventloop/qeventloop.pro: network -# kernel/qsocketnotifier/qsocketnotifier.pro: network -# kernel/qsignalmapper/qsignalmapper.pro: gui? -# kernel/qmetaobject/qmetaobject.pro: gui -# kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro: gui -# kernel/qmimedata/qmimedata.pro: gui? -# codecs/qtextcodec/test/test.pro: gui? -# xml/qxmlstream/qxmlstream.pro: xml network -# itemmodels/qabstractitemmodel/qabstractitemmodel.pro: gui? -# itemmodels/qitemselectionmodel/qitemselectionmodel.pro: widgets -# itemmodels/qabstractproxymodel/qabstractproxymodel.pro: gui? -# itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro: gui widgets -# itemmodels/qidentityproxymodel/qidentityproxymodel.pro: gui? -# itemmodels/qitemmodel/qitemmodel.pro: widgets sql -# statemachine/qstatemachine/qstatemachine.pro: gui widgets (opt) -# animation/qparallelanimationgroup/qparallelanimationgroup.pro: gui -# animation/qpauseanimation/qpauseanimation.pro: gui -# animation/qpropertyanimation/qpropertyanimation.pro: gui widgets -# io/qiodevice/qiodevice.pro: network -# io/qsettings/qsettings.pro: gui -# io/qprocess/testGuiProcess/testGuiProcess.pro: widgets -# io/qprocess/test/test.pro: network -# io/qtextstream/test/test.pro: network -# io/qdatastream/qdatastream.pro: gui? -# io/qfile/test/test.pro: network