From efdcc72fba7a1140422277426d2cca29c24f5e23 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sat, 18 Mar 2017 17:44:57 +1100 Subject: dev-qt/qtcore: move system-doubleconversion handling to the eclass Gentoo-bug: 581054 --- dev-qt/qtcore/qtcore-5.7.1-r1.ebuild | 44 ------------------------------------ dev-qt/qtcore/qtcore-5.7.1-r2.ebuild | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 dev-qt/qtcore/qtcore-5.7.1-r1.ebuild create mode 100644 dev-qt/qtcore/qtcore-5.7.1-r2.ebuild (limited to 'dev-qt/qtcore') diff --git a/dev-qt/qtcore/qtcore-5.7.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r1.ebuild deleted file mode 100644 index 1b5fd5386e9d..000000000000 --- a/dev-qt/qtcore/qtcore-5.7.1-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -fi - -IUSE="icu systemd" - -# TODO after bug 581054: dev-libs/double-conversion:= -DEPEND=" - dev-libs/glib:2 - >=dev-libs/libpcre-8.38[pcre16,unicode] - >=sys-libs/zlib-1.2.5 - virtual/libiconv - icu? ( dev-libs/icu:= ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-5.6.2-plugins.patch" ) - -QT5_TARGET_SUBDIRS=( - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/corelib - src/tools/qlalr - doc -) - -src_configure() { - local myconf=( - $(qt_use icu) - $(qt_use systemd journald) - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtcore/qtcore-5.7.1-r2.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r2.ebuild new file mode 100644 index 000000000000..524443a71bad --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.7.1-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +fi + +IUSE="icu systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + >=dev-libs/libpcre-8.38[pcre16,unicode] + >=sys-libs/zlib-1.2.5 + virtual/libiconv + icu? ( dev-libs/icu:= ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-5.6.2-plugins.patch" ) + +QT5_TARGET_SUBDIRS=( + src/tools/bootstrap + src/tools/moc + src/tools/rcc + src/corelib + src/tools/qlalr + doc +) + +src_configure() { + local myconf=( + $(qt_use icu) + $(qt_use systemd journald) + ) + qt5-build_src_configure +} -- cgit v1.2.3-65-gdbad