[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2022-02-20 Thread Davide Pesavento
commit: beea7f325d1d39a57791babf68621ee8ef61339e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Feb 20 18:16:44 2022 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Feb 20 18:17:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beea7f32

dev-qt/qt-creator: drop old 4.15.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 dev-qt/qt-creator/metadata.xml |   2 -
 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 233 -
 3 files changed, 236 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 5c1ec986bbb7..8613fc7c9b88 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
 DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 
8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348
 SHA512 
4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index d2e6af3e1338..51e112b750a3 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -40,8 +40,6 @@
Build plugin for Qbs-based projects
Build plugin for qmake-based projects
Build plugins for QML-based development 
(designer, editor, project manager)
-   Enable designer for QML/QtQuick-based 
UIs
-   Build the QML/JavaScript editor plugin
Build the QML profiler plugin
Build plugin for QNX devices
Build plugin for deployment and 
execution on a remote Linux host

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
deleted file mode 100644
index 18260cba5420..
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=12
-PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/";
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
-else
-   MY_PV=${PV/_/-}
-   MY_P=${PN}-opensource-src-${MY_PV}
-   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
-   S=${WORKDIR}/${MY_P}
-   KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
-   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
-   ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
-   modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
-   +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
-   subversion valgrind webassembly)
-IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-   android? ( lsp )
-   boot2qt? ( remotelinux )
-   clang? ( test? ( qbs ) )
-   mcu? ( baremetal cmake )
-   python? ( lsp )
-   qmldesigner? ( qmljs )
-   qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.14:5"
-
-BDEPEND="
-   >=dev-qt/linguist-tools-${QT_PV}
-   virtual/pkgconfig
-   doc? ( >=dev-qt/qdoc-${QT_PV} )
-"
-CDEPEND="
-   >=dev-qt/qtconcurrent-${QT_PV}
-   >=dev-qt/qtcore-${QT_PV}
-   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
-   >=dev-qt/qtgui-${QT_PV}
-   >=dev-qt/qtnetwork-${QT_PV}[ssl]
-   >=dev-qt/qtprintsupport-${QT_PV}
-   >=dev-qt/qtquickcontrols-${QT_PV}
-   >=dev-qt/qtscript-${QT_PV}
-   >=dev-qt/qtsql-${QT_PV}[sqlite]
-   >=dev-qt/qtsvg-${QT_PV}
-   >=dev-qt/qtwidgets-${QT_PV}
-   >=dev-qt/qtx11extras-${QT_PV}
-   >=dev-qt/qtxml-${QT

[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-12-02 Thread Davide Pesavento
commit: ee5c7cfd547fc879526903d8cadacd6c4d530d41
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec  2 19:30:54 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Thu Dec  2 19:31:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee5c7cfd

dev-python/sip: add 6.5.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest |  1 +
 dev-python/sip/sip-6.5.0.ebuild | 32 
 2 files changed, 33 insertions(+)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 5245e1f641ff..52c9a17c715e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,4 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
 DIST sip-6.4.0.tar.gz 1201890 BLAKE2B 
be5ccdfa7853eb2baa3b7c4e7f64a315e39ef899631e93569d75ed27bbf9752c97cca1bfd6c813efb0046d1d82fc8c5625a04f08c330a4e2c102461f3a42beee
 SHA512 
eec1bdbe4ef3d8ba5152a2dcd888efc23498bcbee01c95b7eb72074c2a133d8e8599cc4bb6d6b2fec99f093a73705e0fea1c148c2e49058c0fd6f2ba97f40884
+DIST sip-6.5.0.tar.gz 1202004 BLAKE2B 
a67ba784c0851a528fded689cc2a84fa18ba906d23adb71fceab14e652c02b079ce7d3b40a3594251852d20875ac53571e851630e441b8846c302772933b1829
 SHA512 
3baa20403b668e5f02b2506a693522ce421080e073ac39f62a23823b3e023b0b88fc60ab79e2301ecc39304f6df3d8647adc56429641e91c217fecea9bfacb91

diff --git a/dev-python/sip/sip-6.5.0.ebuild b/dev-python/sip/sip-6.5.0.ebuild
new file mode 100644
index ..f917f011
--- /dev/null
+++ b/dev-python/sip/sip-6.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ 
https://pypi.org/project/sip/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+   !

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-12-02 Thread Davide Pesavento
commit: 53ee29848e4a7b874b9c53fffabe87cb193f1a2a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec  2 19:08:57 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Thu Dec  2 19:08:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ee2984

dev-qt/qt-creator: bump to 6.0.0

Closes: https://bugs.gentoo.org/807580
Closes: https://bugs.gentoo.org/801922
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest|   1 +
 dev-qt/qt-creator/qt-creator-6.0.0.ebuild | 231 ++
 2 files changed, 232 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 975ecb0a7d27..5c1ec986bbb7 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
+DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 
8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348
 SHA512 
4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb

diff --git a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
new file mode 100644
index ..f8eca8f995f6
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=13
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/";
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
+else
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-opensource-src-${MY_PV}
+   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
+   S=${WORKDIR}/${MY_P}
+   KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
+   clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker +git glsl:glsleditor +help incredibuild
+   +lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager 
modeling:modeleditor nim perforce perfprofiler python
+   qbs:qbsprojectmanager +qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind webassembly)
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+   android? ( lsp )
+   boot2qt? ( remotelinux )
+   clang? ( lsp )
+   mcu? ( baremetal cmake )
+   python? ( lsp )
+   qml? ( qmake )
+   qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.15:5"
+
+BDEPEND="
+   >=dev-qt/linguist-tools-${QT_PV}
+   virtual/pkgconfig
+   doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+CDEPEND="
+   >=dev-qt/qtconcurrent-${QT_PV}
+   >=dev-qt/qtcore-${QT_PV}
+   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
+   >=dev-qt/qtgui-${QT_PV}
+   >=dev-qt/qtnetwork-${QT_PV}[ssl]
+   >=dev-qt/qtprintsupport-${QT_PV}
+   >=dev-qt/qtquickcontrols-${QT_PV}
+   >=dev-qt/qtscript-${QT_PV}
+   >=dev-qt/qtsql-${QT_PV}[sqlite]
+   >=dev-qt/qtsvg-${QT_PV}
+   >=dev-qt/qtwidgets-${QT_PV}
+   >=dev-qt/qtx11extras-${QT_PV}
+   >=dev-qt/qtxml-${QT_PV}
+   >=kde-frameworks/syntax-highlighting-5.87:5
+   clang? (
+   >=dev-cpp/yaml-cpp-0.6.2:=
+   || (
+   sys-devel/clang:13
+   sys-devel/clang:12
+   sys-devel/clang:11
+   )
+   =dev-qt/designer-${QT_PV} )
+   help? (
+   >=dev-qt/qthelp-${QT_PV}
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+   )
+   perfprofiler? ( dev-libs/elfutils )
+   serialterminal? ( >=dev-qt/qtserialport-${

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-28 Thread Davide Pesavento
commit: 70f35cac6407c88c051c2f6e9326457de6acf194
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:22:16 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f35cac

dev-qt/qt-creator: various test fixes

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 10d2dbc089f4..c199ce2d341b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -36,7 +36,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
android? ( lsp )
boot2qt? ( remotelinux )
-   clang? ( lsp test? ( qbs ) )
+   clang? ( lsp )
mcu? ( baremetal cmake )
python? ( lsp )
qnx? ( remotelinux )
@@ -152,7 +152,7 @@ src_prepare() {
if ! use qml; then
sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' 
src/libs/libs.pro || die
sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-   sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
+   sed -i -e '/qmldesigner\|qmlprojectmanager/d' 
tests/auto/qml/qml.pro || die
fi
if ! use valgrind; then
sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
@@ -166,9 +166,12 @@ src_prepare() {
 
# disable broken or unreliable tests
sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-   sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' 
tests/auto/debugger/debugger.pro || die
+   sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
sed -i -e '/CONFIG -=/s/$/ testcase/' 
tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || 
die
-   sed -i -e 's/\//' tests/auto/qml/codemodel/codemodel.pro || die
+   sed -i -e '/reformatter/d' tests/auto/qml/qml.pro || die
+   sed -i -e 's/\<\(imports\|\)check\>//' 
tests/auto/qml/codemodel/codemodel.pro || die
+   sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro 
|| die
+   sed -i -e '/qtcprocess/d' tests/auto/utils/utils.pro || die
 
# do not install test binaries
sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' 
tests/auto/{qttest.pri,json/json.pro} || die



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-28 Thread Davide Pesavento
commit: 8947d869217415b683ab5d3325fd5a917e1779e3
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:28:02 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8947d869

dev-qt/qt-creator: add USE flag to disable the qmake project manager

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  3 ++-
 dev-qt/qt-creator/qt-creator-.ebuild | 16 +---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index bdaf1a3ad21f..d2e6af3e1338 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -37,7 +37,8 @@
Add support for Perforce version control 
system (requires manual installation of Perforce client)
Build the Linux Perf-based profiler 
plugin
Build plugin for Python language 
support
-   Build plugin for QBS-based projects
+   Build plugin for Qbs-based projects
+   Build plugin for qmake-based projects
Build plugins for QML-based development 
(designer, editor, project manager)
Enable designer for QML/QtQuick-based 
UIs
Build the QML/JavaScript editor plugin

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index c199ce2d341b..d0d62b73a9e0 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -24,13 +24,11 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
-   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager conan cppcheck
-   ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild +lsp:languageclient
-   mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor 
nim perforce perfprofiler
-   python qbs:qbsprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
-   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind
-   webassembly)
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
+   clearcase cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker git glsl:glsleditor +help incredibuild
+   +lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager 
modeling:modeleditor nim perforce perfprofiler python
+   qbs:qbsprojectmanager qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -39,6 +37,7 @@ REQUIRED_USE="
clang? ( lsp )
mcu? ( baremetal cmake )
python? ( lsp )
+   qml? ( qmake )
qnx? ( remotelinux )
 "
 
@@ -149,6 +148,9 @@ src_prepare() {
sed -i -e '/tracing/d' src/libs/libs.pro 
tests/auto/auto.pro || die
fi
fi
+   if ! use qmake; then
+   sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
+   fi
if ! use qml; then
sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' 
src/libs/libs.pro || die
sed -i -e '/qml2puppet/d' src/tools/tools.pro || die



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-28 Thread Davide Pesavento
commit: b671c1131493e983c274a36f4711549687984a74
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:34:31 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b671c113

dev-qt/qt-creator: enable a couple more USE flags by default

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index d0d62b73a9e0..f8eca8f995f6 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -25,9 +25,9 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
-   clearcase cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker git glsl:glsleditor +help incredibuild
+   clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs 
+designer docker +git glsl:glsleditor +help incredibuild
+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager 
modeling:modeleditor nim perforce perfprofiler python
-   qbs:qbsprojectmanager qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+   qbs:qbsprojectmanager +qmake:qmakeprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-22 Thread Davide Pesavento
commit: be5b9f5cffb7518cad62fe41d1df1faa0ffd7748
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Nov 23 04:16:06 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5b9f5c

dev-qt/qt-creator: clangcodemodel plugin requires USE=lsp

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index ceec86efbe12..10d2dbc089f4 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -26,7 +26,7 @@ LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager conan cppcheck
-   ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild lsp:languageclient
+   ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild +lsp:languageclient
mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor 
nim perforce perfprofiler
python qbs:qbsprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind
@@ -36,7 +36,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
android? ( lsp )
boot2qt? ( remotelinux )
-   clang? ( test? ( qbs ) )
+   clang? ( lsp test? ( qbs ) )
mcu? ( baremetal cmake )
python? ( lsp )
qnx? ( remotelinux )



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-22 Thread Davide Pesavento
commit: 9ba0be1a9a528038bd6892795905dea469df2cca
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Nov 23 04:05:43 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba0be1a

dev-qt/qt-creator: merge qmldesigner and qmljs USE flags

And also put qmlpreview and qmlprojectmanager behind the new flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  5 +++--
 dev-qt/qt-creator/qt-creator-.ebuild | 16 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 8713dfe7612f..bdaf1a3ad21f 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -17,7 +17,7 @@
Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)
Build plugin for Boot2Qt devices
-   Build clang-based plugins (code model, 
formatting, static analysis)
+   Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
Build plugin to integrate with the Conan 
package manager
@@ -27,7 +27,7 @@
Build plugin for Docker support
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
-   Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
+   Enable integration with 
Incredibuild
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system
@@ -38,6 +38,7 @@
Build the Linux Perf-based profiler 
plugin
Build plugin for Python language 
support
Build plugin for QBS-based projects
+   Build plugins for QML-based development 
(designer, editor, project manager)
Enable designer for QML/QtQuick-based 
UIs
Build the QML/JavaScript editor plugin
Build the QML profiler plugin

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 8db237c5577b..ceec86efbe12 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -28,8 +28,9 @@ QTC_PLUGINS=(android +autotest 
autotools:autotoolsprojectmanager baremetal bazaa
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager conan cppcheck
ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild lsp:languageclient
mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor 
nim perforce perfprofiler
-   python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor 
qmlprofiler qnx remotelinux
-   scxml:scxmleditor serialterminal silversearcher subversion valgrind 
webassembly)
+   python qbs:qbsprojectmanager 
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+   qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal 
silversearcher subversion valgrind
+   webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -38,7 +39,6 @@ REQUIRED_USE="
clang? ( test? ( qbs ) )
mcu? ( baremetal cmake )
python? ( lsp )
-   qmldesigner? ( qmljs )
qnx? ( remotelinux )
 "
 
@@ -97,7 +97,7 @@ RDEPEND="${CDEPEND}
cvs? ( dev-vcs/cvs )
git? ( dev-vcs/git )
mercurial? ( dev-vcs/mercurial )
-   qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+   qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
silversearcher? ( sys-apps/the_silver_searcher )
subversion? ( dev-vcs/subversion )
valgrind? ( dev-util/valgrind )
@@ -123,7 +123,6 @@ src_prepare() {
# disable unwanted plugins
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
if ! use ${plugin%:*}; then
-   einfo "Disabling ${plugin%:*} plugin"
sed -i -re 
"s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
src/plugins/plugins.pro || die "failed to 
disable ${plugin%:*} plugin"
fi
@@ -150,14 +149,11 @@ src_prepare() {
sed -i -e '/tracing/d' src/libs/libs.pro 
tests/auto/auto.p

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-22 Thread Davide Pesavento
commit: 2c5e19cb0458cd43f3d5c3bdd4003b5e2e393ef5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 05:16:43 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5e19cb

dev-qt/qt-creator: always build clangsupport and sqlite internal libs

The CppEditor plugin, which is pretty fundamental, depends on them.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 68a5ec763cc6..8db237c5577b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -132,7 +132,7 @@ src_prepare() {
 
# avoid building unused support libraries and tools
if ! use clang; then
-   sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro 
|| die
+   sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die
sed -i -e '/clangbackend/d' src/tools/tools.pro || die
fi
if ! use glsl; then



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: 045b7bf9c923a736f4c74cfd4295a1635d29814a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 01:40:33 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:41:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045b7bf9

dev-qt/qt-creator: drop RDEPEND on build tools

They are used as development tools in this context, and the
user/developer may want to use different versions from those
available via portage.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 78d1c1db6106..68a5ec763cc6 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -93,13 +93,10 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
sys-devel/gdb[python]
-   autotools? ( sys-devel/autoconf )
-   cmake? ( >=dev-util/cmake-3.14 )
cppcheck? ( dev-util/cppcheck )
cvs? ( dev-vcs/cvs )
git? ( dev-vcs/git )
mercurial? ( dev-vcs/mercurial )
-   qbs? ( >=dev-util/qbs-1.18 )
qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
silversearcher? ( sys-apps/the_silver_searcher )
subversion? ( dev-vcs/subversion )



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: 568743c8d27f89f9fb6e56d47ad59a3c9d2ab54c
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 01:03:19 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568743c8

dev-qt/qt-creator: add USE 'conan' and 'docker'

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  4 +++-
 dev-qt/qt-creator/qt-creator-.ebuild | 10 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 97cf7cbe66cb..8713dfe7612f 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -20,9 +20,11 @@
Build clang-based plugins (code model, 
formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
+   Build plugin to integrate with the Conan 
package manager
Enable integration with 
dev-util/cppcheck
Build the Chrome Trace Format 
visualizer plugin
Enable designer for QtWidgets-based 
UIs
+   Build plugin for Docker support
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
@@ -40,7 +42,7 @@
Build the QML/JavaScript editor plugin
Build the QML profiler plugin
Build plugin for QNX devices
-   Add support for deployment and 
execution on a remote Linux host
+   Build plugin for deployment and 
execution on a remote Linux host
Build the graphical SCXML editor 
plugin
Build the serial terminal 
plugin
Enable integration with 
sys-apps/the_silver_searcher

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index cce36015191f..78d1c1db6106 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -25,11 +25,11 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
-   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
-   ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild 
lsp:languageclient mcu:mcusupport
-   mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce 
perfprofiler python
-   qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx 
remotelinux scxml:scxmleditor
-   serialterminal silversearcher subversion valgrind webassembly)
+   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager conan cppcheck
+   ctfvisualizer cvs +designer docker git glsl:glsleditor +help 
incredibuild lsp:languageclient
+   mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor 
nim perforce perfprofiler
+   python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor 
qmlprofiler qnx remotelinux
+   scxml:scxmleditor serialterminal silversearcher subversion valgrind 
webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: f3886fbdc84d842a71a7b4dc368751552f0963c1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:56:48 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3886fbd

dev-qt/qt-creator: add 'incredibuild' USE flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 3 ++-
 dev-qt/qt-creator/qt-creator-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 45e6f90bbd93..883d16da2741 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -11,7 +11,7 @@


Build plugin for Android devices
-   Enable integration with popular unit 
testing frameworks (QtTest, Google Test, Boost.Test)
+   Enable integration with popular unit 
testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2)
Build plugin for autotools-based 
projects
Build plugin for bare metal 
devices
Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
@@ -25,6 +25,7 @@
Enable designer for QtWidgets-based 
UIs
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
+   Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 0aebe5389afc..6dce0255fb7f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -26,8 +26,8 @@ LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
-   ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
-   modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
+   ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild 
lsp:languageclient mcu:mcusupport
+   mercurial modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: ffec9566a4e4cbe86f85980659794097a2bc4be8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 00:22:37 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffec9566

dev-qt/qt-creator: add 'meson' USE flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 1 +
 dev-qt/qt-creator/qt-creator-.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 883d16da2741..97cf7cbe66cb 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -29,6 +29,7 @@
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system
+   Build plugin for Meson-based projects
Build the graphical model editor 
plugin
Build plugin for Nim language support
Add support for Perforce version control 
system (requires manual installation of Perforce client)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 6dce0255fb7f..cce36015191f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -27,9 +27,9 @@ SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild 
lsp:languageclient mcu:mcusupport
-   mercurial modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
-   +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
-   subversion valgrind webassembly)
+   mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce 
perfprofiler python
+   qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx 
remotelinux scxml:scxmleditor
+   serialterminal silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: c5861188f31fff37dbb447f5ea2eb1ea7ccd3682
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:23:32 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5861188

dev-qt/qt-creator: allow clang 13

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b11ee8e89714..0aebe5389afc 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -68,6 +68,7 @@ CDEPEND="
clang? (
>=dev-cpp/yaml-cpp-0.6.2:=
|| (
+   sys-devel/clang:13
sys-devel/clang:12
sys-devel/clang:11
)



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: 9ac742a301f4b2f4c796964c010e47c9e50b83c7
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:15:31 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac742a3

dev-qt/qt-creator: require syntax-highlighting >= 5.87

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 9c177489fe96..b11ee8e89714 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -64,7 +64,7 @@ CDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
-   kde-frameworks/syntax-highlighting:5
+   >=kde-frameworks/syntax-highlighting-5.87:5
clang? (
>=dev-cpp/yaml-cpp-0.6.2:=
|| (



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: a55f5d5cdf45ac7a350907f83aa6f907f3c2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:05:20 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55f5d5c

dev-qt/qt-creator: clang{refactoring,pchmanager} are completely gone

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 18260cba5420..9c177489fe96 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
 "
 
 # minimum Qt version required
-QT_PV="5.14:5"
+QT_PV="5.15:5"
 
 BDEPEND="
>=dev-qt/linguist-tools-${QT_PV}
@@ -130,8 +130,7 @@ src_prepare() {
src/plugins/plugins.pro || die "failed to 
disable ${plugin%:*} plugin"
fi
done
-   sed -i -re 
'/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' 
src/plugins/plugins.pro || die
-   sed -i -re '/clang(pchmanager|refactoring)backend/d' 
src/tools/tools.pro || die
+   sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || 
die
 
# avoid building unused support libraries and tools
if ! use clang; then



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: 25b802bcfecca3ca93b279aee7e1ce843639243a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 20:09:19 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 20:09:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b802bc

dev-qt/qt-creator: USE=android requires lsp

Closes: https://bugs.gentoo.org/802372
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 1 +
 dev-qt/qt-creator/qt-creator-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
index 1e0cae2ac46f..18260cba5420 100644
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest 
autotools:autotoolsprojectmanager baremetal bazaa
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
+   android? ( lsp )
boot2qt? ( remotelinux )
clang? ( test? ( qbs ) )
mcu? ( baremetal cmake )

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 1e0cae2ac46f..18260cba5420 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest 
autotools:autotoolsprojectmanager baremetal bazaa
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
+   android? ( lsp )
boot2qt? ( remotelinux )
clang? ( test? ( qbs ) )
mcu? ( baremetal cmake )



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-11-21 Thread Davide Pesavento
commit: b8ff4e5c839462c4bfa518c9b6a42d1f156d3330
Author: Kritzmensch  gmail  com>
AuthorDate: Sun Nov 21 19:56:42 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 20:01:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ff4e5c

dev-qt/qt-creator: add 'baremetal' as a required dep for 'mcu'

Bug: https://bugs.gentoo.org/802372
Closes: https://github.com/gentoo/gentoo/pull/23019
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
index bfc4e05275dc..1e0cae2ac46f 100644
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
boot2qt? ( remotelinux )
clang? ( test? ( qbs ) )
-   mcu? ( cmake )
+   mcu? ( baremetal cmake )
python? ( lsp )
qmldesigner? ( qmljs )
qnx? ( remotelinux )

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index bfc4e05275dc..1e0cae2ac46f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
boot2qt? ( remotelinux )
clang? ( test? ( qbs ) )
-   mcu? ( cmake )
+   mcu? ( baremetal cmake )
python? ( lsp )
qmldesigner? ( qmljs )
qnx? ( remotelinux )



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/

2021-10-30 Thread Davide Pesavento
commit: 739a83c119e8cea01c28582f429f9af94c4d1058
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Oct 31 00:46:38 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Oct 31 00:46:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739a83c1

dev-python/PyQt5: bump to 5.15.6

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt5/Manifest | 2 +-
 dev-python/PyQt5/{PyQt5-5.15.5.ebuild => PyQt5-5.15.6.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 2f24e8f02f2..46239623771 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,2 +1,2 @@
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 
96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c
 SHA512 
6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
-DIST PyQt5-5.15.5.tar.gz 3239628 BLAKE2B 
8992eb9293bb823f1298108a48d0c8578d0acfcccbabc6cb7c209bb591bfed61caf3ab8b8717205698149b5e4b59b4181e67491332e38ae87856b8169d74ba86
 SHA512 
67600668c769deb37052e6099a35756519987a0796045cdc291add1763bad103df1226f1b6e304e74808279d6ce56231e614617011ce238e1cf91a302981dd26
+DIST PyQt5-5.15.6.tar.gz 3239505 BLAKE2B 
e98d6af85ae4586dbb1b7db1d4cb17ccdac917a36a304a7486d553a681be9a920e8750173e49e58e02d0129890a8a713702977e64efbb386ce831b8aaef2b0fd
 SHA512 
65fd663cb70e8701e49bd4b39dc9384546cf2edd1b3bab259ca64b50908f48bdc02ca143f36cd6b429075f5616dcc7b291607dcb63afa176e828cded3b82f5c7

diff --git a/dev-python/PyQt5/PyQt5-5.15.5.ebuild 
b/dev-python/PyQt5/PyQt5-5.15.6.ebuild
similarity index 99%
rename from dev-python/PyQt5/PyQt5-5.15.5.ebuild
rename to dev-python/PyQt5/PyQt5-5.15.6.ebuild
index d829c5fe002..e7370b76697 100644
--- a/dev-python/PyQt5/PyQt5-5.15.5.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.6.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-   >=dev-python/sip-6.2[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.4[${PYTHON_USEDEP}]
>=dev-qt/qtcore-${QT_PV}
dbus? ( virtual/pkgconfig )
 "



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt-builder/

2021-10-30 Thread Davide Pesavento
commit: f0b37fed70197b0e7f4ebfffa37fe94614b51000
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 30 23:57:46 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 30 23:57:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b37fed

dev-python/PyQt-builder: remove old

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt-builder/Manifest   |  2 --
 dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild | 37 --
 dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild | 37 --
 3 files changed, 76 deletions(-)

diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index c5e4dafc190..250b654500a 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,3 +1 @@
-DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B 
da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720
 SHA512 
26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a
-DIST PyQt-builder-1.12.1.tar.gz 5726601 BLAKE2B 
6e6dd181078ed126ecf3db7bbf5e7b68b78ec78e2ca198fb4f504495020c8fc7d61280bf844a78de69621049785b0b152f31d0d25779d7bbe330162bb80b68bf
 SHA512 
4f006564f51758cb05da8dce78aead58a23d132405124e92bf79cac39eaa845efa5db15a2abdd43ae95e191d38d81fbc592f75bb68f83b83e25c51f8f84e6182
 DIST PyQt-builder-1.12.2.tar.gz 5727071 BLAKE2B 
ca5d55989fec2a9a6f9d37abc307d4db7305bb06449cbf982aa3a2a3f210113319f7fb303ec0d77b513cce844b529e0e56f62c9d62ab3c51cf85a061ecd00c7a
 SHA512 
022f2cd40c100543c4b442fc5b27bbf2ec853d94b531f8f6dc1d7f92b07bcc20e8f0a4eb64feb96d094ba0d5f01fddcc8aed23ddf67a61417e07983a73918230

diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild
deleted file mode 100644
index 4d69521c2f0..000
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ 
https://pypi.org/project/PyQt-builder/";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-   dev-python/packaging[${PYTHON_USEDEP}]
-   >=dev-python/sip-5.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-python_prepare_all() {
-   # don't install prebuilt Windows DLLs
-   sed -i -e "s:'dlls/\*/\*',::" setup.py || die
-   rm -r "${PN/-/_}.egg-info" || die
-
-   distutils-r1_python_prepare_all
-}

diff --git a/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild
deleted file mode 100644
index f136447e373..000
--- a/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ 
https://pypi.org/project/PyQt-builder/";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-   dev-python/packaging[${PYTHON_USEDEP}]
-   >=dev-python/sip-6.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-python_prepare_all() {
-   # don't install prebuilt Windows DLLs
-   sed -i -e "s:'dlls/\*/\*',::" setup.py || die
-   rm -r "${PN/-/_}.egg-info" || die
-
-   distutils-r1_python_prepare_all
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt-builder/

2021-10-30 Thread Davide Pesavento
commit: 43bc2b8db5e023823d0e80e10d2c3857e383563b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 30 23:55:51 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 30 23:57:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43bc2b8d

dev-python/PyQt-builder: add 1.12.2

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt-builder/Manifest   |  1 +
 dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild | 37 ++
 2 files changed, 38 insertions(+)

diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index ce69eee4a5d..c5e4dafc190 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,2 +1,3 @@
 DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B 
da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720
 SHA512 
26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a
 DIST PyQt-builder-1.12.1.tar.gz 5726601 BLAKE2B 
6e6dd181078ed126ecf3db7bbf5e7b68b78ec78e2ca198fb4f504495020c8fc7d61280bf844a78de69621049785b0b152f31d0d25779d7bbe330162bb80b68bf
 SHA512 
4f006564f51758cb05da8dce78aead58a23d132405124e92bf79cac39eaa845efa5db15a2abdd43ae95e191d38d81fbc592f75bb68f83b83e25c51f8f84e6182
+DIST PyQt-builder-1.12.2.tar.gz 5727071 BLAKE2B 
ca5d55989fec2a9a6f9d37abc307d4db7305bb06449cbf982aa3a2a3f210113319f7fb303ec0d77b513cce844b529e0e56f62c9d62ab3c51cf85a061ecd00c7a
 SHA512 
022f2cd40c100543c4b442fc5b27bbf2ec853d94b531f8f6dc1d7f92b07bcc20e8f0a4eb64feb96d094ba0d5f01fddcc8aed23ddf67a61417e07983a73918230

diff --git a/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
new file mode 100644
index 000..f136447e373
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ 
https://pypi.org/project/PyQt-builder/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+   dev-python/packaging[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+   # don't install prebuilt Windows DLLs
+   sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+   rm -r "${PN/-/_}.egg-info" || die
+
+   distutils-r1_python_prepare_all
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-10-30 Thread Davide Pesavento
commit: 1f0098e9924ca0887bd25390f2210b881c9b4c9b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 30 23:42:38 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 30 23:42:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0098e9

dev-python/sip: remove old

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest |  2 --
 dev-python/sip/sip-6.2.0.ebuild | 32 
 dev-python/sip/sip-6.3.1.ebuild | 32 
 3 files changed, 66 deletions(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index c34f4591129..5245e1f641f 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,5 +1,3 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.tar.gz 1181661 BLAKE2B 
7f5638005a01fc1bd60ef6156027db625faa393d5ee9155c88c88aea88e4c5ce63c30a2542cd89aea7c7e066cbbf77aab9ee9d2a45210dcad964e38052cb06d3
 SHA512 
88e4447aaa574a312bdfbb6ef78fdb95824f33d79988cdf5c824952b7f3535973eed6d8eece7b8c9ce8b442aaa2235e252d438f2316d13272a35c484dd4fda42
-DIST sip-6.3.1.tar.gz 1200906 BLAKE2B 
2dcce853a1f3912138a2830b2370db518400119c5819070fd0cfc6ffebee06bf6629ae521cca535f5873859b141831dcfad7b077321356ce2ae69ec15ee28d6a
 SHA512 
69705c2552a87d451ea989b99bb7e3fb15163447a3a5b3625e9e6509ce9e59d52fbfbb19ab911a2efe35219a50c08f0dcb25e16b222e0c8e1094dee0fc4b3b97
 DIST sip-6.4.0.tar.gz 1201890 BLAKE2B 
be5ccdfa7853eb2baa3b7c4e7f64a315e39ef899631e93569d75ed27bbf9752c97cca1bfd6c813efb0046d1d82fc8c5625a04f08c330a4e2c102461f3a42beee
 SHA512 
eec1bdbe4ef3d8ba5152a2dcd888efc23498bcbee01c95b7eb72074c2a133d8e8599cc4bb6d6b2fec99f093a73705e0fea1c148c2e49058c0fd6f2ba97f40884

diff --git a/dev-python/sip/sip-6.2.0.ebuild b/dev-python/sip/sip-6.2.0.ebuild
deleted file mode 100644
index f917f01..000
--- a/dev-python/sip/sip-6.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ 
https://pypi.org/project/sip/";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-   !https://www.riverbankcomputing.com/software/sip/ 
https://pypi.org/project/sip/";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-   !

[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-10-30 Thread Davide Pesavento
commit: 835631c432406a1cdd9b0f196e7a31bdb6752c9e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 30 23:39:49 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 30 23:42:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835631c4

dev-python/sip: add 6.4.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest |  1 +
 dev-python/sip/sip-6.4.0.ebuild | 32 
 2 files changed, 33 insertions(+)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 1cf587fd429..c34f4591129 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,3 +2,4 @@ DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb13
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
 DIST sip-6.2.0.tar.gz 1181661 BLAKE2B 
7f5638005a01fc1bd60ef6156027db625faa393d5ee9155c88c88aea88e4c5ce63c30a2542cd89aea7c7e066cbbf77aab9ee9d2a45210dcad964e38052cb06d3
 SHA512 
88e4447aaa574a312bdfbb6ef78fdb95824f33d79988cdf5c824952b7f3535973eed6d8eece7b8c9ce8b442aaa2235e252d438f2316d13272a35c484dd4fda42
 DIST sip-6.3.1.tar.gz 1200906 BLAKE2B 
2dcce853a1f3912138a2830b2370db518400119c5819070fd0cfc6ffebee06bf6629ae521cca535f5873859b141831dcfad7b077321356ce2ae69ec15ee28d6a
 SHA512 
69705c2552a87d451ea989b99bb7e3fb15163447a3a5b3625e9e6509ce9e59d52fbfbb19ab911a2efe35219a50c08f0dcb25e16b222e0c8e1094dee0fc4b3b97
+DIST sip-6.4.0.tar.gz 1201890 BLAKE2B 
be5ccdfa7853eb2baa3b7c4e7f64a315e39ef899631e93569d75ed27bbf9752c97cca1bfd6c813efb0046d1d82fc8c5625a04f08c330a4e2c102461f3a42beee
 SHA512 
eec1bdbe4ef3d8ba5152a2dcd888efc23498bcbee01c95b7eb72074c2a133d8e8599cc4bb6d6b2fec99f093a73705e0fea1c148c2e49058c0fd6f2ba97f40884

diff --git a/dev-python/sip/sip-6.4.0.ebuild b/dev-python/sip/sip-6.4.0.ebuild
new file mode 100644
index 000..f917f01
--- /dev/null
+++ b/dev-python/sip/sip-6.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ 
https://pypi.org/project/sip/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+   !

[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQtWebEngine/

2021-10-21 Thread Davide Pesavento
commit: 54bc600f99886dbc2c10dbfab1917bd464d01908
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Oct 22 03:10:40 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Oct 22 03:10:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54bc600f

dev-python/PyQtWebEngine: remove obsolete snapshot

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQtWebEngine/Manifest  |  1 -
 .../PyQtWebEngine-5.15.5_pre2108100905.ebuild  | 76 --
 2 files changed, 77 deletions(-)

diff --git a/dev-python/PyQtWebEngine/Manifest 
b/dev-python/PyQtWebEngine/Manifest
index 39b6be5766b..8ec2d4ebdc6 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,3 +1,2 @@
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 
0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b
 SHA512 
25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
-DIST PyQtWebEngine-5.15.5.dev2108100905.tar.gz 49043 BLAKE2B 
01b75db0d9fa973ccd0a85f9336e16b7c1fb2a303a0d004d247f91744dc642edb836597877fce6c4f038afa6f87ba066eeaca1e3d467bc15689dbe82e8a9809e
 SHA512 
1ea407832f062dc9b9a6c6312feb4c8f3553b55972e5a32c70c9d1c278918d32934791d60c022a56ab507b6215d5f78e1b4244b9fffa3256aad1f5f4afebd47a
 DIST PyQtWebEngine-5.15.5.tar.gz 48610 BLAKE2B 
ea266c09965a6ee62e33d3970b145068271c9e1eb87839782e0100b5db2e90a0c002fc4d6f3d22ef9a5cb8c42a067bb45008b0392a0d8557bc6c5c9d77e6b75a
 SHA512 
20eecd479ea757e3bf9855c7dafe0bbbc0cbc61be26509605a5c9a8026e54bb6e362069ecf4be74733dcf6eec154f6ed13933e334e4455b080e687abfd2659fa

diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild 
b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild
deleted file mode 100644
index ab576366582..000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ 
https://pypi.org/project/PyQtWebEngine/";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-"
-
-DEPEND="${PYTHON_DEPS}
-   
>=dev-python/PyQt5-5.15.5_pre2107091435[gui,network,printsupport,webchannel,widgets,${PYTHON_USEDEP}]
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwebengine:5[widgets]
-"
-RDEPEND="${DEPEND}
-   >=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-   >=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-   >=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
-   dev-qt/qtcore:5
-"
-
-src_configure() {
-   configuration() {
-   local myconf=(
-   sip-build
-   --verbose
-   --build-dir="${BUILD_DIR}"
-   --scripts-dir="$(python_get_scriptdir)"
-   --qmake="$(qt5_get_bindir)"/qmake
-   --no-make
-   $(usev debug '--debug --qml-debug --tracing')
-   )
-   echo "${myconf[@]}"
-   "${myconf[@]}" || die
-
-   # Run eqmake to respect toolchain and build flags
-   run_in_build_dir eqmake5 -recursive ${PN}.pro
-   }
-   python_foreach_impl configuration
-}
-
-src_compile() {
-   python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-   installation() {
-   emake INSTALL_ROOT="${D}" install
-   python_optimize
-   }
-   python_foreach_impl run_in_build_dir installation
-
-   einstalldocs
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/

2021-10-21 Thread Davide Pesavento
commit: cf2fdb84e0dd0683e9c8ed19600dc58d9b80fd2f
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Oct 22 03:08:58 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Oct 22 03:08:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2fdb84

dev-python/PyQt5: remove obsolete snapshot

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt5/Manifest  |   1 -
 dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild | 193 -
 2 files changed, 194 deletions(-)

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 6a2527b1eb8..2f24e8f02f2 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,3 +1,2 @@
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 
96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c
 SHA512 
6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
-DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 
8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853
 SHA512 
5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5
 DIST PyQt5-5.15.5.tar.gz 3239628 BLAKE2B 
8992eb9293bb823f1298108a48d0c8578d0acfcccbabc6cb7c209bb591bfed61caf3ab8b8717205698149b5e4b59b4181e67491332e38ae87856b8169d74ba86
 SHA512 
67600668c769deb37052e6099a35756519987a0796045cdc291add1763bad103df1226f1b6e304e74808279d6ce56231e614617011ce238e1cf91a302981dd26

diff --git a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild 
b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
deleted file mode 100644
index 7d1bf6e760c..000
--- a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/ 
https://pypi.org/project/PyQt5/";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-# TODO: QtNfc, QtQuick3D, QtRemoteObjects
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help 
location
-   multimedia network opengl positioning printsupport sensors serialport 
speech
-   sql svg testlib webchannel websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from the qmake_QT declarations
-# in project.py and from the output of 'grep -r "%Import " ${S}/sip'
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-   bluetooth? ( gui )
-   declarative? ( gui network )
-   designer? ( widgets )
-   help? ( gui widgets )
-   location? ( positioning )
-   multimedia? ( gui network )
-   opengl? ( gui widgets )
-   positioning? ( gui )
-   printsupport? ( gui widgets )
-   sensors? ( gui )
-   serialport? ( gui )
-   sql? ( widgets )
-   svg? ( gui widgets )
-   testlib? ( widgets )
-   webchannel? ( network )
-   websockets? ( network )
-   widgets? ( gui )
-   xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.15:5"
-
-DEPEND="${PYTHON_DEPS}
-   >=dev-qt/qtcore-${QT_PV}
-   >=dev-qt/qtxml-${QT_PV}
-   bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-   dbus? (
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-qt/qtdbus-${QT_PV}
-   )
-   declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-   designer? ( >=dev-qt/designer-${QT_PV} )
-   gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-   help? ( >=dev-qt/qthelp-${QT_PV} )
-   location? ( >=dev-qt/qtlocation-${QT_PV} )
-   multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-   network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl] )
-   opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-   positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-   printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-   sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-   serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-   speech? ( >=dev-qt/qtspeech-${QT_PV} )
-   sql? ( >=dev-qt/qtsql-${QT_PV} )
-   svg? ( >=dev-qt/qtsvg-${QT_PV} )
-   te

[gentoo-commits] repo/gentoo:master commit in: dev-python/qscintilla-python/

2021-10-21 Thread Davide Pesavento
commit: ff8618c77e4c444fc325ae9c8b90e8cfcf5076f6
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Oct 22 02:59:28 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Oct 22 02:59:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8618c7

dev-python/qscintilla-python: remove 2.13.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/qscintilla-python/Manifest  |  1 -
 .../qscintilla-python-2.13.0.ebuild| 82 --
 2 files changed, 83 deletions(-)

diff --git a/dev-python/qscintilla-python/Manifest 
b/dev-python/qscintilla-python/Manifest
index 03c601dda00..8247ffec01a 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,2 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 
8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586
 SHA512 
c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
 DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 
147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a6567240af45e2833e085e423ad47e29c4f9b2241e
 SHA512 
edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc2234598ac876c5befd8873f700

diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild 
b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
deleted file mode 100644
index 03cabdd434c..000
--- a/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/ 
https://pypi.org/project/QScintilla/";
-
-MY_PN=QScintilla
-MY_P=${MY_PN}_src-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
-fi
-S=${WORKDIR}/${MY_P}/Python
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-"
-
-DEPEND="${PYTHON_DEPS}
-   
>=dev-python/PyQt5-5.15.5_pre2107091435[gui,printsupport,widgets,${PYTHON_USEDEP}]
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   ~x11-libs/qscintilla-${PV}:=
-"
-RDEPEND="${DEPEND}
-   >=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-   >=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-   >=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
-   dev-qt/qtcore:5
-"
-
-src_prepare() {
-   default
-   mv pyproject{-qt5,}.toml || die
-}
-
-src_configure() {
-   configuration() {
-   local myconf=(
-   sip-build
-   --verbose
-   --build-dir="${BUILD_DIR}"
-   --scripts-dir="$(python_get_scriptdir)"
-   --qmake="$(qt5_get_bindir)"/qmake
-   --no-make
-   $(usev debug '--debug --qml-debug --tracing')
-   )
-   echo "${myconf[@]}"
-   "${myconf[@]}" || die
-
-   # Run eqmake to respect toolchain and build flags
-   run_in_build_dir eqmake5 -recursive ${MY_PN}.pro
-   }
-   python_foreach_impl configuration
-}
-
-src_compile() {
-   python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-   installation() {
-   emake INSTALL_ROOT="${D}" install
-   python_optimize
-   }
-   python_foreach_impl run_in_build_dir installation
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/qscintilla-python/

2021-10-21 Thread Davide Pesavento
commit: b1f32903d64cb6887d0fd38459a6fa0d684c0a20
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Oct 22 02:57:16 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Oct 22 02:57:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f32903

dev-python/qscintilla-python: add 2.13.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/qscintilla-python/Manifest  |  1 +
 .../qscintilla-python-2.13.1.ebuild| 82 ++
 2 files changed, 83 insertions(+)

diff --git a/dev-python/qscintilla-python/Manifest 
b/dev-python/qscintilla-python/Manifest
index 31ba2a34aea..03c601dda00 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 
8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586
 SHA512 
c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 
147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a6567240af45e2833e085e423ad47e29c4f9b2241e
 SHA512 
edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc2234598ac876c5befd8873f700

diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild 
b/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
new file mode 100644
index 000..3b9a839cd1c
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/ 
https://pypi.org/project/QScintilla/";
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
+fi
+S=${WORKDIR}/${MY_P}/Python
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="${PYTHON_DEPS}
+   >=dev-python/PyQt5-5.15.5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   ~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}
+   >=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   >=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.2[${PYTHON_USEDEP}]
+   dev-qt/qtcore:5
+"
+
+src_prepare() {
+   default
+   mv pyproject{-qt5,}.toml || die
+}
+
+src_configure() {
+   configuration() {
+   local myconf=(
+   sip-build
+   --verbose
+   --build-dir="${BUILD_DIR}"
+   --scripts-dir="$(python_get_scriptdir)"
+   --qmake="$(qt5_get_bindir)"/qmake
+   --no-make
+   $(usev debug '--debug --qml-debug --tracing')
+   )
+   echo "${myconf[@]}"
+   "${myconf[@]}" || die
+
+   # Run eqmake to respect toolchain and build flags
+   run_in_build_dir eqmake5 -recursive ${MY_PN}.pro
+   }
+   python_foreach_impl configuration
+}
+
+src_compile() {
+   python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+   installation() {
+   emake INSTALL_ROOT="${D}" install
+   python_optimize
+   }
+   python_foreach_impl run_in_build_dir installation
+}



[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

2021-10-21 Thread Davide Pesavento
commit: 303e1f7688320ccf0e7111dba0a66ffb70973822
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Oct 22 03:01:50 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Oct 22 03:01:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303e1f76

x11-libs/qscintilla: remove 2.13.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 x11-libs/qscintilla/Manifest |  1 -
 x11-libs/qscintilla/qscintilla-2.13.0.ebuild | 80 
 2 files changed, 81 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 03c601dda00..8247ffec01a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 
8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586
 SHA512 
c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
 DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 
147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a6567240af45e2833e085e423ad47e29c4f9b2241e
 SHA512 
edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc2234598ac876c5befd8873f700

diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild 
b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
deleted file mode 100644
index 28e0c4e73dc..000
--- a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro";
-
-MY_PN=QScintilla
-MY_P=${MY_PN}_src-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="designer doc"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   designer? ( dev-qt/designer:5 )
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-   default
-
-   # Sub-slot sanity check
-   local subslot=${SLOT#*/}
-   local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' 
"${S}"/src/qscintilla.pro || die)
-   local major=${version%%.*}
-   if [[ ${subslot} != ${major} ]]; then
-   eerror
-   eerror "Ebuild sub-slot (${subslot}) does not match QScintilla 
major version (${major})"
-   eerror "Please update SLOT variable as follows:"
-   eerror "SLOT=\"${SLOT%%/*}/${major}\""
-   eerror
-   die "sub-slot sanity check failed"
-   fi
-}
-
-qsci_run_in() {
-   pushd "$1" >/dev/null || die
-   shift || die
-   "$@" || die
-   popd >/dev/null || die
-}
-
-src_configure() {
-   if use designer; then
-   # prevent building against system version (bug 466120)
-   append-cxxflags -I../src
-   append-ldflags -L../src
-   fi
-
-   qsci_run_in src eqmake5
-   use designer && qsci_run_in designer eqmake5
-}
-
-src_compile() {
-   qsci_run_in src emake
-   use designer && qsci_run_in designer emake
-}
-
-src_install() {
-   qsci_run_in src emake INSTALL_ROOT="${D}" install
-   use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
-
-   use doc && HTML_DOCS=( doc/html/. )
-   einstalldocs
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQtWebEngine/

2021-10-20 Thread Davide Pesavento
commit: 33b532fbba69ce17355a7fe29c2b4512f99f6053
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Oct 21 05:19:38 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Thu Oct 21 05:19:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b532fb

dev-python/PyQtWebEngine: add 5.15.5

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQtWebEngine/Manifest  |  1 +
 .../PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild  | 76 ++
 2 files changed, 77 insertions(+)

diff --git a/dev-python/PyQtWebEngine/Manifest 
b/dev-python/PyQtWebEngine/Manifest
index 788d8a3d02e..39b6be5766b 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,2 +1,3 @@
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 
0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b
 SHA512 
25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 DIST PyQtWebEngine-5.15.5.dev2108100905.tar.gz 49043 BLAKE2B 
01b75db0d9fa973ccd0a85f9336e16b7c1fb2a303a0d004d247f91744dc642edb836597877fce6c4f038afa6f87ba066eeaca1e3d467bc15689dbe82e8a9809e
 SHA512 
1ea407832f062dc9b9a6c6312feb4c8f3553b55972e5a32c70c9d1c278918d32934791d60c022a56ab507b6215d5f78e1b4244b9fffa3256aad1f5f4afebd47a
+DIST PyQtWebEngine-5.15.5.tar.gz 48610 BLAKE2B 
ea266c09965a6ee62e33d3970b145068271c9e1eb87839782e0100b5db2e90a0c002fc4d6f3d22ef9a5cb8c42a067bb45008b0392a0d8557bc6c5c9d77e6b75a
 SHA512 
20eecd479ea757e3bf9855c7dafe0bbbc0cbc61be26509605a5c9a8026e54bb6e362069ecf4be74733dcf6eec154f6ed13933e334e4455b080e687abfd2659fa

diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild 
b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild
new file mode 100644
index 000..42ee3f90e56
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ 
https://pypi.org/project/PyQtWebEngine/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="${PYTHON_DEPS}
+   
>=dev-python/PyQt5-5.15.5[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwebengine:5[widgets]
+"
+RDEPEND="${DEPEND}
+   >=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   >=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.2[${PYTHON_USEDEP}]
+   dev-qt/qtcore:5
+"
+
+src_configure() {
+   configuration() {
+   local myconf=(
+   sip-build
+   --verbose
+   --build-dir="${BUILD_DIR}"
+   --scripts-dir="$(python_get_scriptdir)"
+   --qmake="$(qt5_get_bindir)"/qmake
+   --no-make
+   $(usev debug '--debug --qml-debug --tracing')
+   )
+   echo "${myconf[@]}"
+   "${myconf[@]}" || die
+
+   # Run eqmake to respect toolchain and build flags
+   run_in_build_dir eqmake5 -recursive ${PN}.pro
+   }
+   python_foreach_impl configuration
+}
+
+src_compile() {
+   python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+   installation() {
+   emake INSTALL_ROOT="${D}" install
+   python_optimize
+   }
+   python_foreach_impl run_in_build_dir installation
+
+   einstalldocs
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/

2021-10-20 Thread Davide Pesavento
commit: 1b3042a8da92940f68bd1317cfb143ccfb32add5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Oct 21 05:05:08 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Thu Oct 21 05:05:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3042a8

dev-python/PyQt5: add 5.15.5

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt5/Manifest|   1 +
 dev-python/PyQt5/PyQt5-5.15.5.ebuild | 183 +++
 2 files changed, 184 insertions(+)

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 82a985d16fd..6a2527b1eb8 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,2 +1,3 @@
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 
96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c
 SHA512 
6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
 DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 
8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853
 SHA512 
5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5
+DIST PyQt5-5.15.5.tar.gz 3239628 BLAKE2B 
8992eb9293bb823f1298108a48d0c8578d0acfcccbabc6cb7c209bb591bfed61caf3ab8b8717205698149b5e4b59b4181e67491332e38ae87856b8169d74ba86
 SHA512 
67600668c769deb37052e6099a35756519987a0796045cdc291add1763bad103df1226f1b6e304e74808279d6ce56231e614617011ce238e1cf91a302981dd26

diff --git a/dev-python/PyQt5/PyQt5-5.15.5.ebuild 
b/dev-python/PyQt5/PyQt5-5.15.5.ebuild
new file mode 100644
index 000..c4effe4968b
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.15.5.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/ 
https://pypi.org/project/PyQt5/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtQuick3D, QtRemoteObjects
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help 
location
+   multimedia network opengl positioning printsupport sensors serialport 
speech
+   sql +ssl svg testlib webchannel websockets widgets x11extras 
xmlpatterns"
+
+# The requirements below were extracted from the qmake_QT declarations
+# in project.py and from the output of 'grep -r "%Import " ${S}/sip'
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   bluetooth? ( gui )
+   declarative? ( gui network )
+   designer? ( widgets )
+   help? ( gui widgets )
+   location? ( positioning )
+   multimedia? ( gui network )
+   opengl? ( gui widgets )
+   positioning? ( gui )
+   printsupport? ( gui widgets )
+   sensors? ( gui )
+   serialport? ( gui )
+   sql? ( widgets )
+   svg? ( gui widgets )
+   testlib? ( widgets )
+   webchannel? ( network )
+   websockets? ( network )
+   widgets? ( gui )
+   xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.15:5"
+
+DEPEND="${PYTHON_DEPS}
+   >=dev-qt/qtcore-${QT_PV}
+   >=dev-qt/qtxml-${QT_PV}
+   bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+   dbus? (
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-qt/qtdbus-${QT_PV}
+   )
+   declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+   designer? ( >=dev-qt/designer-${QT_PV} )
+   gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+   help? ( >=dev-qt/qthelp-${QT_PV} )
+   location? ( >=dev-qt/qtlocation-${QT_PV} )
+   multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+   network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
+   opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+   positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+   printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+   sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+   serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+   speech? ( >=dev-qt/qtspeech-${QT_PV} )
+   sql? ( >=dev-qt/qtsql-${QT_PV} )
+   svg? ( >=dev-qt/qtsvg-${QT_PV} )
+   testlib? ( >=dev-qt/qttest-${QT_PV} )
+   webcha

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/

2021-10-20 Thread Davide Pesavento
commit: 36b75f925c082a01ab9c0d20226bd2c73bcc8a16
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Oct 21 00:15:37 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Thu Oct 21 00:15:37 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=36b75f92

dev-qt/qtwayland: drop redundant/indirect dep on libxkbcommon

qtwayland uses libxkbcommon only through qtgui's QtXkbCommonSupport.
There are some conditional code paths depending on QT_CONFIG(xkbcommon)
but the latter is already force-enabled via qtgui[libinput].

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtwayland/qtwayland-5.15.2..ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild 
b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
index 0e26d41f..7ecd5279 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
@@ -20,7 +20,6 @@ DEPEND="
=dev-qt/qtdeclarative-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
media-libs/libglvnd
-   x11-libs/libxkbcommon
vulkan? ( dev-util/vulkan-headers )
X? (
=dev-qt/qtgui-${QT5_PV}*[-gles2-only]



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/

2021-10-20 Thread Davide Pesavento
commit: 62332410050ad50c0751ab255531c23531096207
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Oct 20 23:48:13 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Oct 20 23:48:13 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=62332410

dev-qt/qtwayland: add missing dep on dev-util/wayland-scanner

Bug: https://bugs.gentoo.org/818997
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtwayland/qtwayland-5.15.2..ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild 
b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
index 6b0c9b9c..0e26d41f 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
@@ -29,6 +29,9 @@ DEPEND="
)
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+   dev-util/wayland-scanner
+"
 
 src_configure() {
local myqmakeargs=(



[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

2021-10-18 Thread Davide Pesavento
commit: de7a32bfccad194ec0231dc8af55cae1d10b2625
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Oct 19 04:29:03 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Tue Oct 19 04:29:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de7a32bf

x11-libs/qscintilla: add 2.13.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 x11-libs/qscintilla/Manifest |  1 +
 x11-libs/qscintilla/qscintilla-2.13.1.ebuild | 80 
 2 files changed, 81 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 31ba2a34aea..03c601dda00 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 
8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586
 SHA512 
c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 
147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a6567240af45e2833e085e423ad47e29c4f9b2241e
 SHA512 
edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc2234598ac876c5befd8873f700

diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild 
b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
new file mode 100644
index 000..28e0c4e73dc
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro";
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="designer doc"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+   default
+
+   # Sub-slot sanity check
+   local subslot=${SLOT#*/}
+   local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' 
"${S}"/src/qscintilla.pro || die)
+   local major=${version%%.*}
+   if [[ ${subslot} != ${major} ]]; then
+   eerror
+   eerror "Ebuild sub-slot (${subslot}) does not match QScintilla 
major version (${major})"
+   eerror "Please update SLOT variable as follows:"
+   eerror "SLOT=\"${SLOT%%/*}/${major}\""
+   eerror
+   die "sub-slot sanity check failed"
+   fi
+}
+
+qsci_run_in() {
+   pushd "$1" >/dev/null || die
+   shift || die
+   "$@" || die
+   popd >/dev/null || die
+}
+
+src_configure() {
+   if use designer; then
+   # prevent building against system version (bug 466120)
+   append-cxxflags -I../src
+   append-ldflags -L../src
+   fi
+
+   qsci_run_in src eqmake5
+   use designer && qsci_run_in designer eqmake5
+}
+
+src_compile() {
+   qsci_run_in src emake
+   use designer && qsci_run_in designer emake
+}
+
+src_install() {
+   qsci_run_in src emake INSTALL_ROOT="${D}" install
+   use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
+
+   use doc && HTML_DOCS=( doc/html/. )
+   einstalldocs
+}



[gentoo-commits] proj/qt:master commit in: dev-qt/qtdbus/

2021-10-16 Thread Davide Pesavento
commit: 359f36d8f3c062a4159543a471faeb88f5ce67e0
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 16 23:18:13 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 16 23:18:13 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=359f36d8

dev-qt/qtdbus: simplify depend atom

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtdbus/qtdbus-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtdbus/qtdbus-5.15.2..ebuild 
b/dev-qt/qtdbus/qtdbus-5.15.2..ebuild
index c829bb03..762bd673 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.2..ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.2..ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
-   >=sys-apps/dbus-1.4.20
+   sys-apps/dbus
 "
 RDEPEND="${DEPEND}"
 



[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/

2021-10-16 Thread Davide Pesavento
commit: 4660c52a8d5db6edf2f60310e4f2cfefc9673739
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 16 23:12:09 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 16 23:12:09 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4660c52a

dev-qt/qtgui: simplify some depend atoms

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtgui/qtgui-5.15.2..ebuild | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild 
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index c4cdc58e..dc877b56 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -29,8 +29,8 @@ RDEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
dev-util/gtk-update-icon-cache
media-libs/fontconfig
-   >=media-libs/freetype-2.6.1:2
-   >=media-libs/harfbuzz-1.6.0:=
+   media-libs/freetype:2
+   media-libs/harfbuzz:=
media-libs/libglvnd[X?]
sys-libs/zlib:=
dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
@@ -39,12 +39,12 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( virtual/jpeg )
libinput? (
dev-libs/libinput:=
-   >=x11-libs/libxkbcommon-0.5.0
+   x11-libs/libxkbcommon
)
-   png? ( media-libs/libpng:0= )
+   png? ( media-libs/libpng:= )
tslib? ( >=x11-libs/tslib-1.21 )
tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
udev? ( virtual/libudev:= )
@@ -54,8 +54,8 @@ RDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
-   >=x11-libs/libxcb-1.12:=[xkb]
-   >=x11-libs/libxkbcommon-0.5.0[X]
+   x11-libs/libxcb:=[xkb]
+   x11-libs/libxkbcommon[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil



[gentoo-commits] proj/qt:master commit in: dev-qt/qtprintsupport/

2021-10-16 Thread Davide Pesavento
commit: bc6969452c45cd6476e3b434b944a2e2ab3c4237
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 16 23:21:41 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 16 23:21:41 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc696945

dev-qt/qtprintsupport: simplify depend atom

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtprintsupport/qtprintsupport-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2..ebuild 
b/dev-qt/qtprintsupport/qtprintsupport-5.15.2..ebuild
index b8dd2fab..bff464c4 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2..ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2..ebuild
@@ -19,7 +19,7 @@ RDEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-   cups? ( >=net-print/cups-1.4 )
+   cups? ( net-print/cups )
 "
 DEPEND="${RDEPEND}
test? ( =dev-qt/qtnetwork-${QT5_PV}* )



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/

2021-10-16 Thread Davide Pesavento
commit: 71fa0ab23155e978d0e8d945bcbef8df7dfcfee8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 16 23:15:36 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 16 23:15:36 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=71fa0ab2

dev-qt/qtwayland: simplify depend atom

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtwayland/qtwayland-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild 
b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
index b680c42c..6b0c9b9c 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
@@ -20,7 +20,7 @@ DEPEND="
=dev-qt/qtdeclarative-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
media-libs/libglvnd
-   >=x11-libs/libxkbcommon-0.2.0
+   x11-libs/libxkbcommon
vulkan? ( dev-util/vulkan-headers )
X? (
=dev-qt/qtgui-${QT5_PV}*[-gles2-only]



[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/

2021-10-16 Thread Davide Pesavento
commit: 5eac00302ae93bc3c7a2c0326885f8e4af2660b1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 16 22:25:33 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 16 22:25:33 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5eac0030

dev-qt/qtgui: treat linuxfb and vnc like the other platform plugins

Also add missing sys-kernel/linux-headers dependency

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtgui/qtgui-5.15.2..ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild 
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index 337e8395..c4cdc58e 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -16,7 +16,7 @@ fi
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
 REQUIRED_USE="
-   || ( eglfs X )
+   || ( eglfs linuxfb vnc X )
accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
@@ -64,6 +64,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
evdev? ( sys-kernel/linux-headers )
+   linuxfb? ( sys-kernel/linux-headers )
udev? ( sys-kernel/linux-headers )
 "
 PDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt-builder/

2021-10-13 Thread Davide Pesavento
commit: 1a536a815f15b2138016f1fa2302daec4fa0b390
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Oct 13 20:14:48 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Oct 13 20:14:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a536a81

dev-python/PyQt-builder: add 1.12.1, remove 1.11.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt-builder/Manifest| 2 +-
 .../{PyQt-builder-1.11.0.ebuild => PyQt-builder-1.12.1.ebuild}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index 9feed8b5ebc..ce69eee4a5d 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,2 +1,2 @@
 DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B 
da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720
 SHA512 
26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a
-DIST PyQt-builder-1.11.0.tar.gz 5704150 BLAKE2B 
4706e8c8663356e7c70b60c19c45db726de6b7b1b05f218aba5a966318cea497219f685f295b9069c0059e88eca053a97717a7a52add7c5ea59820bff2b810ea
 SHA512 
4eeafaa725afeffa5794cc47e733ecfa99887c0f14f461843f4b8c71fbdb2ecf58ba05ca64dbec3e00bb2c192a25e29ee78e93d0bad742becb3379bd357e8e68
+DIST PyQt-builder-1.12.1.tar.gz 5726601 BLAKE2B 
6e6dd181078ed126ecf3db7bbf5e7b68b78ec78e2ca198fb4f504495020c8fc7d61280bf844a78de69621049785b0b152f31d0d25779d7bbe330162bb80b68bf
 SHA512 
4f006564f51758cb05da8dce78aead58a23d132405124e92bf79cac39eaa845efa5db15a2abdd43ae95e191d38d81fbc592f75bb68f83b83e25c51f8f84e6182

diff --git a/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild
similarity index 95%
rename from dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild
rename to dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild
index 4d69521c2f0..45ce770808f 100644
--- a/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
dev-python/packaging[${PYTHON_USEDEP}]
-   >=dev-python/sip-5.5[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.3[${PYTHON_USEDEP}]
 "
 
 distutils_enable_sphinx doc --no-autodoc



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-10-13 Thread Davide Pesavento
commit: 7c8c45fe3eabeb7249251c1a2637a0b072999afc
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Oct 13 20:02:16 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Oct 13 20:02:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c8c45fe

dev-python/sip: add 6.3.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest |  1 +
 dev-python/sip/sip-6.3.1.ebuild | 32 
 2 files changed, 33 insertions(+)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 0ef5c4fc15f..1cf587fd429 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,4 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
 DIST sip-6.2.0.tar.gz 1181661 BLAKE2B 
7f5638005a01fc1bd60ef6156027db625faa393d5ee9155c88c88aea88e4c5ce63c30a2542cd89aea7c7e066cbbf77aab9ee9d2a45210dcad964e38052cb06d3
 SHA512 
88e4447aaa574a312bdfbb6ef78fdb95824f33d79988cdf5c824952b7f3535973eed6d8eece7b8c9ce8b442aaa2235e252d438f2316d13272a35c484dd4fda42
+DIST sip-6.3.1.tar.gz 1200906 BLAKE2B 
2dcce853a1f3912138a2830b2370db518400119c5819070fd0cfc6ffebee06bf6629ae521cca535f5873859b141831dcfad7b077321356ce2ae69ec15ee28d6a
 SHA512 
69705c2552a87d451ea989b99bb7e3fb15163447a3a5b3625e9e6509ce9e59d52fbfbb19ab911a2efe35219a50c08f0dcb25e16b222e0c8e1094dee0fc4b3b97

diff --git a/dev-python/sip/sip-6.3.1.ebuild b/dev-python/sip/sip-6.3.1.ebuild
new file mode 100644
index 000..f917f01
--- /dev/null
+++ b/dev-python/sip/sip-6.3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ 
https://pypi.org/project/sip/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+   !

[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt-builder/

2021-10-03 Thread Davide Pesavento
commit: 2ef4270d05ea482710350bd346ddf9fa85dd5941
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Oct  3 17:40:42 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Oct  3 17:40:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef4270d

dev-python/PyQt-builder: add 1.11.0

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt-builder/Manifest   |  1 +
 dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild | 37 ++
 2 files changed, 38 insertions(+)

diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index 92a7b1888aa..9feed8b5ebc 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1 +1,2 @@
 DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B 
da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720
 SHA512 
26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a
+DIST PyQt-builder-1.11.0.tar.gz 5704150 BLAKE2B 
4706e8c8663356e7c70b60c19c45db726de6b7b1b05f218aba5a966318cea497219f685f295b9069c0059e88eca053a97717a7a52add7c5ea59820bff2b810ea
 SHA512 
4eeafaa725afeffa5794cc47e733ecfa99887c0f14f461843f4b8c71fbdb2ecf58ba05ca64dbec3e00bb2c192a25e29ee78e93d0bad742becb3379bd357e8e68

diff --git a/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild
new file mode 100644
index 000..4d69521c2f0
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ 
https://pypi.org/project/PyQt-builder/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+   dev-python/packaging[${PYTHON_USEDEP}]
+   >=dev-python/sip-5.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+   # don't install prebuilt Windows DLLs
+   sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+   rm -r "${PN/-/_}.egg-info" || die
+
+   distutils-r1_python_prepare_all
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-10-03 Thread Davide Pesavento
commit: a366b1d3f14a0aa92552bc5bc344181c98a7a266
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Oct  3 17:27:15 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Oct  3 17:27:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a366b1d3

dev-python/sip: bump to 6.2.0 final

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest | 2 +-
 dev-python/sip/{sip-6.2.0_pre2108241238.ebuild => sip-6.2.0.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 60a7f8c6976..0ef5c4fc15f 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,3 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.dev2108241238.tar.gz 1180949 BLAKE2B 
4d5eb427cfd786d7652b9860d2aa0468cdf7b5ab20d10da00f2b3e3c9c4b12710e2f8240c335f9e3d5802a995a848d6e85cfaf615640939456b8e4b866d9f5a4
 SHA512 
8299e96171cede2ca840086f09a2204d378f8ef97b05aa2a81aef1fc097bdcf363fbc585b36539f0280449cfbae859b1104a67ec6858ef8de19982d349389d3a
+DIST sip-6.2.0.tar.gz 1181661 BLAKE2B 
7f5638005a01fc1bd60ef6156027db625faa393d5ee9155c88c88aea88e4c5ce63c30a2542cd89aea7c7e066cbbf77aab9ee9d2a45210dcad964e38052cb06d3
 SHA512 
88e4447aaa574a312bdfbb6ef78fdb95824f33d79988cdf5c824952b7f3535973eed6d8eece7b8c9ce8b442aaa2235e252d438f2316d13272a35c484dd4fda42

diff --git a/dev-python/sip/sip-6.2.0_pre2108241238.ebuild 
b/dev-python/sip/sip-6.2.0.ebuild
similarity index 100%
rename from dev-python/sip/sip-6.2.0_pre2108241238.ebuild
rename to dev-python/sip/sip-6.2.0.ebuild



[gentoo-commits] proj/qt:master commit in: dev-qt/assistant/

2021-09-15 Thread Davide Pesavento
commit: 068106352defed14782534201d45c009745a19a9
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 20:24:38 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 20:24:38 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=06810635

dev-qt/assistant: png support in qtgui is required

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/assistant/assistant-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/assistant/assistant-5.15.2..ebuild 
b/dev-qt/assistant/assistant-5.15.2..ebuild
index 54070de8..f9f9de34 100644
--- a/dev-qt/assistant/assistant-5.15.2..ebuild
+++ b/dev-qt/assistant/assistant-5.15.2..ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
-   =dev-qt/qtgui-${QT5_PV}*
+   =dev-qt/qtgui-${QT5_PV}*[png]
=dev-qt/qthelp-${QT5_PV}*
=dev-qt/qtnetwork-${QT5_PV}*
=dev-qt/qtprintsupport-${QT5_PV}*



[gentoo-commits] proj/qt:master commit in: dev-qt/linguist/

2021-09-15 Thread Davide Pesavento
commit: 06e6b5cc49fbc5fc882df73e23fdc46b77eb9728
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 20:33:29 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 20:33:29 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=06e6b5cc

dev-qt/linguist: png support in qtgui is required

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/linguist/linguist-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/linguist/linguist-5.15.2..ebuild 
b/dev-qt/linguist/linguist-5.15.2..ebuild
index aaf4b04c..26dab35c 100644
--- a/dev-qt/linguist/linguist-5.15.2..ebuild
+++ b/dev-qt/linguist/linguist-5.15.2..ebuild
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND="
=dev-qt/designer-${QT5_PV}*
=dev-qt/qtcore-${QT5_PV}*:5=
-   =dev-qt/qtgui-${QT5_PV}*:5=
+   =dev-qt/qtgui-${QT5_PV}*:5=[png]
=dev-qt/qtprintsupport-${QT5_PV}*
=dev-qt/qtwidgets-${QT5_PV}*
=dev-qt/qtxml-${QT5_PV}*



[gentoo-commits] proj/qt:master commit in: dev-qt/pixeltool/

2021-09-15 Thread Davide Pesavento
commit: 7f83e7546377d925778f1026497b6249d8438cc6
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 20:30:28 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 20:30:28 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7f83e754

dev-qt/pixeltool: png support in qtgui is required

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/pixeltool/pixeltool-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/pixeltool/pixeltool-5.15.2..ebuild 
b/dev-qt/pixeltool/pixeltool-5.15.2..ebuild
index e759fce4..c22d90fb 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.2..ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.2..ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
-   =dev-qt/qtgui-${QT5_PV}*:5=
+   =dev-qt/qtgui-${QT5_PV}*:5=[png]
=dev-qt/qtwidgets-${QT5_PV}*
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/qt:master commit in: dev-qt/designer/

2021-09-15 Thread Davide Pesavento
commit: 5a0d14b1c0ea4d7a59ed40ba26852d13d0878689
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 20:27:43 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 20:27:43 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5a0d14b1

dev-qt/designer: png support in qtgui is required

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/designer/designer-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/designer/designer-5.15.2..ebuild 
b/dev-qt/designer/designer-5.15.2..ebuild
index 4575bd83..971f7911 100644
--- a/dev-qt/designer/designer-5.15.2..ebuild
+++ b/dev-qt/designer/designer-5.15.2..ebuild
@@ -16,7 +16,7 @@ IUSE="declarative"
 
 DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
-   =dev-qt/qtgui-${QT5_PV}*:5=
+   =dev-qt/qtgui-${QT5_PV}*:5=[png]
=dev-qt/qtnetwork-${QT5_PV}*
=dev-qt/qtprintsupport-${QT5_PV}*
=dev-qt/qtwidgets-${QT5_PV}*



[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/

2021-09-15 Thread Davide Pesavento
commit: a8beb98007cfd5f192b85416bee4b75633bda63a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 17:55:07 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 17:55:07 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a8beb980

dev-qt/qtgui: usex -> usev

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtgui/qtgui-5.15.2..ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild 
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index 0473a9e1..0c0cb718 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -154,15 +154,15 @@ src_prepare() {
 
 src_configure() {
local myconf=(
-   $(usex dbus -dbus-linked '')
+   $(usev dbus -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
-   $(usex eglfs '-gbm -kms' '')
+   $(usev eglfs '-gbm -kms')
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
-system-freetype
-   $(usex gif '' -no-gif)
+   $(usev !gif -no-gif)
-gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
@@ -174,7 +174,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use vulkan)
$(qt_use X xcb)
-   $(usex X '-xcb-xlib -DUSE_X11' '')
+   $(usev X '-xcb-xlib -DUSE_X11')
)
if use libinput || use X; then
myconf+=( -xkbcommon )



[gentoo-commits] proj/qt:master commit in: dev-qt/qtvirtualkeyboard/

2021-09-15 Thread Davide Pesavento
commit: 281ac959eb846ae4b0883f46fc6d27c4224c4a79
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 17:58:34 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 17:58:34 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=281ac959

dev-qt/qtvirtualkeyboard: usex -> usev

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2..ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2..ebuild 
b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2..ebuild
index 3975b92c..88574820 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2..ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2..ebuild
@@ -26,9 +26,9 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
local myqmakeargs=(
-   $(usex handwriting CONFIG+=lipi-toolkit '')
-   $(usex spell '' CONFIG+=disable-hunspell)
-   $(usex X '' CONFIG+=disable-desktop)
+   $(usev handwriting CONFIG+=lipi-toolkit)
+   $(usev !spell CONFIG+=disable-hunspell)
+   $(usev !X CONFIG+=disable-desktop)
CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE 
\
lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
@@ -38,6 +38,5 @@ src_configure() {
lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
lang-uk_UA lang-vi_VN"
)
-
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtscript/

2021-09-15 Thread Davide Pesavento
commit: 84cfe0f3a79573cf075f622d1f0f56230e59e72b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 20:01:38 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 20:01:38 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=84cfe0f3

dev-qt/qtscript: simplify usex invocation

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtscript/qtscript-5.15.2..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtscript/qtscript-5.15.2..ebuild 
b/dev-qt/qtscript/qtscript-5.15.2..ebuild
index c11ddc1b..ca4cdaa6 100644
--- a/dev-qt/qtscript/qtscript-5.15.2..ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.2..ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 
 src_configure() {
local myqmakeargs=(
-   JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
+   JAVASCRIPTCORE_JIT=$(usex jit)
)
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/

2021-09-15 Thread Davide Pesavento
commit: 41f14b18478482680d2881b28f1677ff4f2eb3fb
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 18:36:36 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 18:36:36 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=41f14b18

dev-qt/qtnetwork: usex -> qt_use

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild 
b/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
index db4d08b4..e82f5de0 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2..ebuild
@@ -53,7 +53,7 @@ pkg_setup() {
 src_configure() {
local myconf=(
$(usev connman -dbus-linked)
-   $(usex gssapi -feature-gssapi -no-feature-gssapi)
+   $(qt_use gssapi feature-gssapi)
$(qt_use libproxy)
$(usev networkmanager -dbus-linked)
$(qt_use sctp)
@@ -64,6 +64,7 @@ src_configure() {
 
 src_install() {
qt5-build_src_install
+
# workaround for bug 652650
if use ssl; then
sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/

2021-09-15 Thread Davide Pesavento
commit: fe7c57e795032cfc14d382f556973167f4d89ceb
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Sep 15 19:58:40 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Sep 15 19:58:40 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fe7c57e7

dev-qt/qtwebengine: usex -> qt_use

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-5.15.2..ebuild | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2..ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.2..ebuild
index 3e77c7f4..ccd7ebbc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2..ebuild
@@ -198,13 +198,13 @@ src_configure() {
-printing-and-pdf
-system-opus
-system-webp
-   $(usex alsa '-alsa' '-no-alsa')
-   $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
-   $(usex geolocation '-webengine-geolocation' 
'-no-webengine-geolocation')
-   $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
-   $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
-   $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
-   $(usex system-icu '-webengine-icu' '-no-webengine-icu')
+   $(qt_use alsa)
+   $(qt_use !bindist proprietary-codecs)
+   $(qt_use geolocation webengine-geolocation)
+   $(qt_use kerberos webengine-kerberos)
+   $(qt_use pulseaudio)
+   $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+   $(qt_use system-icu webengine-icu)
)
qt5-build_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: profiles/

2021-09-12 Thread Davide Pesavento
commit: 75d179d0f68baee20c0dfb12fa7981e07aafb9d8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Sep 13 01:13:23 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Sep 13 01:13:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d179d0

package.mask: unmask sip-6 and reverse deps

Signed-off-by: Davide Pesavento  gentoo.org>

 profiles/package.mask | 8 
 1 file changed, 8 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 10ac5a89380..60c9b241092 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -294,14 +294,6 @@ sys-libs/db:5.1
 # which is currently not available in Gentoo.
 >=games-server/minecraft-server-1.17
 
-# Davide Pesavento  (2021-06-15)
-# Masked for revdep testing.
->=dev-python/sip-6
->=dev-python/PyQt5-5.15.5_pre
->=dev-python/PyQtWebEngine-5.15.5_pre
->=dev-python/qscintilla-python-2.13
->=app-text/calibre-5.25.0
-
 # Sam James  (2021-06-12)
 # Masked until all reverse dependencies support
 # OCaml 4.12.



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2021-09-12 Thread Davide Pesavento
commit: cd5c2719d2a6ce6e6569500736b10ddc74eb9d7b
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Sep 13 00:41:42 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Sep 13 00:41:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5c2719

profiles/base: cleanup obsolete dev-python/PyQt5[webkit] mask

Signed-off-by: Davide Pesavento  gentoo.org>

 profiles/base/package.use.mask | 1 -
 1 file changed, 1 deletion(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 609e707fa76..db607dc0e6d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -38,7 +38,6 @@ net-print/hplip-plugin orblite
 # Bugs: #684580, #750893
 app-office/kexi webkit
 dev-libs/kreport webkit
-dev-python/PyQt5 webkit
 media-plugins/mythplugins mythbrowser mythmusic
 net-irc/kvirc webkit
 



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/arch/powerpc/

2021-09-12 Thread Davide Pesavento
commit: 1e1e6c1e4627d45be825331a9bd54f23f5624678
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Sep 13 00:41:05 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Sep 13 00:41:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1e6c1e

profiles/arch/{arm,powerpc}: cleanup obsolete dev-python/PyQt5[networkauth] mask

Signed-off-by: Davide Pesavento  gentoo.org>

 profiles/arch/arm/package.use.mask | 5 -
 profiles/arch/powerpc/package.use.mask | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/profiles/arch/arm/package.use.mask 
b/profiles/arch/arm/package.use.mask
index 0b0f7f6b812..53436728e7a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -188,11 +188,6 @@ net-im/ejabberd hipe
 # (SM)BIOS/Thunderbolt outside of amd64/x86? - citation needed
 sys-apps/fwupd dell thunderbolt
 
-# Davide Pesavento  (2018-12-27)
-# The corresponding Qt5 modules are not keyworded on arm, and we don't want to
-# keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 networkauth
-
 # Thomas Deutschmann  (2018-10-12)
 # Requires www-client/firefox which isn't available on ARM yet
 # due to dev-lang/rust requirement

diff --git a/profiles/arch/powerpc/package.use.mask 
b/profiles/arch/powerpc/package.use.mask
index ec0d3456c1f..433f3d1f5a8 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -199,7 +199,7 @@ dev-db/percona-server -numa
 # Davide Pesavento  (2016-07-28)
 # The corresponding Qt5 modules are not keyworded on ppc, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 bluetooth location networkauth speech
+dev-python/PyQt5 bluetooth location speech
 
 # Michael Palimaka  (2016-07-07)
 # Requires unkeyworded dependencies



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-09-12 Thread Davide Pesavento
commit: 90da40319df7c36858f40440d865246f17d35517
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Sep 12 21:33:54 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Sep 12 21:34:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90da4031

dev-python/sip: 6.2 snapshot bump

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest | 2 +-
 .../{sip-6.2.0_pre2108061427.ebuild => sip-6.2.0_pre2108241238.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 963c037941b..60a7f8c6976 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,3 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.dev2108061427.tar.gz 1180652 BLAKE2B 
fa1b64d1960c2687a0eaf8a8e611885a7860d46fe3a23be65d86ac3bb33c19d2d6796461aa04dc75568ca8313aee04a74b848e31897889b02f96966aa0de4c89
 SHA512 
68f9708b7113516c25257890c1dd3b4497b9268193c3000fc29b372e82e15cdbfb66c8a6417e066e257f4a28e336f04ada6e126207d5b8778e78e0b9970f62d2
+DIST sip-6.2.0.dev2108241238.tar.gz 1180949 BLAKE2B 
4d5eb427cfd786d7652b9860d2aa0468cdf7b5ab20d10da00f2b3e3c9c4b12710e2f8240c335f9e3d5802a995a848d6e85cfaf615640939456b8e4b866d9f5a4
 SHA512 
8299e96171cede2ca840086f09a2204d378f8ef97b05aa2a81aef1fc097bdcf363fbc585b36539f0280449cfbae859b1104a67ec6858ef8de19982d349389d3a

diff --git a/dev-python/sip/sip-6.2.0_pre2108061427.ebuild 
b/dev-python/sip/sip-6.2.0_pre2108241238.ebuild
similarity index 100%
rename from dev-python/sip/sip-6.2.0_pre2108061427.ebuild
rename to dev-python/sip/sip-6.2.0_pre2108241238.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/

2021-09-02 Thread Davide Pesavento
commit: e07d2b85cc03372aa875167cc3b4c2aeb09d02a6
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Sep  3 04:02:44 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Sep  3 04:02:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e07d2b85

dev-python/PyQt5: drop 5.15.2

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt5/Manifest|   1 -
 dev-python/PyQt5/PyQt5-5.15.2.ebuild | 190 ---
 dev-python/PyQt5/metadata.xml|   2 -
 3 files changed, 193 deletions(-)

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 8137bd13116..82a985d16fd 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,3 +1,2 @@
-DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 
7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9
 SHA512 
6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 
96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c
 SHA512 
6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
 DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 
8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853
 SHA512 
5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5

diff --git a/dev-python/PyQt5/PyQt5-5.15.2.ebuild 
b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
deleted file mode 100644
index 69434bfb614..000
--- a/dev-python/PyQt5/PyQt5-5.15.2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help 
location
-   multimedia network networkauth opengl positioning printsupport sensors 
serialport
-   sql +ssl svg testlib webchannel webkit websockets widgets x11extras 
xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-   bluetooth? ( gui )
-   declarative? ( gui network )
-   designer? ( widgets )
-   help? ( gui widgets )
-   location? ( positioning )
-   multimedia? ( gui network )
-   networkauth? ( network )
-   opengl? ( gui widgets )
-   positioning? ( gui )
-   printsupport? ( gui widgets )
-   sensors? ( gui )
-   serialport? ( gui )
-   sql? ( widgets )
-   svg? ( gui widgets )
-   testlib? ( widgets )
-   webchannel? ( network )
-   webkit? ( gui network printsupport widgets )
-   websockets? ( network )
-   widgets? ( gui )
-   xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.15:5"
-
-RDEPEND="${PYTHON_DEPS}
-   >=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
-   >=dev-qt/qtcore-${QT_PV}
-   >=dev-qt/qtxml-${QT_PV}
-   bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-   dbus? (
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   >=dev-qt/qtdbus-${QT_PV}
-   )
-   declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-   designer? ( >=dev-qt/designer-${QT_PV} )
-   gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-   help? ( >=dev-qt/qthelp-${QT_PV} )
-   location? ( >=dev-qt/qtlocation-${QT_PV} )
-   multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-   network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-   networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-   opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-   positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-   printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-   sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-   serialport? ( >=dev-qt/qtser

[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5-sip/

2021-09-02 Thread Davide Pesavento
commit: c50cdf2a630c7a3415aa2056cdc3d09b3b50bd70
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Sep  3 03:49:53 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Sep  3 03:49:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50cdf2a

dev-python/PyQt5-sip: drop 4.19.25

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt5-sip/Manifest |  1 -
 dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild | 90 ---
 2 files changed, 91 deletions(-)

diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index d73189a9f51..ac479caad27 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,2 +1 @@
 DIST PyQt5_sip-12.9.0.tar.gz 103007 BLAKE2B 
461973ce3563c27ce5a6e3a537cf9a8e53adc8ddde36ec1d2eb7abb986908151ece99ff8756f752d2c6e331a3e9b7b70813d35f8701cedd7f09e6edbcc435121
 SHA512 
ca6f3b18b64391fded88732a8109a04d85727bbddecdf126679b187c7f0487c3c1f69ada3e8c54051281a43c6f2de70390ac5ff18a1bed79994070ddde730c5f
-DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001

diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild 
b/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
deleted file mode 100644
index b939f27a34f..000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="sip extension module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/";
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-   !

[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQtWebEngine/

2021-09-02 Thread Davide Pesavento
commit: 423fac57385dabfaf7ceacf780de479e463293a1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Sep  3 03:52:54 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Sep  3 03:52:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=423fac57

dev-python/PyQtWebEngine: drop 5.15.2

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQtWebEngine/Manifest  |  1 -
 .../PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild  | 75 --
 2 files changed, 76 deletions(-)

diff --git a/dev-python/PyQtWebEngine/Manifest 
b/dev-python/PyQtWebEngine/Manifest
index 3c7ba7fdf37..788d8a3d02e 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,3 +1,2 @@
-DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B 
a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31
 SHA512 
7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 
0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b
 SHA512 
25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 DIST PyQtWebEngine-5.15.5.dev2108100905.tar.gz 49043 BLAKE2B 
01b75db0d9fa973ccd0a85f9336e16b7c1fb2a303a0d004d247f91744dc642edb836597877fce6c4f038afa6f87ba066eeaca1e3d467bc15689dbe82e8a9809e
 SHA512 
1ea407832f062dc9b9a6c6312feb4c8f3553b55972e5a32c70c9d1c278918d32934791d60c022a56ab507b6215d5f78e1b4244b9fffa3256aad1f5f4afebd47a

diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild 
b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
deleted file mode 100644
index 3e2edbd1147..000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="debug"
-
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   
>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-   >=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-   dev-qt/qtcore:5
-   dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-   >=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-   configuration() {
-   local myconf=(
-   "${PYTHON}"
-   "${S}"/configure.py
-   --qmake="$(qt5_get_bindir)"/qmake
-   $(usex debug '--debug --trace' '')
-   --verbose
-   )
-   echo "${myconf[@]}"
-   "${myconf[@]}" || die
-
-   # Fix parallel install failure
-   sed -i -e '/INSTALLS += distinfo/i distinfo.depends = 
install_subtargets install_pep484_stubs install_api' \
-   ${PN}.pro || die
-
-   # Run eqmake to respect toolchain and build flags
-   eqmake5 -recursive ${PN}.pro
-   }
-   python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-   python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-   installation() {
-   emake INSTALL_ROOT="${D}" install
-   python_optimize
-   }
-   python_foreach_impl run_in_build_dir installation
-
-   einstalldocs
-}



[gentoo-commits] repo/gentoo:master commit in: licenses/

2021-08-16 Thread Davide Pesavento
commit: cdc0abb3cbc519dca0b0fac81fff71fcaee192db
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug 16 22:51:52 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Aug 16 22:51:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc0abb3

licenses: sync SIP license with latest upstream version

https://www.riverbankcomputing.com/hg/sip/rev/e0a63c5e1c95
https://www.riverbankcomputing.com/hg/sip/file/861f5e3a33dd/LICENSE

Signed-off-by: Davide Pesavento  gentoo.org>

 licenses/SIP | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/licenses/SIP b/licenses/SIP
index 5c2906dc4e2..9406c3085a7 100644
--- a/licenses/SIP
+++ b/licenses/SIP
@@ -1,18 +1,19 @@
 RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP
 
-1. This LICENSE AGREEMENT is between Riverbank Computing Limited ("Riverbank"),
-and the Individual or Organization ("Licensee") accessing and otherwise using
-SIP software in source or binary form and its associated documentation.  SIP
-comprises a software tool for generating Python bindings for software C and C++
-libraries, and a Python extension module used at runtime by those generated
-bindings.
+1. This LICENSE AGREEMENT ("the SIP License") is between Riverbank Computing
+Limited ("Riverbank"), and the Individual or Organization ("Licensee")
+accessing and otherwise using SIP software in source or binary form and its
+associated documentation.  SIP comprises a software tool for generating Python
+bindings for software C and C++ libraries, and a Python extension module used
+at runtime by those generated bindings.  This License Agreement may also be
+applied to other software packages written by Riverbank.
 
 2. Subject to the terms and conditions of this License Agreement, Riverbank
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license to
 reproduce, analyze, test, perform and/or display publicly, prepare derivative
 works, distribute, and otherwise use SIP alone or in any derivative version,
 provided, however, that Riverbank's License Agreement and Riverbank's notice of
-copyright, e.g., "Copyright (c) 2014 Riverbank Computing Limited; All Rights
+copyright, e.g., "Copyright (c) 2015 Riverbank Computing Limited; All Rights
 Reserved" are retained in SIP alone or in any derivative version prepared by
 Licensee.
 



[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-python/PyQtWebEngine/

2021-08-15 Thread Davide Pesavento
commit: 3505313b1bc80620f331af7d76f8c23eb76a32a3
Author: Chris Pritchard  christopherpritchard  co  uk>
AuthorDate: Sun Aug 15 07:35:32 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Aug 15 07:46:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3505313b

dev-python/PyQtWebEngine: add 5.15.5_pre2108100905, EAPI 8

Switch build system to sip-build

Bug: https://bugs.gentoo.org/805965
Closes: https://github.com/gentoo/gentoo/pull/21854
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Chris Pritchard  christopherpritchard.co.uk>
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQtWebEngine/Manifest  |  1 +
 .../PyQtWebEngine-5.15.5_pre2108100905.ebuild  | 76 ++
 profiles/package.mask  |  1 +
 3 files changed, 78 insertions(+)

diff --git a/dev-python/PyQtWebEngine/Manifest 
b/dev-python/PyQtWebEngine/Manifest
index e8c22cbea35..3c7ba7fdf37 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,2 +1,3 @@
 DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B 
a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31
 SHA512 
7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 
0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b
 SHA512 
25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
+DIST PyQtWebEngine-5.15.5.dev2108100905.tar.gz 49043 BLAKE2B 
01b75db0d9fa973ccd0a85f9336e16b7c1fb2a303a0d004d247f91744dc642edb836597877fce6c4f038afa6f87ba066eeaca1e3d467bc15689dbe82e8a9809e
 SHA512 
1ea407832f062dc9b9a6c6312feb4c8f3553b55972e5a32c70c9d1c278918d32934791d60c022a56ab507b6215d5f78e1b4244b9fffa3256aad1f5f4afebd47a

diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild 
b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild
new file mode 100644
index 000..ab576366582
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ 
https://pypi.org/project/PyQtWebEngine/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="${PYTHON_DEPS}
+   
>=dev-python/PyQt5-5.15.5_pre2107091435[gui,network,printsupport,webchannel,widgets,${PYTHON_USEDEP}]
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwebengine:5[widgets]
+"
+RDEPEND="${DEPEND}
+   >=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   >=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
+   dev-qt/qtcore:5
+"
+
+src_configure() {
+   configuration() {
+   local myconf=(
+   sip-build
+   --verbose
+   --build-dir="${BUILD_DIR}"
+   --scripts-dir="$(python_get_scriptdir)"
+   --qmake="$(qt5_get_bindir)"/qmake
+   --no-make
+   $(usev debug '--debug --qml-debug --tracing')
+   )
+   echo "${myconf[@]}"
+   "${myconf[@]}" || die
+
+   # Run eqmake to respect toolchain and build flags
+   run_in_build_dir eqmake5 -recursive ${PN}.pro
+   }
+   python_foreach_impl configuration
+}
+
+src_compile() {
+   python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+   installation() {
+   emake INSTALL_ROOT="${D}" install
+   python_optimize
+   }
+   python_foreach_impl run_in_build_dir installation
+
+   einstalldocs
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index 4c13256bfe7..99eb485b04d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -462,6 +462,7 @@ sys-libs/db:5.1
 # Masked for revdep testing.
 >=dev-python/sip-6
 >=dev-python/PyQt5-5.15.5_pre
+>=dev-python/PyQtWebEngine-5.15.5_pre
 >=dev-python/qscintilla-python-2.13
 
 # Sam James  (2021-06-12)



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-08-14 Thread Davide Pesavento
commit: 4096689cee38cd7c6d1f02d7f63de009036f808f
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Aug 15 06:30:35 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Aug 15 06:30:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4096689c

dev-python/sip: 6.2 snapshot bump

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest | 2 +-
 .../{sip-6.2.0_pre2107131757.ebuild => sip-6.2.0_pre2108061427.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index ccc173e4bd8..963c037941b 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,3 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.dev2107131757.tar.gz 1180225 BLAKE2B 
456111e610d872c4b7a875f99e151a82ba3ed1ff11f7d93b19558c52f37e710e448387256d0f620a497d260d97c583c53cbcc5a42affd6e7c05e4f557ae97732
 SHA512 
260d86d676a56440ac78099de9998697114ed5deb1ed15299aaea68b49b8ea829dfb92f990762875abff0a0c653e4998f1a91437895ba8d38cdac5cf4f2c5761
+DIST sip-6.2.0.dev2108061427.tar.gz 1180652 BLAKE2B 
fa1b64d1960c2687a0eaf8a8e611885a7860d46fe3a23be65d86ac3bb33c19d2d6796461aa04dc75568ca8313aee04a74b848e31897889b02f96966aa0de4c89
 SHA512 
68f9708b7113516c25257890c1dd3b4497b9268193c3000fc29b372e82e15cdbfb66c8a6417e066e257f4a28e336f04ada6e126207d5b8778e78e0b9970f62d2

diff --git a/dev-python/sip/sip-6.2.0_pre2107131757.ebuild 
b/dev-python/sip/sip-6.2.0_pre2108061427.ebuild
similarity index 100%
rename from dev-python/sip/sip-6.2.0_pre2107131757.ebuild
rename to dev-python/sip/sip-6.2.0_pre2108061427.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-08-13 Thread Davide Pesavento
commit: e45f1203dd9c91172022b48ba0c18050131be006
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Aug 13 22:09:01 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Aug 13 22:09:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45f1203

dev-python/sip: drop 4.19.25

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/sip-4.19.25.ebuild | 94 ---
 1 file changed, 94 deletions(-)

diff --git a/dev-python/sip/sip-4.19.25.ebuild 
b/dev-python/sip/sip-4.19.25.ebuild
deleted file mode 100644
index e9338c4d957..000
--- a/dev-python/sip/sip-4.19.25.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/";
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-   # Sub-slot sanity check
-   local sub_slot=${SLOT#*/}
-   local sip_api_major_nr=$(sed -nre 's:^#define 
SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-   if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-   eerror
-   eerror "Ebuild sub-slot (${sub_slot}) does not match 
SIP_API_MAJOR_NR (${sip_api_major_nr})"
-   eerror "Please update SLOT variable as follows:"
-   eerror "SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-   eerror
-   die "sub-slot sanity check failed"
-   fi
-
-   default
-}
-
-src_configure() {
-   configuration() {
-   local incdir=$(python_get_includedir)
-   local myconf=(
-   "${PYTHON}"
-   "${S}"/configure.py
-   --sysroot="${ESYSROOT}/usr"
-   --bindir="${EPREFIX}/usr/bin"
-   --destdir="$(python_get_sitedir)"
-   --incdir="${incdir#${SYSROOT}}"
-   AR="$(tc-getAR) cqs"
-   CC="$(tc-getCC)"
-   CFLAGS="${CFLAGS}"
-   CFLAGS_RELEASE=
-   CXX="$(tc-getCXX)"
-   CXXFLAGS="${CXXFLAGS}"
-   CXXFLAGS_RELEASE=
-   LINK="$(tc-getCXX)"
-   LINK_SHLIB="$(tc-getCXX)"
-   LFLAGS="${LDFLAGS}"
-   LFLAGS_RELEASE=
-   RANLIB=
-   STRIP=
-   )
-   echo "${myconf[@]}"
-   "${myconf[@]}" || die
-   }
-   python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-   python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-   installation() {
-   emake DESTDIR="${D}" install
-   python_optimize
-   }
-   python_foreach_impl run_in_build_dir installation
-
-   einstalldocs
-   use doc && dodoc -r doc/html
-}



[gentoo-commits] proj/qt:master commit in: /

2021-08-06 Thread Davide Pesavento
commit: 1888cd012eaaa80f0eb5d6c6fb01e54a9f7a7b84
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Aug  6 07:44:33 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Aug  6 07:44:33 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1888cd01

Remove obsolete travis badge from README.md

Signed-off-by: Davide Pesavento  gentoo.org>

 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 1d398701..861fd6da 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # Welcome to the qt overlay!
 
-[![Repoman 
Status](https://travis-ci.org/gentoo/qt.png)](https://travis-ci.org/gentoo/qt)
-
 This is where the Gentoo Qt project develops and maintains ebuilds for
 experimental Qt versions (pre-releases and "live" code from git) and
 Qt-related packages. For your convenience, we also provide a few package



[gentoo-commits] proj/qt:master commit in: /

2021-08-06 Thread Davide Pesavento
commit: 1be44f568c96418a7b3d557e3307ea515bcbadfe
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Aug  6 07:40:28 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Aug  6 07:40:28 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1be44f56

Remove .travis.yml

Signed-off-by: Davide Pesavento  gentoo.org>

 .travis.yml | 42 --
 1 file changed, 42 deletions(-)

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0f7089be..
--- a/.travis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Run repoman via travis
-# See https://github.com/mrueg/repoman-travis
-#
-language: python
-python:
-- pypy
-env:
-- PORTAGE_VER="2.3.78"
-before_install:
-- sudo apt-get -qq update
-- pip install lxml pyyaml
-before_script:
-- sudo chmod a+rwX /etc/passwd /etc/group /etc /var /var/cache
-- mkdir -p travis-overlay /etc/portage /var/cache/distfiles 
/var/db/repos/gentoo
-- mv !(travis-overlay) travis-overlay/
-- mv .git travis-overlay/
-- wget 
"https://raw.githubusercontent.com/mrueg/repoman-travis/master/.travis.yml"; -O 
.travis.yml.upstream
-- wget 
"https://raw.githubusercontent.com/mrueg/repoman-travis/master/spinner.sh";
-- wget -qO - 
"https://github.com/gentoo/portage/archive/portage-${PORTAGE_VER}.tar.gz"; | tar 
xz
-- wget -qO - 
"https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz"; | tar xz -C 
/var/db/repos/gentoo --strip-components=1
-- chmod a+rwx spinner.sh
-- echo "portage:x:250:250:portage:/var/tmp/portage:/bin/false" >> 
/etc/passwd
-- echo "portage::250:portage,travis" >> /etc/group
-- wget "https://www.gentoo.org/dtd/metadata.dtd"; -O 
/var/cache/distfiles/metadata.dtd
-- ln -s $TRAVIS_BUILD_DIR/portage-portage-${PORTAGE_VER}/cnf/repos.conf 
/etc/portage/repos.conf
-- ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.0 
/etc/portage/make.profile
-- SIZE=$(stat -c %s .travis.yml.upstream)
-- if ! cmp -n $SIZE -s .travis.yml .travis.yml.upstream; then echo -e 
"\e[31m !!! .travis.yml outdated! Update available 
https://github.com/mrueg/repoman-travis \e[0m" > /tmp/update ; fi
-- cd travis-overlay
-script:
-- ./../spinner.sh "python 
../portage-portage-${PORTAGE_VER}/repoman/bin/repoman full -d"
-# You can append own scripts after this line
-notifications:
-  irc:
-channels:
-  - "chat.freenode.net#gentoo-qt"
-template:
-  - "%{repository}#%{build_number} (%{branch} - %{commit}): %{message}"
-  - "%{author} - %{commit_message}"
-  - "Change view : %{compare_url}"
-  - "Build details : %{build_url}"



[gentoo-commits] proj/qt:master commit in: Documentation/

2021-08-06 Thread Davide Pesavento
commit: 57bd5a3d7f2bbfc38dd5a0f0b44b5f02ead308eb
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Aug  6 07:40:51 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Aug  6 07:40:51 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=57bd5a3d

Remove obsolete FAQ

Signed-off-by: Davide Pesavento  gentoo.org>

 Documentation/qt-faq.rst | 67 
 1 file changed, 67 deletions(-)

diff --git a/Documentation/qt-faq.rst b/Documentation/qt-faq.rst
deleted file mode 100644
index 9eabffaf..
--- a/Documentation/qt-faq.rst
+++ /dev/null
@@ -1,67 +0,0 @@
-===
-  Qt on Gentoo Frequently Asked Questions
-===
-
-:Author: Ben de Groot 
-
-.. contents::
-.. sectnum::
-
-How can I contribute to this overlay?
--
-
-Please, read Documentation/maintainers/README file for proper ways to submit
-bugs and patches for the Qt overlay
-
-Why do I need qt3support?
--
-
-First of all, qt3support is a useflag that enables the qt-qt3support module in
-Qt4, as well as needed code in other Qt4 modules. It does in no way depend on
-Qt3. It contains classes that make porting Qt3 applications and libraries to
-Qt4 easier. They are Qt4 classes that emulate Qt3 behavior. This is really only
-interesting for the developer of that package, not for the user.
-
-Any Qt4-based package that uses these classes from Qt4's qt3support will
-require the qt3support useflag to be enabled. This means the useflag needs to
-be enabled for all Qt4 modules that have this useflag. Enabling it for one but
-not other modules would break things, either at compile time or at runtime, so
-we force the usage: it must be either enabled or disabled for all Qt ebuilds.
-And as there is no package other than the Qt libraries themselves that use this
-useflag, the recommendation is to enable (or disable) it globally in make.conf.
-
-As kdelibs-4 uses these qt3support classes internally (or so I've been told,
-I'm not a KDE dev or maintainer), there is a genuine requirement for qt3support
-to be enabled. There is no way you can have KDE4 without qt3support in Qt4. But
-this does not at all mean you need to keep Qt3 itself around. We strongly
-recommend you to remove x11-libs/qt:3.
-
-Users who do not use KDE, or anything that depends on kdelibs, should be able
-to have most other Qt4 applications work without qt3support.
-
-
-Why do I get blockers when trying to emerge Qt?

-
-The most common causes are useflags that are not set correctly, or some but not
-all Qt modules added to package.keywords. 
-The former case is quite rare but in case you run into such problem please 
make sure that you have exactly the same use flags enabled to all of Qt modules 
that support them. Take qt-assistant as an example. If you build it with glib 
support then you have to enable glib use flag to every Qt module that makes use 
of it.
-The later case, is quite common and this is because you probably haven't added 
all of Qt modules on your /etc/package.keywords files. If don't know how to do 
that please grab the file that match your needs from our 
Documentation/package.keywords folder.
-
-
-
-What does the exceptions useflag do?
-
-
-The useflag description is technical, because the issue is technical. It is
-enabled by default, because this is the recommended setting for Qt. See bug
-240185 for a discussion. When a developer uses exceptions in his program, it
-will then produce a warning on certain errors, instead of a crash. This is a
-good thing, which we generally want. The downside is that the application will
-use some more memory and diskspace. So in cases where those are limited (think
-for example of embedded environments) it could be useful to turn this off.
-That is why we have decided to offer a useflag to disable this feature, after
-some users requested this.
-
-
-.. vim: syntax=rest:fenc=utf-8:



[gentoo-commits] proj/qt:master commit in: /

2021-08-06 Thread Davide Pesavento
commit: 4ddbcef69a4d794c0cb9d7e46a08215f1d274ea6
Author: Damon Hatchett  gostack  com  au>
AuthorDate: Sun Aug  1 07:36:47 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Aug  6 07:30:05 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4ddbcef6

Update README.md

Closes: https://github.com/gentoo/qt/pull/240
Signed-off-by: Davide Pesavento  gentoo.org>

 README.md | 16 
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index ef8fdc26..1d398701 100644
--- a/README.md
+++ b/README.md
@@ -27,3 +27,19 @@ Bugs should be reported on https://bugs.gentoo.org. Be sure 
to include
 
 Users wanting to contribute should first read the
 [Qt project policies](https://wiki.gentoo.org/wiki/Project:Qt/Policies).
+
+## Using layman
+
+Run the following command:
+
+```
+layman -f -a qt
+```
+
+And you're done.
+
+If you want to refresh the overlay, run:
+
+```
+layman -s qt
+```



[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-python/qscintilla-python/

2021-08-03 Thread Davide Pesavento
commit: 34ae5aa4fcaa64420d117f02026656541a195236
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Aug  4 02:09:16 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Aug  4 02:10:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ae5aa4

dev-python/qscintilla-python: add 2.13.0, EAPI 8

Switch build system to sip-build

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/qscintilla-python/Manifest  |  1 +
 .../qscintilla-python-2.13.0.ebuild| 82 ++
 profiles/package.mask  |  1 +
 3 files changed, 84 insertions(+)

diff --git a/dev-python/qscintilla-python/Manifest 
b/dev-python/qscintilla-python/Manifest
index eb82b3903db..31ba2a34aea 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1 +1,2 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
+DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 
8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586
 SHA512 
c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1

diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild 
b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
new file mode 100644
index 000..03cabdd434c
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/ 
https://pypi.org/project/QScintilla/";
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
+fi
+S=${WORKDIR}/${MY_P}/Python
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="${PYTHON_DEPS}
+   
>=dev-python/PyQt5-5.15.5_pre2107091435[gui,printsupport,widgets,${PYTHON_USEDEP}]
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   ~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}
+   >=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   >=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+   >=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
+   dev-qt/qtcore:5
+"
+
+src_prepare() {
+   default
+   mv pyproject{-qt5,}.toml || die
+}
+
+src_configure() {
+   configuration() {
+   local myconf=(
+   sip-build
+   --verbose
+   --build-dir="${BUILD_DIR}"
+   --scripts-dir="$(python_get_scriptdir)"
+   --qmake="$(qt5_get_bindir)"/qmake
+   --no-make
+   $(usev debug '--debug --qml-debug --tracing')
+   )
+   echo "${myconf[@]}"
+   "${myconf[@]}" || die
+
+   # Run eqmake to respect toolchain and build flags
+   run_in_build_dir eqmake5 -recursive ${MY_PN}.pro
+   }
+   python_foreach_impl configuration
+}
+
+src_compile() {
+   python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+   installation() {
+   emake INSTALL_ROOT="${D}" install
+   python_optimize
+   }
+   python_foreach_impl run_in_build_dir installation
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index 98e6d0b57fd..d9d909afb49 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -475,6 +475,7 @@ dev-java/jibx-tools
 # Masked for revdep testing.
 >=dev-python/sip-6
 >=dev-python/PyQt5-5.15.5_pre
+>=dev-python/qscintilla-python-2.13
 
 # Volkmar W. Pogatzki  (2021-06-14)
 # DeprecatedDep jre-1.3, upstream dead,removal in 30 days



[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

2021-08-03 Thread Davide Pesavento
commit: bbaf944759f258ec5f1131de29ec0648a3101af1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Aug  4 01:06:13 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Aug  4 01:06:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaf9447

x11-libs/qscintilla: remove 2.11.5

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 x11-libs/qscintilla/Manifest |  1 -
 x11-libs/qscintilla/qscintilla-2.11.5.ebuild | 82 
 2 files changed, 83 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 05ed79dc77b..31ba2a34aea 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,2 @@
-DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B 
e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304
 SHA512 
46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 
8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586
 SHA512 
c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1

diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild 
b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
deleted file mode 100644
index 301812495e5..000
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro";
-
-MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
-fi
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
-IUSE="designer doc"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   designer? ( dev-qt/designer:5 )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-   default
-
-   # Sub-slot sanity check
-   local subslot=${SLOT#*/}
-   local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' 
"${S}"/Qt4Qt5/qscintilla.pro || die)
-   local major=${version%%.*}
-   if [[ ${subslot} != ${major} ]]; then
-   eerror
-   eerror "Ebuild sub-slot (${subslot}) does not match QScintilla 
major version (${major})"
-   eerror "Please update SLOT variable as follows:"
-   eerror "SLOT=\"${SLOT%%/*}/${major}\""
-   eerror
-   die "sub-slot sanity check failed"
-   fi
-}
-
-qsci_run_in() {
-   pushd "$1" >/dev/null || die
-   shift || die
-   "$@" || die
-   popd >/dev/null || die
-}
-
-src_configure() {
-   if use designer; then
-   # prevent building against system version (bug 466120)
-   append-cxxflags -I../Qt4Qt5
-   append-ldflags -L../Qt4Qt5
-   fi
-
-   qsci_run_in Qt4Qt5 eqmake5
-   use designer && qsci_run_in designer-Qt4Qt5 eqmake5
-}
-
-src_compile() {
-   qsci_run_in Qt4Qt5 emake
-   use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
-   qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
-   use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" 
install
-
-   DOCS=( ChangeLog NEWS )
-   use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
-   einstalldocs
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/

2021-08-02 Thread Davide Pesavento
commit: f5d267d4c1b941e6dc415c9717c7810a570688d7
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Aug  3 02:08:30 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Tue Aug  3 02:09:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d267d4

dev-python/PyQt5: enable the Qt, pylupdate, and pyrcc modules

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild 
b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
index 066dbb5dc3d..7d1bf6e760c 100644
--- a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
@@ -127,9 +127,9 @@ src_configure() {
--qmake="$(qt5_get_bindir)"/qmake
--no-make
$(usev debug '--debug --qml-debug --tracing')
-   --enable=QtCore
-   --enable=QtXml
+   --enable=Qt
$(pyqt_use_enable bluetooth)
+   --enable=QtCore
$(pyqt_use_enable dbus QtDBus)
$(usex dbus '' --no-dbus-python)
$(pyqt_use_enable declarative QtQml QtQuick $(usev 
widgets QtQuickWidgets))
@@ -155,7 +155,10 @@ src_configure() {
$(pyqt_use_enable websockets QtWebSockets)
$(pyqt_use_enable widgets)
$(pyqt_use_enable x11extras QtX11Extras)
+   --enable=QtXml
$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+   --enable=pylupdate
+   --enable=pyrcc
)
echo "${myconf[@]}"
"${myconf[@]}" || die



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-08-02 Thread Davide Pesavento
commit: 42d07f812c1c2ef2bcb111fb7d5b5f682ac43cf8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug  2 21:52:18 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Aug  2 21:52:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d07f81

dev-python/sip: 6.2 snapshot bump

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest | 2 +-
 .../{sip-6.2.0_pre2106291255.ebuild => sip-6.2.0_pre2107131757.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 78a844bd3e9..ccc173e4bd8 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,3 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.dev2106291255.tar.gz 1180173 BLAKE2B 
e5dc12515a692f5cb0e82828cc8a14879a764056b04e15957c3e4eeca3bcaf21bce95397eacf5480a16f3f9c2037596880efc0e6a84599fe232823438b2bdf02
 SHA512 
35cfa8a9b641bfe2cb7e2454e514ece0cdddc48b7afaf55e65c34b76eff82a9730d05dc6122e4f08cfc2dfbcbca63e99ea11932f778055f532026b3cb2d92873
+DIST sip-6.2.0.dev2107131757.tar.gz 1180225 BLAKE2B 
456111e610d872c4b7a875f99e151a82ba3ed1ff11f7d93b19558c52f37e710e448387256d0f620a497d260d97c583c53cbcc5a42affd6e7c05e4f557ae97732
 SHA512 
260d86d676a56440ac78099de9998697114ed5deb1ed15299aaea68b49b8ea829dfb92f990762875abff0a0c653e4998f1a91437895ba8d38cdac5cf4f2c5761

diff --git a/dev-python/sip/sip-6.2.0_pre2106291255.ebuild 
b/dev-python/sip/sip-6.2.0_pre2107131757.ebuild
similarity index 100%
rename from dev-python/sip/sip-6.2.0_pre2106291255.ebuild
rename to dev-python/sip/sip-6.2.0_pre2107131757.ebuild



[gentoo-commits] data/api:master commit in: files/overlays/

2021-08-02 Thread Davide Pesavento
commit: 82bda8d73304b53621ed7ceb69db4fb926da3743
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug  2 21:12:32 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Aug  2 21:12:32 2021 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=82bda8d7

repositories: update qt overlay description

Signed-off-by: Davide Pesavento  gentoo.org>

 files/overlays/repositories.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml
index 6909f94..1dca726 100644
--- a/files/overlays/repositories.xml
+++ b/files/overlays/repositories.xml
@@ -3302,7 +3302,7 @@
   
 qt
 Official testing overlay for Qt and related packages, provided
-by Gentoo's Qt team. Contains ebuilds for Qt4 and Qt5 prereleases and live 
ebuilds,
+by Gentoo's Qt team. Contains ebuilds for Qt5 and Qt6 prereleases and live 
ebuilds,
 plus various (non-KDE) applications and utilities that use 
Qt.
 https://github.com/gentoo/qt
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/qscintilla-python/

2021-08-01 Thread Davide Pesavento
commit: 96827798ffb36f70290f57a9bfb6736513bd49d8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug  2 03:03:21 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Aug  2 03:04:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96827798

dev-python/qscintilla-python: pin PyQt5 and sip deps

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild 
b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
index 0a5d085b95f..bea10fcea4e 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro";
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/";
 
 MY_PN=QScintilla
 MY_P=${MY_PN}-${PV/_pre/.dev}
@@ -28,7 +28,7 @@ REQUIRED_USE="
 
 RDEPEND="
${PYTHON_DEPS}
-   >=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
+   =dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -37,7 +37,7 @@ RDEPEND="
~x11-libs/qscintilla-${PV}:=
 "
 DEPEND="${RDEPEND}
-   >=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+   >=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
 "
 
 S=${WORKDIR}/${MY_P}/Python



[gentoo-commits] repo/gentoo:master commit in: dev-python/qscintilla-python/

2021-08-01 Thread Davide Pesavento
commit: 84aae5191adaea406960c0fe39747e673fe28cab
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug  2 02:29:29 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Aug  2 03:04:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84aae519

dev-python/qscintilla-python: remove 2.11.5

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/qscintilla-python/Manifest  |  1 -
 .../qscintilla-python-2.11.5.ebuild| 78 --
 2 files changed, 79 deletions(-)

diff --git a/dev-python/qscintilla-python/Manifest 
b/dev-python/qscintilla-python/Manifest
index 0b3102843cf..eb82b3903db 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,2 +1 @@
-DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B 
e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304
 SHA512 
46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198

diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild 
b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
deleted file mode 100644
index 12eb318581e..000
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro";
-
-MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="debug"
-
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
-   >=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   ~x11-libs/qscintilla-${PV}:=
-"
-DEPEND="${RDEPEND}
-   >=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_configure() {
-   configuration() {
-   local myconf=(
-   "${PYTHON}"
-   "${S}"/configure.py
-   --pyqt=PyQt5
-   --qmake="$(qt5_get_bindir)"/qmake
-   $(usex debug '--debug --trace' '')
-   --verbose
-   )
-   echo "${myconf[@]}"
-   "${myconf[@]}" || die
-
-   # Fix parallel install failure
-   sed -i -e '/INSTALLS += distinfo/i distinfo.depends = 
install_subtargets install_pep484_stubs install_api' \
-   ${MY_PN}.pro || die
-
-   # Run eqmake to respect toolchain and build flags
-   eqmake5 -recursive ${MY_PN}.pro
-   }
-   python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-   python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-   installation() {
-   emake INSTALL_ROOT="${D}" install
-   python_optimize
-   }
-   python_foreach_impl run_in_build_dir installation
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQtWebEngine/

2021-08-01 Thread Davide Pesavento
commit: 48dfc871de72b80cff3e0108e6ba298dee2481d9
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug  2 02:24:55 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Aug  2 02:25:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48dfc871

dev-python/PyQtWebEngine: pin PyQt5 and sip deps

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild 
b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
index 8aca0d1edee..fad00a88922 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro 
https://pypi.org/project/PyQtWebEngine/";
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ 
https://pypi.org/project/PyQtWebEngine/";
 
 MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
@@ -28,13 +28,13 @@ REQUIRED_USE="
 
 RDEPEND="
${PYTHON_DEPS}
-   
>=dev-python/PyQt5-5.15[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+   
~dev-python/PyQt5-5.15.4[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
dev-qt/qtcore:5
dev-qt/qtwebengine:5[widgets]
 "
 DEPEND="${RDEPEND}
-   >=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+   >=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
 "
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/

2021-08-01 Thread Davide Pesavento
commit: 6f1749b5b9dd67e2f58157e3703f562efa00374d
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug  2 02:13:36 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Aug  2 02:14:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1749b5

dev-python/PyQt5: restrict sip dep to :0 in 5.15.4-r1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild 
b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
index 78f0bdd5dd0..7030695c18f 100644
--- a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
@@ -85,7 +85,7 @@ RDEPEND="${PYTHON_DEPS}
xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
-   >=dev-python/sip-4.19.25[${PYTHON_USEDEP}]
+   >=dev-python/sip-4.19.25:0[${PYTHON_USEDEP}]
dbus? ( virtual/pkgconfig )
 "
 



[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-python/PyQt5/

2021-08-01 Thread Davide Pesavento
commit: 4aa52a65922086d146abaffb410a84f8ad91c048
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Aug  2 00:33:25 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Mon Aug  2 00:34:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa52a65

dev-python/PyQt5: add 5.15.5_pre2107091435, EAPI 8

Switched the build system to use sip-build + PyQt-builder
instead of the deprecated configure.py

Bug: https://bugs.gentoo.org/805965
Closes: https://bugs.gentoo.org/797535
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt5/Manifest  |   1 +
 dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild | 190 +
 profiles/package.mask  |   1 +
 3 files changed, 192 insertions(+)

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 674ea7b89fb..8137bd13116 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,2 +1,3 @@
 DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 
7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9
 SHA512 
6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 
96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c
 SHA512 
6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
+DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 
8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853
 SHA512 
5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5

diff --git a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild 
b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
new file mode 100644
index 000..066dbb5dc3d
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/ 
https://pypi.org/project/PyQt5/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtQuick3D, QtRemoteObjects
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help 
location
+   multimedia network opengl positioning printsupport sensors serialport 
speech
+   sql svg testlib webchannel websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from the qmake_QT declarations
+# in project.py and from the output of 'grep -r "%Import " ${S}/sip'
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   bluetooth? ( gui )
+   declarative? ( gui network )
+   designer? ( widgets )
+   help? ( gui widgets )
+   location? ( positioning )
+   multimedia? ( gui network )
+   opengl? ( gui widgets )
+   positioning? ( gui )
+   printsupport? ( gui widgets )
+   sensors? ( gui )
+   serialport? ( gui )
+   sql? ( widgets )
+   svg? ( gui widgets )
+   testlib? ( widgets )
+   webchannel? ( network )
+   websockets? ( network )
+   widgets? ( gui )
+   xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.15:5"
+
+DEPEND="${PYTHON_DEPS}
+   >=dev-qt/qtcore-${QT_PV}
+   >=dev-qt/qtxml-${QT_PV}
+   bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+   dbus? (
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   >=dev-qt/qtdbus-${QT_PV}
+   )
+   declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+   designer? ( >=dev-qt/designer-${QT_PV} )
+   gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+   help? ( >=dev-qt/qthelp-${QT_PV} )
+   location? ( >=dev-qt/qtlocation-${QT_PV} )
+   multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+   network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl] )
+   opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+   positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+   printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+   sensors? ( >=dev

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, dev-qt/qt-creator/files/

2021-07-10 Thread Davide Pesavento
commit: 69c7ab38c931d19f61adb59bebadecc2ca598632
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 05:29:54 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:29:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c7ab38

dev-qt/qt-creator: remove half-broken 4.12.3-r1

Bug: https://bugs.gentoo.org/757756
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../files/qt-creator-4.12.0-dylib-fix.patch|  84 
 .../qt-creator-4.12.0-libclangformat-ide.patch |  64 --
 dev-qt/qt-creator/metadata.xml |   2 -
 dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild  | 235 -
 5 files changed, 386 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d88825421b0..975ecb0a7d2 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 
7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d
 SHA512 
48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
 DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3

diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch 
b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
deleted file mode 100644
index 0d4deb2c795..000
--- a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001
-From: Peter Levine 
-Date: Tue, 5 May 2020 03:45:35 -0400
-Subject: [PATCH] Fix building against clang configured with
- CLANG_LINK_CLANG_DYLIB
-
-LLVM/Clang upstream only officially supports building shared
-components as a single dynamic library (via
-LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..).
-Linux distros like Fedora and Gentoo have followed suit.
-
-Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri
-file assumes clang is built with separate component libraries
-and the build fails.
-
-This change alters the build to check for the existence
-of clang component libraries and, if found, link to them, or
-otherwise to libclang-cpp.
-
-Task-number: QTCREATORBUG-23172
-Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86

- src/shared/clang/clang_installation.pri | 35 +++--
- 1 file changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/shared/clang/clang_installation.pri 
b/src/shared/clang/clang_installation.pri
-index 08838838bca..c191c57f1c7 100644
 a/src/shared/clang/clang_installation.pri
-+++ b/src/shared/clang/clang_installation.pri
-@@ -204,19 +204,6 @@ isEmpty(LLVM_VERSION) {
- }
- }
- 
--
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
--CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
--exists($$CLANGFORMAT_MAIN_HEADER) {
--CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
--ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
--   -lclangRewrite -lclangIndex -lclangFrontend 
-lclangParse -lclangSerialization \
--   -lclangSema -lclangEdit -lclangAnalysis 
-lclangDriver -lclangDynamicASTMatchers \
--   -lclangASTMatchers -lclangAST -lclangLex 
-lclangBasic
--win32:CLANGFORMAT_LIBS += -lversion
--}
--}
--win32:ALL_CLANG_LIBS += -lversion
--
- LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
- !exists($$LIBCLANG_MAIN_HEADER) {
- $$llvmWarningOrError(\
-@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) {
- LIBCLANG_LIBS += $${CLANG_LIB}
- 
- 
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
-+CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
-+exists($$CLANGFORMAT_MAIN_HEADER) {
-+
exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib)
 {
-+CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
-+ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
-+   -lclangRewrite -lclangIndex -lclangFrontend

[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2021-07-10 Thread Davide Pesavento
commit: 6071107a60004a01f2a5a5085c2fc2f42014083f
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 05:34:04 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:34:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6071107a

profiles/base/package.use.mask: drop obsolete entry for qt-creator

Bug: https://bugs.gentoo.org/757756
Signed-off-by: Davide Pesavento  gentoo.org>

 profiles/base/package.use.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d9a86e696f2..83513d5d82c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -136,10 +136,6 @@ media-gfx/blender doc
 # but making it do so while vendored is a non-trivial task.
 mail-mta/protonmail-bridge gui
 
-# Michał Górny  (2020-11-29)
-# libclangformat-ide is masked for removal.
-dev-qt/qt-creator clang
-
 # Michał Górny  (2020-09-27)
 # The respective dependencies are masked for removal.
 net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento
commit: 3985c100044bc6ae7e088951d8436dccbb827810
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 05:01:57 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:01:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3985c100

dev-qt/qt-creator: sync KEYWORDS

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 228e4f838dd..bfc4e05275d 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -19,7 +19,7 @@ else
[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
S=${WORKDIR}/${MY_P}
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento
commit: a3345ca863b3f721acd8841249670c2fcba9616a
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 05:17:36 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:18:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3345ca8

dev-qt/qt-creator: add 4.15.1

Closes: https://bugs.gentoo.org/721720
Closes: https://bugs.gentoo.org/750527
Closes: https://github.com/gentoo/gentoo/pull/21278
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans Fredrik Nordhaug  gmail.com>
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 232 +
 2 files changed, 233 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2b32f1fba3a..d88825421b0 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 
7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d
 SHA512 
48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
+DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
new file mode 100644
index 000..bfc4e05275d
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=12
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/";
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git";
+else
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-opensource-src-${MY_PV}
+   [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+   SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
+   S=${WORKDIR}/${MY_P}
+   KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
+   '+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
+   ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
+   modeling:modeleditor nim perforce perfprofiler python 
qbs:qbsprojectmanager +qmldesigner
+   +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor 
serialterminal silversearcher
+   subversion valgrind webassembly)
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+   boot2qt? ( remotelinux )
+   clang? ( test? ( qbs ) )
+   mcu? ( cmake )
+   python? ( lsp )
+   qmldesigner? ( qmljs )
+   qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.14:5"
+
+BDEPEND="
+   >=dev-qt/linguist-tools-${QT_PV}
+   virtual/pkgconfig
+   doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+CDEPEND="
+   >=dev-qt/qtconcurrent-${QT_PV}
+   >=dev-qt/qtcore-${QT_PV}
+   >=dev-qt/qtdeclarative-${QT_PV}[widgets]
+   >=dev-qt/qtgui-${QT_PV}
+   >=dev-qt/qtnetwork-${QT_PV}[ssl]
+   >=dev-qt/qtprintsupport-${QT_PV}
+   >=dev-qt/qtquickcontrols-${QT_PV}
+   >=dev-qt/qtscript-${QT_PV}
+   >=dev-qt/qtsql-${QT_PV}[sqlite]
+   >=dev-qt/qtsvg-${QT_PV}
+   >=dev-qt/qtwidgets-${QT_PV}
+   >=dev-qt/qtx11extras-${QT_PV}
+   >=dev-qt/qtxml-${QT_PV}
+   kde-frameworks/syntax-highlighting:5
+   clang? (
+   >=dev-cpp/yaml-cpp-0.6.2:=
+   || (
+   sys-devel/clang:12
+   sys-devel/clang:11
+   )
+   =dev-qt/designer-${QT_PV} )
+   help? (
+   >=dev-qt/qthelp-${QT_PV}
+   webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+   )
+   perfprofiler? ( dev-libs/elfutils )
+   serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+   systemd? ( sys-apps/systemd:= )
+"
+DEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento
commit: 18ac48856dec0d17c4dabd73bcdce52ec9531831
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 04:50:25 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ac4885

dev-qt/qt-creator: add hr translation

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b22ecdc136b..228e4f838dd 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 LLVM_MAX_SLOT=12
-PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento
commit: ed1763bf93e35fe1beea74462f7e153bbe057558
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 03:24:47 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1763bf

dev-qt/qt-creator: drop obsolete patch

https://github.com/gentoo/gentoo/pull/21278

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 18e67f9fc0b..057d48b9f9a 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -112,10 +112,6 @@ for x in ${PLOCALES}; do
 done
 unset x
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
-)
-
 llvm_check_deps() {
has_version -d "sys-devel/clang:${LLVM_SLOT}"
 }



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento
commit: 9a9f0f76ee082dbefed69111aa9d802e024662e2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 04:28:03 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9f0f76

dev-qt/qt-creator: require clang 11 or 12

Upstream recommends 11 or later

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 9c70a14da51..b22ecdc136b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LLVM_MAX_SLOT=10
+LLVM_MAX_SLOT=12
 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/";
-LICENSE="GPL-3"
-SLOT="0"
 
 if [[ ${PV} == * ]]; then
inherit git-r3
@@ -20,12 +18,12 @@ else
MY_P=${PN}-opensource-src-${MY_PV}
[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 
1-2)/${MY_PV}/${MY_P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
+   KEYWORDS="~amd64 ~x86"
 fi
 
-# TODO: unbundle sqlite
-
+LICENSE="GPL-3"
+SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal 
bazaar beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangtools' clearcase 
cmake:cmakeprojectmanager cppcheck
ctfvisualizer cvs +designer git glsl:glsleditor +help 
lsp:languageclient mcu:mcusupport mercurial
@@ -69,8 +67,8 @@ CDEPEND="
clang? (
>=dev-cpp/yaml-cpp-0.6.2:=
|| (
-   sys-devel/clang:10
-   sys-devel/clang:9
+   sys-devel/clang:12
+   sys-devel/clang:11
)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento
commit: 1e407a80672c4afedfdd712eae7e3b54df1a1a1b
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 03:33:38 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e407a80

dev-qt/qt-creator: adjust sed

https://github.com/gentoo/gentoo/pull/21278

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 057d48b9f9a..9c70a14da51 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -182,7 +182,7 @@ src_prepare() {
sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' 
tests/auto/{qttest.pri,json/json.pro} || die
 
# fix path to some clang headers
-   sed -i -e 
"/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" 
src/shared/clang/clang_defines.pri || die
+   sed -i -e 
"/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" 
src/shared/clang/clang_defines.pri || die
 
# fix translations
local lang languages=



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

2021-07-10 Thread Davide Pesavento
commit: dcb874465b3c7b145f837ea5f75137c2f0c1fc47
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 03:21:02 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb87446

dev-qt/qt-creator: drop obsolete dep on dev-libs/libclangformat-ide

https://github.com/gentoo/gentoo/pull/21278

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/qt-creator-.ebuild | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index e9e7c228800..18e67f9fc0b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -69,10 +69,8 @@ CDEPEND="
clang? (
>=dev-cpp/yaml-cpp-0.6.2:=
|| (
-   ( sys-devel/clang:10
-   dev-libs/libclangformat-ide:10 )
-   ( sys-devel/clang:9
-   dev-libs/libclangformat-ide:9 )
+   sys-devel/clang:10
+   sys-devel/clang:9
)


[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

2021-07-10 Thread Davide Pesavento
commit: 42bbd1ff5eeb2a4dc46b271571e14c48fdc9397c
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 10 20:58:13 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 10 21:00:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42bbd1ff

dev-util/qbs: add 1.19.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/metadata.xml  |  12 +++--
 dev-util/qbs/qbs-1.19.1.ebuild | 120 +
 3 files changed, 129 insertions(+), 4 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 142b017fb2d..5243f5419bd 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 
4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4
 SHA512 
65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c
 DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 
4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415
 SHA512 
bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
+DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 
2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29
 SHA512 
b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 4311f5d8ba9..06efa80b24b 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -14,10 +14,14 @@
projects across multiple platforms. Qbs can be used for any software
project, regardless of programming language, toolkit, or libraries used.
 
-   Qbs is an all-in-one tool that generates a build graph from a
-   high-level project description (like qmake or cmake) and additionally
-   undertakes the task of executing the commands in the low-level build
-   graph (like make).
+   Qbs projects are specified in a QML dialect. QML is a concise, easy to
+   learn, and intuitive language that is used successfully in the Qt 
project.
+   Its core is declarative, but it can be extended with JavaScript snippets
+   for extra flexibility.
+
+   Qbs is an all-in-one tool that generates a build graph from a high-level
+   project description (like qmake or CMake) and additionally undertakes 
the
+   task of executing the commands in the low-level build graph (like make).


https://bugreports.qt.io/

diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild
new file mode 100644
index 000..3339bb57428
--- /dev/null
+++ b/dev-util/qbs/qbs-1.19.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils toolchain-funcs
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://doc.qt.io/qbs/";
+SRC_URI="https://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz";
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples gui test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-qt/qtcore:5=
+   dev-qt/qtnetwork:5
+   dev-qt/qtscript:5
+   dev-qt/qtxml:5
+   gui? (
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+DEPEND="${RDEPEND}
+   test? (
+   dev-qt/linguist-tools:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qttest:5
+   )
+"
+BDEPEND="
+   dev-qt/qtcore:5
+   doc? (
+   dev-qt/qdoc:5
+   dev-qt/qthelp:5
+   )
+"
+
+src_prepare() {
+   default
+
+   if ! use examples; then
+   sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+   fi
+
+   if ! use gui; then
+   sed -i -e '/SUBDIRS += config-ui/ d' src/app/app.pro || die
+   fi
+
+   echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro
+
+   # skip several tests that fail and/or have additional deps
+   sed -i \
+   -e 's/findArchiver(binaryName,.*/"";/'  `# requires zip and 
jar` \
+   -e 's/p\.value("nodejs\./true||&/'  `# requires nodejs, bug 
527652` \
+   -e 
's/\(p\.value\|m_qbsStderr\

[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/

2021-07-10 Thread Davide Pesavento
commit: e8fe7830a84c047fe51a31c1c5bda5003cf543b5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 10 20:59:45 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 10 21:00:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fe7830

dev-util/qbs: drop 1.16.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-util/qbs/Manifest  |   1 -
 dev-util/qbs/qbs-1.16.0.ebuild | 116 -
 2 files changed, 117 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 5243f5419bd..bfcc02f2c5b 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
-DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 
4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4
 SHA512 
65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c
 DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 
4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415
 SHA512 
bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 
2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29
 SHA512 
b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d

diff --git a/dev-util/qbs/qbs-1.16.0.ebuild b/dev-util/qbs/qbs-1.16.0.ebuild
deleted file mode 100644
index 2ecd2be09ac..000
--- a/dev-util/qbs/qbs-1.16.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils toolchain-funcs
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://doc.qt.io/qbs/";
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz";
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
-   dev-qt/qtcore:5=
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtscript:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
-   doc? (
-   dev-qt/qdoc:5
-   dev-qt/qthelp:5
-   )
-   test? (
-   dev-qt/linguist-tools:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   default
-
-   if ! use examples; then
-   sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
-   fi
-
-   echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
-
-   # skip several tests that fail and/or have additional deps
-   sed -i \
-   -e 's/findArchiver("7z")/""/'   `# requires p7zip, 
fails` \
-   -e 's/findArchiver(binaryName,.*/"";/'  `# requires zip and 
jar` \
-   -e 's/p\.value("nodejs\./true||&/'  `# requires nodejs, bug 
527652` \
-   -e 
's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires 
nodejs and typescript` \
-   tests/auto/blackbox/tst_blackbox.cpp || die
-
-   # requires jdk, fails, bug 585398
-   sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
-   local myqmakeargs=(
-   qbs.pro # bug 523218
-   -recursive
-   CONFIG+=qbs_disable_rpath
-   CONFIG+=qbs_enable_project_file_updates
-   $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
-   QBS_INSTALL_PREFIX="${EPREFIX}/usr"
-   QBS_LIBRARY_DIRNAME="$(get_libdir)"
-   )
-   eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
-   einfo "Setting up test environment in ${T}"
-
-   export HOME=${T}
-   export LD_LIBRARY_PATH=${S}/$(get_libdir)
-   export QBS_AUTOTEST_PROFILE=testProfile
-
-   "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
-   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 
${QBS_AUTOTEST_PROFILE} || die
-   "${S}"/bin/qbs-config 
profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || die
-
- 

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

2021-07-08 Thread Davide Pesavento
commit: 14d47719487d5e81fc1aaacb8e0d4e6347e65f10
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul  9 02:46:57 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Jul  9 02:46:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d47719

x11-libs/qscintilla: remove 2.12.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 x11-libs/qscintilla/Manifest |  1 -
 x11-libs/qscintilla/qscintilla-2.12.1.ebuild | 80 
 2 files changed, 81 deletions(-)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index b8bfcc53e06..05ed79dc77b 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,4 +1,3 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B 
e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304
 SHA512 
46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-DIST QScintilla_src-2.12.1.tar.gz 3059045 BLAKE2B 
500c4ec3109e09d07011fa6271721633d2a510ea672ac04a2d6c9d550b7dd7426d7b971e7c604856b818fdcd847dd466a82a8f1a84afd42f4f7164d325789ddd
 SHA512 
7e96b2e909f2bbd0f56220e53a8aaa6e6816b84fb96c4e22e3815a2e0322a87006d7567a05ae6b2490e9d2c51ca7c130e7b64780a897682579419ffd3a53ee1b
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 
8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586
 SHA512 
c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1

diff --git a/x11-libs/qscintilla/qscintilla-2.12.1.ebuild 
b/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
deleted file mode 100644
index c754ae717fe..000
--- a/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro";
-
-MY_PN=QScintilla
-MY_P=${MY_PN}_src-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="designer doc"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   designer? ( dev-qt/designer:5 )
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-   default
-
-   # Sub-slot sanity check
-   local subslot=${SLOT#*/}
-   local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' 
"${S}"/src/qscintilla.pro || die)
-   local major=${version%%.*}
-   if [[ ${subslot} != ${major} ]]; then
-   eerror
-   eerror "Ebuild sub-slot (${subslot}) does not match QScintilla 
major version (${major})"
-   eerror "Please update SLOT variable as follows:"
-   eerror "SLOT=\"${SLOT%%/*}/${major}\""
-   eerror
-   die "sub-slot sanity check failed"
-   fi
-}
-
-qsci_run_in() {
-   pushd "$1" >/dev/null || die
-   shift || die
-   "$@" || die
-   popd >/dev/null || die
-}
-
-src_configure() {
-   if use designer; then
-   # prevent building against system version (bug 466120)
-   append-cxxflags -I../src
-   append-ldflags -L../src
-   fi
-
-   qsci_run_in src eqmake5
-   use designer && qsci_run_in designer eqmake5
-}
-
-src_compile() {
-   qsci_run_in src emake
-   use designer && qsci_run_in designer emake
-}
-
-src_install() {
-   qsci_run_in src emake INSTALL_ROOT="${D}" install
-   use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
-
-   use doc && HTML_DOCS=( doc/html/. )
-   einstalldocs
-}



[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

2021-07-08 Thread Davide Pesavento
commit: 35177b30c86601a8b3cf86c8a78c4ee0d861c04f
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul  9 02:37:27 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Jul  9 02:37:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35177b30

x11-libs/qscintilla: add 2.13.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 x11-libs/qscintilla/Manifest |  1 +
 x11-libs/qscintilla/qscintilla-2.13.0.ebuild | 80 
 2 files changed, 81 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index da06d802b0b..b8bfcc53e06 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,4 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B 
e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304
 SHA512 
46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.12.1.tar.gz 3059045 BLAKE2B 
500c4ec3109e09d07011fa6271721633d2a510ea672ac04a2d6c9d550b7dd7426d7b971e7c604856b818fdcd847dd466a82a8f1a84afd42f4f7164d325789ddd
 SHA512 
7e96b2e909f2bbd0f56220e53a8aaa6e6816b84fb96c4e22e3815a2e0322a87006d7567a05ae6b2490e9d2c51ca7c130e7b64780a897682579419ffd3a53ee1b
+DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 
8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586
 SHA512 
c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1

diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild 
b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
new file mode 100644
index 000..b724431bd16
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro";
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+   default
+
+   # Sub-slot sanity check
+   local subslot=${SLOT#*/}
+   local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' 
"${S}"/src/qscintilla.pro || die)
+   local major=${version%%.*}
+   if [[ ${subslot} != ${major} ]]; then
+   eerror
+   eerror "Ebuild sub-slot (${subslot}) does not match QScintilla 
major version (${major})"
+   eerror "Please update SLOT variable as follows:"
+   eerror "SLOT=\"${SLOT%%/*}/${major}\""
+   eerror
+   die "sub-slot sanity check failed"
+   fi
+}
+
+qsci_run_in() {
+   pushd "$1" >/dev/null || die
+   shift || die
+   "$@" || die
+   popd >/dev/null || die
+}
+
+src_configure() {
+   if use designer; then
+   # prevent building against system version (bug 466120)
+   append-cxxflags -I../src
+   append-ldflags -L../src
+   fi
+
+   qsci_run_in src eqmake5
+   use designer && qsci_run_in designer eqmake5
+}
+
+src_compile() {
+   qsci_run_in src emake
+   use designer && qsci_run_in designer emake
+}
+
+src_install() {
+   qsci_run_in src emake INSTALL_ROOT="${D}" install
+   use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
+
+   use doc && HTML_DOCS=( doc/html/. )
+   einstalldocs
+}



[gentoo-commits] proj/qt:master commit in: eclass/

2021-07-08 Thread Davide Pesavento
commit: 393fa008998e17fc523a66bf27d23b35ef136cfa
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul  9 02:16:48 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Jul  9 02:16:48 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=393fa008

qt5-build.eclass: sync with gentoo.git

Signed-off-by: Davide Pesavento  gentoo.org>

 eclass/qt5-build.eclass | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index dbbba44e..0b2b5518 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -10,15 +10,14 @@
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 7.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
-   die "qt5-build.eclass is only to be used for building Qt 5"
+   die "${ECLASS} is only to be used for building Qt 5"
 fi
 
 case ${EAPI} in
-   7)  : ;;
-   *)  die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+   7) ;;
+   *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @ECLASS-VARIABLE: QT5_BUILD_TYPE
@@ -26,7 +25,7 @@ esac
 # Default value is "release".
 # If PV matches "**", this is automatically set to "live".
 QT5_BUILD_TYPE=release
-if [[ ${PV} = ** ]]; then
+if [[ ${PV} == ** ]]; then
QT5_BUILD_TYPE=live
 fi
 readonly QT5_BUILD_TYPE
@@ -68,6 +67,7 @@ _QT5_P=${QT5_MODULE}-everywhere-src-${PV}
 # system to obtain the global qmodule.pri file.
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @PRE_INHERIT
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
 # Here we redefine default value to be manual, if your package needs virtualx



[gentoo-commits] proj/qt:master commit in: eclass/

2021-07-08 Thread Davide Pesavento
commit: a9f1eb1145529b9dba6b2edf4cfaa7bf2baf0bb2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul  9 02:09:26 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Jul  9 02:09:26 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a9f1eb11

qmake-utils.eclass: sync with gentoo.git

Signed-off-by: Davide Pesavento  gentoo.org>

 eclass/qmake-utils.eclass | 78 +--
 1 file changed, 7 insertions(+), 71 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 0d49eb94..1f09cbd9 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -6,7 +6,7 @@
 # q...@gentoo.org
 # @AUTHOR:
 # Davide Pesavento 
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt5 qmake.
@@ -14,63 +14,15 @@
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.
 
-if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
-_QMAKE_UTILS_ECLASS=1
-
 case ${EAPI} in
-   7) ;;
-   *) die "EAPI=${EAPI:-0} is not supported" ;;
+   7|8) ;;
+   *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-inherit toolchain-funcs
-
-# @FUNCTION: _qmake-utils_banned_func
-# @INTERNAL
-# @DESCRIPTION:
-# Banned functions are banned.
-_qmake-utils_banned_func() {
-   die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-}
-
-# @FUNCTION: qt4_get_bindir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_bindir() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_headerdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_headerdir() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_libdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_libdir() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_mkspecsdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_mkspecsdir() {
-   _qmake-utils_banned_func
-}
+if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
+_QMAKE_UTILS_ECLASS=1
 
-# @FUNCTION: qt4_get_plugindir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_plugindir() {
-   _qmake-utils_banned_func
-}
+inherit toolchain-funcs
 
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
@@ -108,22 +60,6 @@ qt5_get_plugindir() {
echo $(qt5_get_libdir)/qt5/plugins
 }
 
-# @FUNCTION: qmake-utils_find_pro_file
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qmake-utils_find_pro_file() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: eqmake4
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-eqmake4() {
-   _qmake-utils_banned_func
-}
-
 # @FUNCTION: eqmake5
 # @USAGE: [arguments for qmake]
 # @DESCRIPTION:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-07-08 Thread Davide Pesavento
commit: e4b0c36e0925e5f5f53fe889bc260c0548fe43c1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul  9 02:00:05 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Jul  9 02:01:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b0c36e

qt5-build.eclass: standardize "EAPI not supported" message

Signed-off-by: Davide Pesavento  gentoo.org>

 eclass/qt5-build.eclass | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e94f3f33a10..bc5928d3314 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -10,15 +10,14 @@
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 7.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
-   die "qt5-build.eclass is only to be used for building Qt 5"
+   die "${ECLASS} is only to be used for building Qt 5"
 fi
 
 case ${EAPI} in
-   7)  : ;;
-   *)  die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+   7) ;;
+   *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @ECLASS-VARIABLE: QT5_MODULE



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-07-08 Thread Davide Pesavento
commit: 06e1209cececb64cd30fd48ae3c87c39c47783bb
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Jul  9 01:48:27 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Jul  9 01:48:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e1209c

qmake-utils.eclass: remove obsolete/banned qt4 functions

Signed-off-by: Davide Pesavento  gentoo.org>

 eclass/qmake-utils.eclass | 64 ---
 1 file changed, 64 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index d726b362029..1f09cbd9ca7 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -24,54 +24,6 @@ _QMAKE_UTILS_ECLASS=1
 
 inherit toolchain-funcs
 
-# @FUNCTION: _qmake-utils_banned_func
-# @INTERNAL
-# @DESCRIPTION:
-# Banned functions are banned.
-_qmake-utils_banned_func() {
-   die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-}
-
-# @FUNCTION: qt4_get_bindir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_bindir() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_headerdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_headerdir() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_libdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_libdir() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_mkspecsdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_mkspecsdir() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_plugindir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_plugindir() {
-   _qmake-utils_banned_func
-}
-
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 binaries are installed.
@@ -108,22 +60,6 @@ qt5_get_plugindir() {
echo $(qt5_get_libdir)/qt5/plugins
 }
 
-# @FUNCTION: qmake-utils_find_pro_file
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qmake-utils_find_pro_file() {
-   _qmake-utils_banned_func
-}
-
-# @FUNCTION: eqmake4
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-eqmake4() {
-   _qmake-utils_banned_func
-}
-
 # @FUNCTION: eqmake5
 # @USAGE: [arguments for qmake]
 # @DESCRIPTION:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-07-08 Thread Davide Pesavento
commit: 5d58c2ea1762e5c57d58265d4055378beaab54b6
Author: David Michael  gmail  com>
AuthorDate: Fri Jun 25 19:52:01 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Fri Jul  9 01:41:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d58c2ea

qmake-utils.eclass: EAPI 8 support

https://github.com/gentoo/gentoo/pull/21539

Signed-off-by: David Michael  gmail.com>
Signed-off-by: Davide Pesavento  gentoo.org>

 eclass/qmake-utils.eclass | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 0d49eb94382..d726b362029 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -6,7 +6,7 @@
 # q...@gentoo.org
 # @AUTHOR:
 # Davide Pesavento 
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt5 qmake.
@@ -14,14 +14,14 @@
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.
 
-if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
-_QMAKE_UTILS_ECLASS=1
-
 case ${EAPI} in
-   7) ;;
-   *) die "EAPI=${EAPI:-0} is not supported" ;;
+   7|8) ;;
+   *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
+_QMAKE_UTILS_ECLASS=1
+
 inherit toolchain-funcs
 
 # @FUNCTION: _qmake-utils_banned_func



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt-builder/

2021-07-06 Thread Davide Pesavento
commit: a732800747d295adef78e75e94238a711bb21249
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jul  6 23:17:28 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Tue Jul  6 23:18:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7328007

dev-python/PyQt-builder: remove 1.10.1-r1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt-builder/Manifest   |  1 -
 .../PyQt-builder/PyQt-builder-1.10.1-r1.ebuild | 37 --
 2 files changed, 38 deletions(-)

diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index d1dec6a85b3..92a7b1888aa 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,2 +1 @@
-DIST PyQt-builder-1.10.1.tar.gz 5725429 BLAKE2B 
e7aaa0a3c1eb8aeea0aa5f2d5d7beda1edc46e90c0a21b608d2dffe205a67170daaa6615253706b5f9856a27d66715692ceffe81b9b45eafd4d608df79741d6f
 SHA512 
2e48c1066bb12c1f50700933b0f489158f29f62a1239b570dc053cb042eca9bd4ee83f66b855b0596cfb6dc2e844434c15563abbb3846bf5960d03441f497b83
 DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B 
da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720
 SHA512 
26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a

diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
deleted file mode 100644
index 2ab93714484..000
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ 
https://pypi.org/project/PyQt-builder/";
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-   dev-python/packaging[${PYTHON_USEDEP}]
-   >=dev-python/sip-5.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-python_prepare_all() {
-   # don't install prebuilt Windows DLLs
-   sed -i -e "s:'dlls/\*/\*',::" setup.py || die
-   rm -r "${PN/-/_}.egg-info" || die
-
-   distutils-r1_python_prepare_all
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt-builder/

2021-07-06 Thread Davide Pesavento
commit: 55313a6563eeede39678467433a76dcddd348dfd
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jul  6 23:15:17 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Tue Jul  6 23:18:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55313a65

dev-python/PyQt-builder: add 1.10.3

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/PyQt-builder/Manifest   |  1 +
 dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild | 37 ++
 2 files changed, 38 insertions(+)

diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index c04be8f9ec1..d1dec6a85b3 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1 +1,2 @@
 DIST PyQt-builder-1.10.1.tar.gz 5725429 BLAKE2B 
e7aaa0a3c1eb8aeea0aa5f2d5d7beda1edc46e90c0a21b608d2dffe205a67170daaa6615253706b5f9856a27d66715692ceffe81b9b45eafd4d608df79741d6f
 SHA512 
2e48c1066bb12c1f50700933b0f489158f29f62a1239b570dc053cb042eca9bd4ee83f66b855b0596cfb6dc2e844434c15563abbb3846bf5960d03441f497b83
+DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B 
da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720
 SHA512 
26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a

diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild
new file mode 100644
index 000..4d69521c2f0
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ 
https://pypi.org/project/PyQt-builder/";
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+   dev-python/packaging[${PYTHON_USEDEP}]
+   >=dev-python/sip-5.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+   # don't install prebuilt Windows DLLs
+   sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+   rm -r "${PN/-/_}.egg-info" || die
+
+   distutils-r1_python_prepare_all
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-07-03 Thread Davide Pesavento
commit: 20372c8b8cd7df82d7003be2b535cfb397959bd5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul  3 21:12:29 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Jul  3 21:13:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20372c8b

dev-python/sip: add 6.2 snapshot with proper support for python 3.10

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/Manifest | 2 +-
 dev-python/sip/{sip-6.1.1.ebuild => sip-6.2.0_pre2106291255.ebuild} | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 0262879d910..78a844bd3e9 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,3 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B 
f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98
 SHA512 
60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 
59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911
 SHA512 
0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.1.1.tar.gz 1441692 BLAKE2B 
89a350be3e8c87cb76ec4222f0ab753213f324bc4573bee82bc4d014e8984d9d47a6f384793f618d090620a9efa2cfb906070a7d99312a29cac715ec98d97f15
 SHA512 
94e413c3af4dcac9cbd1eef368f4e88c0b3bfe1ad8b97f4a6ec39af1a448fdf1d79f3c845cf8c9b0ed78b04f2a18d176d750a39d13a47f9122e575d034ed88b4
+DIST sip-6.2.0.dev2106291255.tar.gz 1180173 BLAKE2B 
e5dc12515a692f5cb0e82828cc8a14879a764056b04e15957c3e4eeca3bcaf21bce95397eacf5480a16f3f9c2037596880efc0e6a84599fe232823438b2bdf02
 SHA512 
35cfa8a9b641bfe2cb7e2454e514ece0cdddc48b7afaf55e65c34b76eff82a9730d05dc6122e4f08cfc2dfbcbca63e99ea11932f778055f532026b3cb2d92873

diff --git a/dev-python/sip/sip-6.1.1.ebuild 
b/dev-python/sip/sip-6.2.0_pre2106291255.ebuild
similarity index 95%
rename from dev-python/sip/sip-6.1.1.ebuild
rename to dev-python/sip/sip-6.2.0_pre2106291255.ebuild
index a541809c48f..e990228 100644
--- a/dev-python/sip/sip-6.1.1.ebuild
+++ b/dev-python/sip/sip-6.2.0_pre2106291255.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"



[gentoo-commits] repo/gentoo:master commit in: x11-libs/qscintilla/

2021-06-23 Thread Davide Pesavento
commit: b3847dedc5d0355de8069672a293986dd1f5b4ef
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Jun 23 19:57:09 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Wed Jun 23 19:57:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3847ded

x11-libs/qscintilla: add 2.12.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 x11-libs/qscintilla/Manifest |  1 +
 x11-libs/qscintilla/qscintilla-2.12.1.ebuild | 80 
 2 files changed, 81 insertions(+)

diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 0b3102843cf..da06d802b0b 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,3 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B 
e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304
 SHA512 
46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 
1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117
 SHA512 
8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
+DIST QScintilla_src-2.12.1.tar.gz 3059045 BLAKE2B 
500c4ec3109e09d07011fa6271721633d2a510ea672ac04a2d6c9d550b7dd7426d7b971e7c604856b818fdcd847dd466a82a8f1a84afd42f4f7164d325789ddd
 SHA512 
7e96b2e909f2bbd0f56220e53a8aaa6e6816b84fb96c4e22e3815a2e0322a87006d7567a05ae6b2490e9d2c51ca7c130e7b64780a897682579419ffd3a53ee1b

diff --git a/x11-libs/qscintilla/qscintilla-2.12.1.ebuild 
b/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
new file mode 100644
index 000..c754ae717fe
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.12.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro";
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+   SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz";
+else
+   
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz";
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+   default
+
+   # Sub-slot sanity check
+   local subslot=${SLOT#*/}
+   local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' 
"${S}"/src/qscintilla.pro || die)
+   local major=${version%%.*}
+   if [[ ${subslot} != ${major} ]]; then
+   eerror
+   eerror "Ebuild sub-slot (${subslot}) does not match QScintilla 
major version (${major})"
+   eerror "Please update SLOT variable as follows:"
+   eerror "SLOT=\"${SLOT%%/*}/${major}\""
+   eerror
+   die "sub-slot sanity check failed"
+   fi
+}
+
+qsci_run_in() {
+   pushd "$1" >/dev/null || die
+   shift || die
+   "$@" || die
+   popd >/dev/null || die
+}
+
+src_configure() {
+   if use designer; then
+   # prevent building against system version (bug 466120)
+   append-cxxflags -I../src
+   append-ldflags -L../src
+   fi
+
+   qsci_run_in src eqmake5
+   use designer && qsci_run_in designer eqmake5
+}
+
+src_compile() {
+   qsci_run_in src emake
+   use designer && qsci_run_in designer emake
+}
+
+src_install() {
+   qsci_run_in src emake INSTALL_ROOT="${D}" install
+   use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
+
+   use doc && HTML_DOCS=( doc/html/. )
+   einstalldocs
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5-sip/, dev-python/sip/, dev-python/PyQt-builder/

2021-06-21 Thread Davide Pesavento
commit: 3ba7c056c26a277d46f9a113ca1c19da01f976ea
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jun 22 01:50:12 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Tue Jun 22 01:50:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba7c056

dev-python/PyQt-builder: don't install Windows DLLs; fix deps; add USE=doc

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 .../PyQt-builder-1.10.1-r1.ebuild} | 20 +---
 dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild | 22 --
 dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild   |  2 +-
 dev-python/sip/sip-5.5.0-r2.ebuild |  2 +-
 dev-python/sip/sip-6.1.1.ebuild|  2 +-
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
similarity index 53%
copy from dev-python/sip/sip-5.5.0-r2.ebuild
copy to dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
index 4441c9dae79..2ab93714484 100644
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ 
https://pypi.org/project/sip/";
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ 
https://pypi.org/project/PyQt-builder/";
 
 MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
@@ -17,15 +17,21 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
-   !=dev-python/sip-5.5[${PYTHON_USEDEP}]
 "
 
 distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+   # don't install prebuilt Windows DLLs
+   sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+   rm -r "${PN/-/_}.egg-info" || die
+
+   distutils-r1_python_prepare_all
+}

diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild 
b/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
deleted file mode 100644
index c7f4ec9ff35..000
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ 
https://pypi.org/project/PyQt-builder/ 
https://www.riverbankcomputing.com/static/Docs/PyQt-builder/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-RDEPEND="dev-python/sip[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-src_install() {
-   distutils-r1_src_install
-}

diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild 
b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
index c7239b0887e..7b6eacca3cc 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@@ -17,6 +17,6 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="0/$(ver_cut 1)"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0/$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"

diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild 
b/dev-python/sip/sip-5.5.0-r2.ebuild
index 4441c9dae79..a541809c48f 100644
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ b/dev-python/sip/sip-5.5.0-r2.ebuild
@@ -17,8 +17,8 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="

diff --git a/dev-python/sip/sip-6.1.1.ebuild b/dev-python/sip/sip-6.1.1.ebuild
index 4441c9dae79..a541809c48f 100644
--- a/dev-python/sip/sip-6.1.1.ebuild
+++ b/dev-python/sip/sip-6.1.1.ebuild
@@ -17,8 +17,8 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/

2021-06-19 Thread Davide Pesavento
commit: d7d87d6d0a85d0419dd1c8d89eaad9bca812f152
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jun 19 19:58:53 2021 +
Commit:     Davide Pesavento  gentoo  org>
CommitDate: Sat Jun 19 20:42:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d87d6d

dev-python/sip: add pypi URL to HOMEPAGE

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-python/sip/metadata.xml| 2 +-
 dev-python/sip/sip-5.5.0-r2.ebuild | 3 ++-
 dev-python/sip/sip-6.1.1.ebuild| 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index 6368b9eb51f..1217d935698 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -10,7 +10,7 @@
p...@riverbankcomputing.com
Phil Thompson

-   
https://www.riverbankcomputing.com/hg/sip/raw-file/tip/NEWS
+   
https://www.riverbankcomputing.com/hg/sip/file/tip/NEWS
https://www.riverbankcomputing.com/static/Docs/sip/
mailto:p...@riverbankcomputing.com
sip

diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild 
b/dev-python/sip/sip-5.5.0-r2.ebuild
index 3fef4177058..4441c9dae79 100644
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ b/dev-python/sip/sip-5.5.0-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/";
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ 
https://pypi.org/project/sip/";
 
 MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
@@ -15,6 +15,7 @@ if [[ ${PV} == *_pre* ]]; then
 else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 fi
+S=${WORKDIR}/${MY_P}
 
 SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"

diff --git a/dev-python/sip/sip-6.1.1.ebuild b/dev-python/sip/sip-6.1.1.ebuild
index 3fef4177058..4441c9dae79 100644
--- a/dev-python/sip/sip-6.1.1.ebuild
+++ b/dev-python/sip/sip-6.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/";
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ 
https://pypi.org/project/sip/";
 
 MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
@@ -15,6 +15,7 @@ if [[ ${PV} == *_pre* ]]; then
 else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 fi
+S=${WORKDIR}/${MY_P}
 
 SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"



  1   2   3   4   5   6   7   8   9   10   >