From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- kde-apps/kig/Manifest | 9 +- kde-apps/kig/files/kig-19.08.3-pykig-python3.patch | 161 +++++++++++++++++++++ .../kig/files/kig-19.08.3-scripter-python3.patch | 27 ++++ kde-apps/kig/kig-19.04.3.ebuild | 62 -------- kde-apps/kig/kig-19.08.3-r1.ebuild | 72 +++++++++ kde-apps/kig/kig-19.08.3.ebuild | 2 +- kde-apps/kig/kig-19.12.0-r1.ebuild | 71 +++++++++ 7 files changed, 338 insertions(+), 66 deletions(-) create mode 100644 kde-apps/kig/files/kig-19.08.3-pykig-python3.patch create mode 100644 kde-apps/kig/files/kig-19.08.3-scripter-python3.patch delete mode 100644 kde-apps/kig/kig-19.04.3.ebuild create mode 100644 kde-apps/kig/kig-19.08.3-r1.ebuild create mode 100644 kde-apps/kig/kig-19.12.0-r1.ebuild (limited to 'kde-apps/kig') diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest index ab8a42b6c61f..ac1180b81d01 100644 --- a/kde-apps/kig/Manifest +++ b/kde-apps/kig/Manifest @@ -1,6 +1,9 @@ +AUX kig-19.08.3-pykig-python3.patch 4617 BLAKE2B 6c10c34462ef5c0387e35cdfe79aa8144474675f0ec565fcefb4c90d6ae182340dfc619afd823a7df8357b529c10a4a68b7bcd99e5d540832574a0a51d41e52b SHA512 c405b90184456066f085563637ec8c6e478d8bcc200e2d17baa32eb7dd3a208ec2f2d79b84777ddc8b0722819a6ac99427e8d5f2db31b89b0a9e37f38eb7fa1b +AUX kig-19.08.3-scripter-python3.patch 981 BLAKE2B 66a23977cbcbfaf7965d1264c1806991c8ab1f7636d7e8da83bc218efb011992f63c43b9b2ebadc5b8c21ce114f6a06c93b7c9a531372ac1abaa608ed9288f30 SHA512 a82612a8cb8e95e2a5e839d27bd27fe0f7942df6cf777ea10653791e26a4175fbdd47981c50ab3d5091831f58555c5b3dba94b4b383a916b21482176377bc21c AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f -DIST kig-19.04.3.tar.xz 3492840 BLAKE2B 3abfbc6d5278fda490a6211b545d431430ef7ae039237ed4f138b74ffb835f4e8a18b843463d8f016832d948b728894178130ce39adadb53a29ceb09c0932da6 SHA512 ade87a3138e017a954fb9a7610e3032e61bf0b275973b5cba2ee0c254abf0d86446a4663e288cfb8bb294f69edbbf80a9993f3eca52f845edec5462f440e4624 DIST kig-19.08.3.tar.xz 3497128 BLAKE2B e6611dd70ef47d0c710b5127b01532da4dc0841dbbfd8a151a9a867970389aa3c46d74a1347504beef5ca3c6fbcfaf2521923d7e34306eba580d88ecf002b1f8 SHA512 7e5f315695e9678c3e95822da3e86328dd8d6521d83697c623ac0175ae96fe13490d39e8a338c2112939b6b808fe8a213fafdcad951731b45902d9a2a2807b03 -EBUILD kig-19.04.3.ebuild 1495 BLAKE2B 954d2408a18fafa3d50a814e224dc585d6351ab0fb3adcedc1038db0760f32aa4a91b9e925e7171d34eafe60a8ae5da515398ddcf18dc73432057f7907b152a1 SHA512 1f3b3257dcd611992776e3701767a56abcd9f45b8875d7c66ed429cb3fc4e09073439c2fd90180efc5f2b9d0a06d310a957f932416d33ba169ac55bd2c7f9184 -EBUILD kig-19.08.3.ebuild 1681 BLAKE2B dc2d2295510a43497e19fde8f6e0ca17d675de327fa1742300c2eb1d20f006763f0ad64ec91e0b4227d84bf06c9bd8c3226158f3cb6a6aa2da09fe2e65380c90 SHA512 313d2e1e2fdb8037713049765894e6e8ec7c476e9244d4ffec1d80713cbcb206ec1c00e68cfc4f655055cce7bac86de915658fad4e12d23018bf3959515b663c +DIST kig-19.12.0.tar.xz 3498676 BLAKE2B 0a8e4778f935e4de3ea005031292b06b998145df66b3a8cd9b873e36288e164938895e81226fa26db3c465dee311fbde19a78414f09faba619beda804486ae9c SHA512 aa48dfce5b0888142f67090526e33e86ee80f146f5ec52b00ca0d4db476fb1898c8d14159e66801c346e50521209466192956f70fb42bc60075633d24437a2d0 +EBUILD kig-19.08.3-r1.ebuild 1768 BLAKE2B 1d3c14170d695952234ed5e172908e0294db851d44519527f24269ceea09af8f6919def36354b40ce59217be6dd150264c7eca2e25cb091b46913557f5967796 SHA512 8323db3f0b5a00147b9e6d79677df5706defcae62e968ed9b88182896349cf1758b87d3d1c95da56a934aa2ed286e53d5d216ab2defe21130ed73aa969f20b95 +EBUILD kig-19.08.3.ebuild 1678 BLAKE2B e14809f96ebfa43a0a335de3e77d54996f6738d427fc56d86de9899f50f40b4ea9121561aaabe992fd944493bf12b823526dca0259a03e6575079cc09de72ea6 SHA512 fb0aafe66dad8fe7575e33da1e77cdaa6bef17a1cdebe64762943a8e13d498158efe5f1795885072c35bd223124ceea7bca2d681b0621521f15baaebff10d184 +EBUILD kig-19.12.0-r1.ebuild 1734 BLAKE2B 491cf7002327d96dee1545ff491e93e5327054ea4e361094e4a066d20d44ebec9a5c407d5b5ddd8b4709c9ccda8022ee3e54973410b069bd4a8f090d8b73497f SHA512 f98cf3f829032e416cbc005a4f280037cdffb67e3e838832e36f6fa3e4381c8a84f4872323c4675ed840a62ad177255200666bff327e07bd9f32f74310b91e0a MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9 diff --git a/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch b/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch new file mode 100644 index 000000000000..902c138495ec --- /dev/null +++ b/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch @@ -0,0 +1,161 @@ +From d72f33a14c22480b28c0f35d53293826f6ec787b Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Sat, 14 Dec 2019 19:49:09 +0100 +Subject: Port pykig to python 3 + +Differential Revision: https://phabricator.kde.org/D25982 +--- + pykig/pykig.py | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/pykig/pykig.py b/pykig/pykig.py +index 02f637d..3ee6e97 100644 +--- a/pykig/pykig.py ++++ b/pykig/pykig.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + #-------------------------------python------------------------pykig.py--# + # # +@@ -170,9 +170,9 @@ class KigDocument(object): + self.of=of + try: + self.outfile = open(outfilename, 'w') +- except IOError, value: ++ except IOError as value: + # print >> sys.stderr, outfilename, 'unwritable' +- print >> sys.stderr, value ++ print(value, file=sys.stderr) + sys.exit(2) + # KigOut._kigdocument=self + KigDOP._kd=self +@@ -212,14 +212,14 @@ class KigDocument(object): + self.outfile.write(" \n\n") + if self.outfile != sys.stdout: + self.outfile.close() +- except IOError, value: +- print >> sys.stderr, value ++ except IOError as value: ++ print(value, file=sys.stderr) + sys.exit(2) + try: + if self.callkig: + err = os.system('kig ' + self.outfilename) +- except Exception, value: +- print >> sys.stderr, value ++ except Exception as value: ++ print(value, file=sys.stderr) + if not self.of: + os.system('rm ' + self.outfilename) + +@@ -501,7 +501,7 @@ def databuild(nomeclasse, nomekig, v="val"): + + for d in data: + p1, p2, p3 = d +- exec databuild(p1, p2, p3) ++ exec (databuild(p1, p2, p3)) + + ##### + # Objects +@@ -645,7 +645,7 @@ def objectbuild(nameclass, namekig, params, objparams): + + for o in objects: + p1, p2, p3, p4 = o +- exec objectbuild(p1, p2, p3, p4) ++ exec (objectbuild(p1, p2, p3, p4)) + + ##### + # Properties +@@ -688,7 +688,7 @@ def propertybuild(nameclass, namekig, params, objparams): + + for p in property: + p1, p2, p3, p4 = p +- exec propertybuild(p1, p2, p3, p4) ++ exec (propertybuild(p1, p2, p3, p4)) + + ##### + # Start of properties definitions as Object's methods +@@ -734,7 +734,7 @@ def methodsbuild(namekig): + + for p in methods: + p1, p2, cl = p +- exec methodsbuild(p1) ++ exec (methodsbuild(p1)) + for c in cl: + setattr(c, p2, method) + +@@ -743,7 +743,7 @@ for p in methods: + ##### + + def usage(codexit): +- print >> sys.stderr, """ ++ print (""" + usage: pykig.py [options...] file ... + + Options: +@@ -757,7 +757,7 @@ examples: + $ pykig.py my_file.kpy + $ pykig.py -o output_file.kig my_file.kpy + $ ... +-""" ++""", file=sys.stderr) + sys.exit(codexit) + + ##### +@@ -776,7 +776,7 @@ def prog(): + _opts, _args = getopt.getopt(sys.argv[1:], "hvno:",\ + ["help", "version", "nokig", "output="]) + except getopt.GetoptError: +- print "GetoptError" ++ print ("GetoptError") + usage(2) + _callKig=True + _of=False +@@ -784,7 +784,7 @@ def prog(): + if _opt in ("-h", "--help"): + usage(0) + if _opt in ("-v", "--version"): +- print "Version:", version ++ print ("Version:", version) + sys.exit(0) + if _opt in ("-n", "--nokig"): + _callKig=False +@@ -793,19 +793,19 @@ def prog(): + _of=True + _callKig=False # if there's an output file, don't call Kig + if len(_args)==0: +- _infilename=raw_input("Input file name: ") ++ _infilename=input("Input file name: ") + if not _infilename: +- print "No input file name." ++ print ("No input file name.") + usage(2) + elif len(_args)==1: + _infilename=_args[0] + else: +- print "No input file name." ++ print ("No input file name.") + usage(2) + try: + _infile = open(_infilename, 'r') + except: +- print >> sys.stderr, _infilename, "input file can't be read." ++ print (_infilename, "input file can't be read.", file=sys.stderr) + sys.exit(2) + if _of: + if _outfilename=="-": +@@ -817,9 +817,9 @@ def prog(): + kigdocument=KigDocument(_outfilename, _callKig, _of) + kd=kigdocument + try: +- execfile(_infilename, globals()) ++ exec(open(_infilename).read(), globals()) + except: +- print >> sys.stderr, 'Syntax error in', _infilename ++ print ('Syntax error in', _infilename, file=sys.stderr) + _info = sys.exc_info() # print out the traceback + traceback.print_exc() + sys.exit(3) +-- +cgit v1.1 diff --git a/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch b/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch new file mode 100644 index 000000000000..19c5f9535a1c --- /dev/null +++ b/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch @@ -0,0 +1,27 @@ +From e0dae6b9938963c8f3c30ac7b8182452645e2dbf Mon Sep 17 00:00:00 2001 +From: Yuri Chornoivan +Date: Tue, 22 Oct 2019 20:42:51 +0300 +Subject: Try to fix Python 3 build + +--- + scripting/python_scripter.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc +index e60a90c..62a7409 100644 +--- a/scripting/python_scripter.cc ++++ b/scripting/python_scripter.cc +@@ -390,7 +390,11 @@ PythonScripter::PythonScripter() + // the newstring stuff is to prevent warnings about conversion from + // const char* to char*.. + char* s = newstring( "kig" ); ++#if PY_VERSION_HEX >= 0x03000000 ++ PyImport_AppendInittab( s, PyInit_kig ); ++#else + PyImport_AppendInittab( s, initkig ); ++#endif + // we can't delete this yet, since python keeps a pointer to it.. + // This means we have a small but harmless memory leak here, but it + // doesn't hurt at all, since it could only be freed at the end of +-- +cgit v1.1 diff --git a/kde-apps/kig/kig-19.04.3.ebuild b/kde-apps/kig/kig-19.04.3.ebuild deleted file mode 100644 index 21e326006569..000000000000 --- a/kde-apps/kig/kig-19.04.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 kde5 - -DESCRIPTION="KDE Interactive Geometry tool" -HOMEPAGE="https://kde.org/applications/education/kig https://edu.kde.org/kig/" -KEYWORDS="amd64 arm64 x86" -IUSE="geogebra scripting" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - geogebra? ( $(add_qt_dep qtxmlpatterns) ) - scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND} - $(add_frameworks_dep ktexteditor) -" - -PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" ) - -pkg_setup() { - python-single-r1_pkg_setup - kde5_pkg_setup -} - -src_prepare() { - kde5_src_prepare - python_fix_shebang . -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) - $(cmake-utils_use_find_package scripting BoostPython) - ) - - kde5_src_configure -} diff --git a/kde-apps/kig/kig-19.08.3-r1.ebuild b/kde-apps/kig/kig-19.08.3-r1.ebuild new file mode 100644 index 000000000000..3d0c68469d07 --- /dev/null +++ b/kde-apps/kig/kig-19.08.3-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +PYTHON_COMPAT=( python3_{6,7,8} ) +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit python-single-r1 ecm kde.org + +DESCRIPTION="KDE Interactive Geometry tool" +HOMEPAGE="https://kde.org/applications/education/org.kde.kig +https://edu.kde.org/kig/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="geogebra scripting" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) + scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=kde-frameworks/ktexteditor-${KFMIN}:5 +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.12.0-boostpython.patch + "${FILESDIR}"/${P}-scripter-python3.patch + "${FILESDIR}"/${P}-pykig-python3.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + python_fix_shebang . +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package geogebra Qt5XmlPatterns) + $(cmake_use_find_package scripting BoostPython) + ) + + ecm_src_configure +} diff --git a/kde-apps/kig/kig-19.08.3.ebuild b/kde-apps/kig/kig-19.08.3.ebuild index 3563fa63f20b..c07c7f5c1d94 100644 --- a/kde-apps/kig/kig-19.08.3.ebuild +++ b/kde-apps/kig/kig-19.08.3.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="KDE Interactive Geometry tool" HOMEPAGE="https://kde.org/applications/education/kig https://edu.kde.org/kig/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="geogebra scripting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/kde-apps/kig/kig-19.12.0-r1.ebuild b/kde-apps/kig/kig-19.12.0-r1.ebuild new file mode 100644 index 000000000000..44b0902c3a3f --- /dev/null +++ b/kde-apps/kig/kig-19.12.0-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +PYTHON_COMPAT=( python3_{6,7,8} ) +KFMIN=5.63.0 +QTMIN=5.12.3 +inherit python-single-r1 ecm kde.org + +DESCRIPTION="KDE Interactive Geometry tool" +HOMEPAGE="https://kde.org/applications/education/org.kde.kig +https://edu.kde.org/kig/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="geogebra scripting" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) + scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=kde-frameworks/ktexteditor-${KFMIN}:5 +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.12.0-boostpython.patch + "${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + python_fix_shebang . +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package geogebra Qt5XmlPatterns) + $(cmake_use_find_package scripting BoostPython) + ) + + ecm_src_configure +} -- cgit v1.2.3