From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- dev-qt/qtcore/Manifest | 6 +-- dev-qt/qtcore/qtcore-4.8.7-r3.ebuild | 92 ------------------------------------ dev-qt/qtcore/qtcore-4.8.7-r4.ebuild | 92 ++++++++++++++++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.7.1-r3.ebuild | 48 ------------------- dev-qt/qtcore/qtcore-5.7.1-r4.ebuild | 50 ++++++++++++++++++++ dev-qt/qtcore/qtcore-5.9.4-r1.ebuild | 73 ---------------------------- dev-qt/qtcore/qtcore-5.9.4-r2.ebuild | 75 +++++++++++++++++++++++++++++ 7 files changed, 220 insertions(+), 216 deletions(-) delete mode 100644 dev-qt/qtcore/qtcore-4.8.7-r3.ebuild create mode 100644 dev-qt/qtcore/qtcore-4.8.7-r4.ebuild delete mode 100644 dev-qt/qtcore/qtcore-5.7.1-r3.ebuild create mode 100644 dev-qt/qtcore/qtcore-5.7.1-r4.ebuild delete mode 100644 dev-qt/qtcore/qtcore-5.9.4-r1.ebuild create mode 100644 dev-qt/qtcore/qtcore-5.9.4-r2.ebuild (limited to 'dev-qt/qtcore') diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index c5034524dc88..b283bc27a806 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -9,7 +9,7 @@ AUX qtcore-5.7.1-qsfpm-2.patch 7812 BLAKE2B d2cafac754d28cb7a13a15cf75dcb323a5de DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd -EBUILD qtcore-4.8.7-r3.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875 -EBUILD qtcore-5.7.1-r3.ebuild 896 BLAKE2B 5d6c21f0a1de4db39fb89d34c2112fbb4f88130f884d5dc2b9bb8b4d4ceec7d265c68a210689b3ca7ac48c726954846e6512bacc0e4707fa51cdd7a3a8c12791 SHA512 bd5fd8e6a9a189773f4c5473d0073709f034b661a28296a8f4d3cac4d26eaf63f04e4b0d08028810b77ca10bfe8c67aaf6c4cf2da7a436e2b29f9b04024cb158 -EBUILD qtcore-5.9.4-r1.ebuild 1464 BLAKE2B dbf7cf4f18ba4fdd005d0a86f74aab67f3cb4d711a715a0fb8098b85f4694ee898b7c030b8d199b6cdc9cd9a251483456b8c3ed92b1c0f1609839dbe741fc7c9 SHA512 27aff99d26259f42bf9abb266c101559d679c123ee18b459fb45526a56af4a48b2964ea6d98b796c9fd0cdf46ffefd616f3a81e988fe6d5b9cbabf3679cb9011 +EBUILD qtcore-4.8.7-r4.ebuild 2866 BLAKE2B 323682baab556e3eca23f3c31d872fdb0b7d06d95be41b132b76793d4b3c99b983fba67861629a2cbef3f997b6d46c22816a43c30031f3f9fd1a399c72e9cfc0 SHA512 fe03ae3835572bf39090010e9740e3174c0b5eb2d1ea92b5fadc7d498c29c8ebfe21d86bc9b2783ab2c6957a28f0e65f1a57c36b903ce16bdb9e2cb0328e1875 +EBUILD qtcore-5.7.1-r4.ebuild 925 BLAKE2B c622dd04c5eb8855773a637040f79a557a250e4fe077c65499edcc7cbd9168e9b548a2b6c280e003402f8a6c2e1048bc07fdf66e3c49021d2092b7c7d1e00071 SHA512 d0edfb903c4083cbad0456203d29301e46737c74471d857c017aed3c27f6b2d46f822674f9b999c3f17e511f9b482c85eb44044e30fcefdcec7ff20d2bcfddb1 +EBUILD qtcore-5.9.4-r2.ebuild 1493 BLAKE2B c498e316435cc6074e1d059fe8aa8e37a75ca7611c5b7a24cf0f898130211ded2ad46a891904a76f4f1ef7eaceade32e6b91a74c789afed795b6b8f8ae8f583d SHA512 d5c957ddd28e1bcbe06af212cd07ae880fc750dca8133dffbfb3b54327b7ca387117a66cb51ca562ac2fefc3faa5573d31c1de183dcb05ce0d184cdc88923d9f MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild deleted file mode 100644 index 86ae786cc2ce..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+glib iconv icu libressl qt3support ssl" - -DEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] ) - icu? ( =dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND="${DEPEND}" -PDEPEND=" - ~dev-qt/qttranslations-${PV} - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/qt4/Qt/qconfig.h - /usr/include/qt4/QtCore/qconfig.h -) - -PATCHES=( - "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 - "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968 - "${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796 - "${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394 -) - -QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/network - src/xml - src/plugins/codecs/cn - src/plugins/codecs/jp - src/plugins/codecs/kr - src/plugins/codecs/tw - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - -QCONFIG_DEFINE="QT_ZLIB" - -src_prepare() { - qt4-build-multilib_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - qmake/Makefile.unix || die "sed qmake/Makefile.unix failed" - - # bug 427782 - sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ - qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed" - sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \ - -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \ - configure || die "sed configure setBootstrapVariable failed" -} - -multilib_src_configure() { - local myconf=( - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild new file mode 100644 index 000000000000..86ae786cc2ce --- /dev/null +++ b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit qt4-build-multilib + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT4_BUILD_TYPE} == release ]]; then + KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" +fi + +IUSE="+glib iconv icu libressl qt3support ssl" + +DEPEND=" + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) + iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] ) + icu? ( =dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + ) +" +RDEPEND="${DEPEND}" +PDEPEND=" + ~dev-qt/qttranslations-${PV} + qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/qt4/Qt/qconfig.h + /usr/include/qt4/QtCore/qconfig.h +) + +PATCHES=( + "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 + "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968 + "${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796 + "${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394 +) + +QT4_TARGET_DIRECTORIES=" + src/tools/bootstrap + src/tools/moc + src/tools/rcc + src/tools/uic + src/corelib + src/network + src/xml + src/plugins/codecs/cn + src/plugins/codecs/jp + src/plugins/codecs/kr + src/plugins/codecs/tw + tools/linguist/lconvert + tools/linguist/lrelease + tools/linguist/lupdate" + +QCONFIG_DEFINE="QT_ZLIB" + +src_prepare() { + qt4-build-multilib_src_prepare + + # bug 172219 + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + qmake/Makefile.unix || die "sed qmake/Makefile.unix failed" + + # bug 427782 + sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ + qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed" + sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \ + -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \ + configure || die "sed configure setBootstrapVariable failed" +} + +multilib_src_configure() { + local myconf=( + -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon + -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative + -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg + -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg + -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes + -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb + $(qt_use glib) + $(qt_use iconv) + $(qt_use icu) + $(use ssl && echo -openssl-linked || echo -no-openssl) + $(qt_use qt3support) + ) + qt4_multilib_src_configure +} diff --git a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild deleted file mode 100644 index f68f4635ff7b..000000000000 --- a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild +++ /dev/null @@ -1,48 +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" - -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 - "${FILESDIR}"/${P}-qipm.patch - "${FILESDIR}"/${P}-qsfpm-{1,2}.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-r4.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild new file mode 100644 index 000000000000..cbc2d6de22ea --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.7.1-r4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2018 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} + !> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die - - #if defined(QT_NO_${flag}) && defined(QT_${flag}) - # undef QT_NO_${flag} - #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) - # define QT_NO_${flag} - #endif - _EOF_ - done -} diff --git a/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild new file mode 100644 index 000000000000..9e4d7aab4e2b --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2018 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/libpcre2[pcre16,unicode] + sys-libs/zlib + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + !> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +} -- cgit v1.2.3