[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: ab2897b351bf1e27347d572d3a2b561d3b20e5f5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 18 21:55:47 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 18 21:55:47 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab2897b3 kde-apps/kig: enable py3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-23.08.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kig/kig-23.08.49..ebuild b/kde-apps/kig/kig-23.08.49..ebuild index 09b8226cc8..ba93865c84 100644 --- a/kde-apps/kig/kig-23.08.49..ebuild +++ b/kde-apps/kig/kig-23.08.49..ebuild @@ -5,7 +5,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) KFMIN=5.106.0 QTMIN=5.15.9 inherit python-single-r1 ecm gear.kde.org diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 09b8226cc8..ba93865c84 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -5,7 +5,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) KFMIN=5.106.0 QTMIN=5.15.9 inherit python-single-r1 ecm gear.kde.org
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: b4dd7658dedde3baa122e08a64a50de611c01b13 Author: David Seifert gentoo org> AuthorDate: Sun Sep 4 13:02:48 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 8 12:25:48 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b4dd7658 kde-apps/kig: remove stale boost lower bounds Signed-off-by: David Seifert gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-22.08.1.ebuild | 2 +- kde-apps/kig/kig-22.08.49..ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kig/kig-22.08.1.ebuild b/kde-apps/kig/kig-22.08.1.ebuild index 188cb90fa2..ea8ad45e26 100644 --- a/kde-apps/kig/kig-22.08.1.ebuild +++ b/kde-apps/kig/kig-22.08.1.ebuild @@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS} geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) scripting? ( $(python_gen_cond_dep ' - >=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}] + dev-libs/boost:=[python,${PYTHON_USEDEP}] ') ) " diff --git a/kde-apps/kig/kig-22.08.49..ebuild b/kde-apps/kig/kig-22.08.49..ebuild index 35b4e73f9c..3c471e9b29 100644 --- a/kde-apps/kig/kig-22.08.49..ebuild +++ b/kde-apps/kig/kig-22.08.49..ebuild @@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS} geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) scripting? ( $(python_gen_cond_dep ' - >=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}] + dev-libs/boost:=[python,${PYTHON_USEDEP}] ') ) "
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 438639aa19ef7e36d89e8da5e42b05b54caa96b6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 3 22:30:05 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 3 22:30:05 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=438639aa kde-apps/kig: python3_11 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-22.04.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kig/kig-22.04.49..ebuild b/kde-apps/kig/kig-22.04.49..ebuild index 56006f479e..2968bf4ae1 100644 --- a/kde-apps/kig/kig-22.04.49..ebuild +++ b/kde-apps/kig/kig-22.04.49..ebuild @@ -5,7 +5,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) KFMIN=5.92.0 QTMIN=5.15.4 inherit python-single-r1 ecm kde.org diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 56006f479e..2968bf4ae1 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -5,7 +5,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) KFMIN=5.92.0 QTMIN=5.15.4 inherit python-single-r1 ecm kde.org
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: f3e3e0ab4d2d8ef67712019f7454b539f3e06430 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 25 07:23:54 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 25 08:31:22 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3e3e0ab kde-apps/kig: python3_10 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-21.08.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kig/kig-21.08.49..ebuild b/kde-apps/kig/kig-21.08.49..ebuild index 8b0842aec5..cc7640fe79 100644 --- a/kde-apps/kig/kig-21.08.49..ebuild +++ b/kde-apps/kig/kig-21.08.49..ebuild @@ -5,7 +5,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) KFMIN=5.84.0 QTMIN=5.15.2 inherit python-single-r1 ecm kde.org diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 62958d8506..6cad889996 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -5,7 +5,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) KFMIN=5.85.0 QTMIN=5.15.2 inherit python-single-r1 ecm kde.org
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 22ba50c85765dc4fc426aabef61c1492bfd9c7f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 21 15:54:03 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 21 15:54:03 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=22ba50c8 kde-apps/kig: Sync metadata with Gentoo ebuild repo Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml index 192a0d6ba3..4a266feea1 100644 --- a/kde-apps/kig/metadata.xml +++ b/kde-apps/kig/metadata.xml @@ -9,7 +9,7 @@ https://bugs.kde.org/ - Support files created by GeoGebra + Support files created by sci-mathematics/geogebra-bin Support Python scripting
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 7ed294ddd397799e4d09f9d568d6078cce0b7c1e Author: David Seifert gentoo org> AuthorDate: Sat Jul 17 18:15:59 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jul 22 19:35:09 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ed294dd kde-apps/kig: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP Signed-off-by: David Seifert gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-21.07.80.ebuild | 2 +- kde-apps/kig/kig-21.08.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-apps/kig/kig-21.07.80.ebuild b/kde-apps/kig/kig-21.07.80.ebuild index aac1196da8..26bb3827c2 100644 --- a/kde-apps/kig/kig-21.07.80.ebuild +++ b/kde-apps/kig/kig-21.07.80.ebuild @@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS} geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) scripting? ( $(python_gen_cond_dep ' - >=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}] + >=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}] ') ) " diff --git a/kde-apps/kig/kig-21.08.49..ebuild b/kde-apps/kig/kig-21.08.49..ebuild index 650c513fc8..9c47b5d73d 100644 --- a/kde-apps/kig/kig-21.08.49..ebuild +++ b/kde-apps/kig/kig-21.08.49..ebuild @@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS} geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) scripting? ( $(python_gen_cond_dep ' - >=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}] + >=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}] ') ) " diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 0abf88a136..5d9e0763fc 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS} geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) scripting? ( $(python_gen_cond_dep ' - >=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}] + >=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}] ') ) "
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: c283a818d9fae4473d36436f154084508aff0173 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 11 20:15:38 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 11 20:15:38 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c283a818 kde-apps/kig: python3_9 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-20.08.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kig/kig-20.08.49..ebuild b/kde-apps/kig/kig-20.08.49..ebuild index 5c7ea7a80f..1ca408ef20 100644 --- a/kde-apps/kig/kig-20.08.49..ebuild +++ b/kde-apps/kig/kig-20.08.49..ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) KFMIN=5.72.0 QTMIN=5.14.2 inherit python-single-r1 ecm kde.org diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 1e5bcfae2c..0a72e382ce 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) KFMIN=5.75.0 QTMIN=5.15.1 inherit python-single-r1 ecm kde.org
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 5958753816f96ecbaaede4b4cb67f1abab9bdb6b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 4 16:32:38 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 4 16:32:38 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=59587538 kde-apps/kig: Fix PkgMetadataXmlInvalidPkgRef sci-mathematics/geogebra has been last-rited. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml index dced816a5d..2824c26914 100644 --- a/kde-apps/kig/metadata.xml +++ b/kde-apps/kig/metadata.xml @@ -6,7 +6,7 @@ Gentoo KDE Project - Support files created by sci-mathematics/geogebra + Support files created by GeoGebra Support Python scripting
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 7615330bb3e34a760f3c2eecb394658e1a0faa07 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 18 08:44:09 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 18 08:48:21 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7615330b kde-apps/kig: 20.07.80 version bump Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-20.07.80.ebuild | 73 1 file changed, 73 insertions(+) diff --git a/kde-apps/kig/kig-20.07.80.ebuild b/kde-apps/kig/kig-20.07.80.ebuild new file mode 100644 index 00..582156bfe0 --- /dev/null +++ b/kde-apps/kig/kig-20.07.80.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +PYTHON_COMPAT=( python3_{7,8} ) +KFMIN=5.72.0 +QTMIN=5.14.2 +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? ( + $(python_gen_cond_dep ' + >=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND} + >=kde-frameworks/ktexteditor-${KFMIN}:5 +" + +PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch ) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + python_fix_shebang . +} + +src_configure() { + local mycmakeargs=( + -DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON} + $(cmake_use_find_package geogebra Qt5XmlPatterns) + $(cmake_use_find_package scripting Boost) + ) + + ecm_src_configure +}
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/, kde-apps/kig/files/
commit: 9ea1afe1759197dc1d1e34e91b0da48e4a08e4f8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 11 20:24:41 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 12 22:51:00 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9ea1afe1 kde-apps/kig: Bypass upstream's FindBoostPython module w/ CMake's Old patch was broken by upstream commit 1fdeff25f5f113f4567ab100da9df3f0f24c3ce8 and follow-ups. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kig/files/kig-20.08.70-cmake-boostpython.patch | 91 ++ kde-apps/kig/files/kig-4.12.0-boostpython.patch| 18 - kde-apps/kig/kig-20.08.49..ebuild | 7 +- kde-apps/kig/kig-.ebuild | 7 +- 4 files changed, 99 insertions(+), 24 deletions(-) diff --git a/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch b/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch new file mode 100644 index 00..bd0c13ad37 --- /dev/null +++ b/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch @@ -0,0 +1,91 @@ +From 39bf05d48f899612dffa07c73ac276f52820a7c9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 13 Jul 2020 00:41:25 +0200 +Subject: [PATCH] Use CMake's own FindBoost module to detect Boost Python + +Introduces BOOSTPYTHON_VERSION_MAJOR_MINOR for packaging. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 26 -- + 1 file changed, 12 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e65585fb..e07a4dc6 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -51,7 +51,8 @@ endif() + + include(KigConfigureChecks.cmake) + +-find_package(BoostPython) ++set(BOOSTPYTHON_VERSION_MAJOR_MINOR python37 CACHE STRING "Version of BoostPython to feed CMake's FindBoost") ++find_package(Boost 1.70 COMPONENTS ${BOOSTPYTHON_VERSION_MAJOR_MINOR}) + + add_subdirectory( doc ) + add_subdirectory( icons ) +@@ -61,15 +62,15 @@ add_subdirectory( macros ) + add_subdirectory( data ) + add_subdirectory( pykig ) + +-if(BoostPython_FOUND) ++if(Boost_FOUND) ++ find_package(PythonLibs 3 REQUIRED) ++ include_directories(${PYTHON_INCLUDE_DIRS}) + add_subdirectory( scripting ) + add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING) +-endif(BoostPython_FOUND) ++endif() + + set_package_properties( +- BoostPython PROPERTIES +- DESCRIPTION "Python scripting support in Boost" +- URL "https://www.boost.org/; ++ Boost PROPERTIES +TYPE OPTIONAL +PURPOSE "Kig can optionally use Boost.Python for Python scripting" + ) +@@ -85,9 +86,6 @@ set_package_properties( + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + + include_directories( ${CMAKE_SOURCE_DIR}/modes ) +-if(BoostPython_FOUND) +- include_directories(${BoostPython_INCLUDE_DIRS}) +-endif(BoostPython_FOUND) + + # kigpart + +@@ -225,7 +223,7 @@ ki18n_wrap_ui(kigpart_PART_SRCS +misc/kigcoordinateprecisiondialog.ui + ) + +-if(BoostPython_FOUND) ++if(Boost_FOUND) + set(kigpart_PART_SRCS ${kigpart_PART_SRCS} + modes/popup/scriptactionsprovider.cc + scripting/newscriptwizard.cc +@@ -236,7 +234,7 @@ if(BoostPython_FOUND) + ) + + kde_source_files_enable_exceptions(scripting/python_scripter.cc) +-endif(BoostPython_FOUND) ++endif() + + + add_library(kigpart MODULE ${kigpart_PART_SRCS}) +@@ -256,9 +254,9 @@ target_link_libraries(kigpart + ${KDE5_KUTILS_LIBS} + ) + +-if(BoostPython_FOUND) +- target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE5_KTEXTEDITOR_LIBS}) +-endif(BoostPython_FOUND) ++if(Boost_FOUND) ++ target_link_libraries(kigpart Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${PYTHON_LIBRARIES}) ++endif() + + if (Qt5XmlPatterns_FOUND) + target_link_libraries(kigpart Qt5::XmlPatterns) +-- +2.27.0 + diff --git a/kde-apps/kig/files/kig-4.12.0-boostpython.patch b/kde-apps/kig/files/kig-4.12.0-boostpython.patch deleted file mode 100644 index 5173ba2cd7..00 --- a/kde-apps/kig/files/kig-4.12.0-boostpython.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake -index 2ccc161..02d9bf6 100644 a/cmake/modules/FindBoostPython.cmake -+++ b/cmake/modules/FindBoostPython.cmake -@@ -74,10 +74,10 @@ if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND) - # Second try: try pkg-config way - find_package(PkgConfig) - if(PKG_CONFIG_FOUND) -- set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") -+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS) - foreach(_pyver ${PYTHON_VERSIONS}) - if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS) -- pkg_check_modules(${_pyver} QUIET ${_pyver}) -+ pkg_check_modules(_python python-${_pyver}) -
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 81a786fe5ff0ad1726ad67899ded7b4f3c299179 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 10 19:45:21 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 10 19:47:16 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=81a786fe kde-apps/kig: Re-add python3_8 Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-20.03.90.ebuild | 2 +- kde-apps/kig/kig-20.04.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-apps/kig/kig-20.03.90.ebuild b/kde-apps/kig/kig-20.03.90.ebuild index 24073edd98..93676fb31d 100644 --- a/kde-apps/kig/kig-20.03.90.ebuild +++ b/kde-apps/kig/kig-20.03.90.ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) KFMIN=5.68.0 QTMIN=5.12.3 inherit python-single-r1 ecm kde.org diff --git a/kde-apps/kig/kig-20.04.49..ebuild b/kde-apps/kig/kig-20.04.49..ebuild index acaa937327..5e6acb2567 100644 --- a/kde-apps/kig/kig-20.04.49..ebuild +++ b/kde-apps/kig/kig-20.04.49..ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) KFMIN=5.68.0 QTMIN=5.12.3 inherit python-single-r1 ecm kde.org diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 53ea054d81..d561da5859 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) KFMIN=5.68.0 QTMIN=5.14.1 inherit python-single-r1 ecm kde.org
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: c8e09e0eded2ddae5e2c9ebe1bb815123ebd5721 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 14:56:24 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 18:05:19 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8e09e0e kde-apps/kig: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-19.12.49..ebuild | 6 +- kde-apps/kig/kig-.ebuild | 6 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kde-apps/kig/kig-19.12.49..ebuild b/kde-apps/kig/kig-19.12.49..ebuild index acd62ec975..11a162720d 100644 --- a/kde-apps/kig/kig-19.12.49..ebuild +++ b/kde-apps/kig/kig-19.12.49..ebuild @@ -40,7 +40,11 @@ RDEPEND="${PYTHON_DEPS} >=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}] ) + scripting? ( + $(python_gen_cond_dep ' + >=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}] + ') + ) " DEPEND="${RDEPEND} >=kde-frameworks/ktexteditor-${KFMIN}:5 diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index d21ee45989..6b74e76902 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -40,7 +40,11 @@ RDEPEND="${PYTHON_DEPS} >=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}] ) + scripting? ( + $(python_gen_cond_dep ' + >=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}] + ') + ) " DEPEND="${RDEPEND} >=kde-frameworks/ktexteditor-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: b85e23e78f88faca5fed670a594140d0956089b9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 28 19:11:47 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 28 19:11:47 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b85e23e7 kde-apps/kig: Drop python3_8 for now Following the removal of python3_8 from boost. Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-19.12.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kig/kig-19.12.49..ebuild b/kde-apps/kig/kig-19.12.49..ebuild index d9087a123f..acd62ec975 100644 --- a/kde-apps/kig/kig-19.12.49..ebuild +++ b/kde-apps/kig/kig-19.12.49..ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7} ) KFMIN=5.63.0 QTMIN=5.12.3 inherit python-single-r1 ecm kde.org diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 7177f01eea..d21ee45989 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -5,7 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7} ) KFMIN=5.66.0 QTMIN=5.12.3 inherit python-single-r1 ecm kde.org
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/, kde-apps/kig/files/
commit: 37ec56bc389ab73912961b1b86e6a91fbd2c2992 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 21 16:05:42 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 21 16:42:11 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=37ec56bc kde-apps/kig: Fix crash upon exit when using scripting Eliminiate CRLF line terminators. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kig/files/kig-19.08.3-scripter-crash.patch | 29 ++ kde-apps/kig/files/kig-4.12.0-boostpython.patch| 35 +++--- kde-apps/kig/kig-19.12.49..ebuild | 1 + 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch new file mode 100644 index 00..9540e9044f --- /dev/null +++ b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch @@ -0,0 +1,29 @@ +From 211f8501ec4cf77ed68253783d58a662b5513612 Mon Sep 17 00:00:00 2001 +From: Maurizio Paolini +Date: Sat, 11 Jan 2020 19:50:33 +0100 +Subject: Fix crash upon exit after transition python2 -> python3 when using + scripting (bug #416037) + +Reviewed By: kkevin +Differential Revision: https://phabricator.kde.org/D12833 +CCBUG: 416037 +--- + scripting/python_scripter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc +index bb5db39..3edec77 100644 +--- a/scripting/python_scripter.cc b/scripting/python_scripter.cc +@@ -427,8 +427,8 @@ PythonScripter::PythonScripter() + PythonScripter::~PythonScripter() + { + PyErr_Clear(); +- Py_Finalize(); + delete d; ++ Py_FinalizeEx(); + } + + class CompiledPythonScript::Private +-- +cgit v1.1 diff --git a/kde-apps/kig/files/kig-4.12.0-boostpython.patch b/kde-apps/kig/files/kig-4.12.0-boostpython.patch index 7a4b878c6b..5173ba2cd7 100644 --- a/kde-apps/kig/files/kig-4.12.0-boostpython.patch +++ b/kde-apps/kig/files/kig-4.12.0-boostpython.patch @@ -1,17 +1,18 @@ -diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake -index 2ccc161..02d9bf6 100644 a/cmake/modules/FindBoostPython.cmake -+++ b/cmake/modules/FindBoostPython.cmake -@@ -74,10 +74,10 @@ if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND) - # Second try: try pkg-config way - find_package(PkgConfig) - if(PKG_CONFIG_FOUND) -- set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") -+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS) - foreach(_pyver ${PYTHON_VERSIONS}) - if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS) -- pkg_check_modules(${_pyver} QUIET ${_pyver}) -+ pkg_check_modules(_python python-${_pyver}) - if(${_pyver}_FOUND) - cmake_push_check_state() - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) \ No newline at end of file +diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake +index 2ccc161..02d9bf6 100644 +--- a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake +@@ -74,10 +74,10 @@ if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND) + # Second try: try pkg-config way + find_package(PkgConfig) + if(PKG_CONFIG_FOUND) +- set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") ++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS) + foreach(_pyver ${PYTHON_VERSIONS}) + if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS) +- pkg_check_modules(${_pyver} QUIET ${_pyver}) ++ pkg_check_modules(_python python-${_pyver}) + if(${_pyver}_FOUND) + cmake_push_check_state() + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) + diff --git a/kde-apps/kig/kig-19.12.49..ebuild b/kde-apps/kig/kig-19.12.49..ebuild index a64ad2e315..d9087a123f 100644 --- a/kde-apps/kig/kig-19.12.49..ebuild +++ b/kde-apps/kig/kig-19.12.49..ebuild @@ -49,6 +49,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-4.12.0-boostpython.patch "${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch + "${FILESDIR}"/${PN}-19.08.3-scripter-crash.patch ) pkg_setup() {
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/files/, kde-apps/kig/
commit: 4ac1a30173a99c59f805591c990ee06c79d4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 15 15:28:37 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 15 15:59:03 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ac1a301 kde-apps/kig: Switch to python3, backport python3 to 19.12 stable branch Upstream commit d72f33a14c22480b28c0f35d53293826f6ec787b Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/files/kig-19.08.3-pykig-python3.patch | 161 + kde-apps/kig/kig-19.12.49..ebuild | 17 ++- kde-apps/kig/kig-.ebuild | 14 +- 3 files changed, 178 insertions(+), 14 deletions(-) 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 00..902c138495 --- /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 -*- + #---pythonpykig.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
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 4db8b28c1d4a461294ccebb8d77a809386d458d2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 28 18:34:36 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Mar 1 13:15:58 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4db8b28c kde-apps/kig: Set KDE_TEST to true Closes: https://bugs.gentoo.org/678836 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/kig-18.12.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/kig/kig-18.12.49..ebuild b/kde-apps/kig/kig-18.12.49..ebuild index 0e9343ef02..ab85942d20 100644 --- a/kde-apps/kig/kig-18.12.49..ebuild +++ b/kde-apps/kig/kig-18.12.49..ebuild @@ -4,7 +4,7 @@ EAPI=7 KDE_HANDBOOK="forceoptional" -KDE_TEST="optional" +KDE_TEST="true" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5 diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 0e9343ef02..ab85942d20 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -4,7 +4,7 @@ EAPI=7 KDE_HANDBOOK="forceoptional" -KDE_TEST="optional" +KDE_TEST="true" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: e50d52c111f4906d48ae28bde7bd8923f49f9dfc Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 19 22:01:48 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 19 22:01:48 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e50d52c1 kde-apps/kig: Drop unused DEPENDs, tests optional Upstream commit: cfd3982bcc3fb1edbaa4660e715a635c57d1be89 Package-Manager: portage-2.3.0 kde-apps/kig/kig-16.12.49..ebuild | 8 +--- kde-apps/kig/kig-.ebuild | 8 +--- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/kde-apps/kig/kig-16.12.49..ebuild b/kde-apps/kig/kig-16.12.49..ebuild index 3aa7685..293595f 100644 --- a/kde-apps/kig/kig-16.12.49..ebuild +++ b/kde-apps/kig/kig-16.12.49..ebuild @@ -5,7 +5,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" +KDE_TEST="optional" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5 @@ -39,10 +39,6 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND} $(add_frameworks_dep ktexteditor) - test? ( - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kitemmodels) - ) " PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" ) @@ -61,8 +57,6 @@ src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) $(cmake-utils_use_find_package scripting BoostPython) - $(cmake-utils_use_find_package test KF5Emoticons) - $(cmake-utils_use_find_package test KF5ItemModels) ) kde5_src_configure diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 3aa7685..293595f 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -5,7 +5,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" +KDE_TEST="optional" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5 @@ -39,10 +39,6 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND} $(add_frameworks_dep ktexteditor) - test? ( - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kitemmodels) - ) " PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" ) @@ -61,8 +57,6 @@ src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) $(cmake-utils_use_find_package scripting BoostPython) - $(cmake-utils_use_find_package test KF5Emoticons) - $(cmake-utils_use_find_package test KF5ItemModels) ) kde5_src_configure
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 118ac466dce270e127bed46b8ab6f2dbec33318f Author: Johannes Huber gentoo org> AuthorDate: Thu Apr 14 20:00:05 2016 + Commit: Johannes Huber gentoo org> CommitDate: Thu Apr 14 20:00:05 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=118ac466 kde-apps/kig: Sync with tree Package-Manager: portage-2.2.28 kde-apps/kig/kig-16.03.90.ebuild | 8 +++- kde-apps/kig/kig-16.04.49..ebuild | 8 +++- kde-apps/kig/kig-.ebuild | 8 +++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/kde-apps/kig/kig-16.03.90.ebuild b/kde-apps/kig/kig-16.03.90.ebuild index 4e9c38e..538d0c6 100644 --- a/kde-apps/kig/kig-16.03.90.ebuild +++ b/kde-apps/kig/kig-16.03.90.ebuild @@ -5,6 +5,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5 @@ -38,6 +39,10 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND} $(add_frameworks_dep ktexteditor) + test? ( + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kitemmodels) + ) " PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" ) @@ -49,7 +54,6 @@ pkg_setup() { src_prepare() { kde5_src_prepare - python_fix_shebang . } @@ -57,6 +61,8 @@ src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) $(cmake-utils_use_find_package scripting BoostPython) + $(cmake-utils_use_find_package test KF5Emoticons) + $(cmake-utils_use_find_package test KF5ItemModels) ) kde5_src_configure diff --git a/kde-apps/kig/kig-16.04.49..ebuild b/kde-apps/kig/kig-16.04.49..ebuild index 1710b1c..8469398 100644 --- a/kde-apps/kig/kig-16.04.49..ebuild +++ b/kde-apps/kig/kig-16.04.49..ebuild @@ -5,6 +5,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5 @@ -38,6 +39,10 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND} $(add_frameworks_dep ktexteditor) + test? ( + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kitemmodels) + ) " PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" ) @@ -49,7 +54,6 @@ pkg_setup() { src_prepare() { kde5_src_prepare - python_fix_shebang . } @@ -57,6 +61,8 @@ src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) $(cmake-utils_use_find_package scripting BoostPython) + $(cmake-utils_use_find_package test KF5Emoticons) + $(cmake-utils_use_find_package test KF5ItemModels) ) kde5_src_configure diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 1710b1c..8469398 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -5,6 +5,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5 @@ -38,6 +39,10 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND} $(add_frameworks_dep ktexteditor) + test? ( + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kitemmodels) + ) " PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" ) @@ -49,7 +54,6 @@ pkg_setup() { src_prepare() { kde5_src_prepare - python_fix_shebang . } @@ -57,6 +61,8 @@ src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) $(cmake-utils_use_find_package scripting BoostPython) + $(cmake-utils_use_find_package test KF5Emoticons) + $(cmake-utils_use_find_package test KF5ItemModels) ) kde5_src_configure
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 60c9850f213595e561994f4bc44ed2f990110499 Author: Johannes Huber gentoo org> AuthorDate: Tue Apr 12 17:13:51 2016 + Commit: Johannes Huber gentoo org> CommitDate: Tue Apr 12 17:13:51 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=60c9850f kde-apps/kig: DEPEND on kde-frameworks/ktexteditor Gentoo-bug: 579662 Package-Manager: portage-2.2.28 kde-apps/kig/kig-16.03.90.ebuild | 6 -- kde-apps/kig/kig-16.04.49..ebuild | 6 -- kde-apps/kig/kig-.ebuild | 6 -- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/kde-apps/kig/kig-16.03.90.ebuild b/kde-apps/kig/kig-16.03.90.ebuild index 82e06b8..4e9c38e 100644 --- a/kde-apps/kig/kig-16.03.90.ebuild +++ b/kde-apps/kig/kig-16.03.90.ebuild @@ -15,7 +15,7 @@ IUSE="geogebra scripting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND="${PYTHON_DEPS} +RDEPEND="${PYTHON_DEPS} $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -36,7 +36,9 @@ DEPEND="${PYTHON_DEPS} geogebra? ( $(add_qt_dep qtxmlpatterns) ) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + $(add_frameworks_dep ktexteditor) +" PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" ) diff --git a/kde-apps/kig/kig-16.04.49..ebuild b/kde-apps/kig/kig-16.04.49..ebuild index d4af132..1710b1c 100644 --- a/kde-apps/kig/kig-16.04.49..ebuild +++ b/kde-apps/kig/kig-16.04.49..ebuild @@ -15,7 +15,7 @@ IUSE="geogebra scripting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND="${PYTHON_DEPS} +RDEPEND="${PYTHON_DEPS} $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -36,7 +36,9 @@ DEPEND="${PYTHON_DEPS} geogebra? ( $(add_qt_dep qtxmlpatterns) ) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + $(add_frameworks_dep ktexteditor) +" PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" ) diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index d4af132..1710b1c 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -15,7 +15,7 @@ IUSE="geogebra scripting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND="${PYTHON_DEPS} +RDEPEND="${PYTHON_DEPS} $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -36,7 +36,9 @@ DEPEND="${PYTHON_DEPS} geogebra? ( $(add_qt_dep qtxmlpatterns) ) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + $(add_frameworks_dep ktexteditor) +" PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: a07eb439afc4838a24390ada24cf3a21ab9fb417 Author: Michael Palimaka gentoo org> AuthorDate: Thu Mar 10 08:18:56 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Mar 10 08:35:08 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a07eb439 kde-apps/kig: introduce geogebra USE flag Package-Manager: portage-2.2.27 kde-apps/kig/kig-15.12.2.ebuild | 5 +++-- kde-apps/kig/kig-15.12.49..ebuild | 5 +++-- kde-apps/kig/kig-.ebuild | 7 --- kde-apps/kig/metadata.xml | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/kde-apps/kig/kig-15.12.2.ebuild b/kde-apps/kig/kig-15.12.2.ebuild index 5f73387..09c6ee0 100644 --- a/kde-apps/kig/kig-15.12.2.ebuild +++ b/kde-apps/kig/kig-15.12.2.ebuild @@ -11,7 +11,7 @@ inherit python-single-r1 kde5 DESCRIPTION="KDE Interactive Geometry tool" HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig; KEYWORDS="~amd64 ~x86" -IUSE="scripting" +IUSE="geogebra scripting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -33,7 +33,7 @@ DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - $(add_qt_dep qtxmlpatterns) + geogebra? ( $(add_qt_dep qtxmlpatterns) ) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " RDEPEND="${DEPEND}" @@ -53,6 +53,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) $(cmake-utils_use_find_package scripting BoostPython) ) diff --git a/kde-apps/kig/kig-15.12.49..ebuild b/kde-apps/kig/kig-15.12.49..ebuild index a915275..405dd3a 100644 --- a/kde-apps/kig/kig-15.12.49..ebuild +++ b/kde-apps/kig/kig-15.12.49..ebuild @@ -11,7 +11,7 @@ inherit python-single-r1 kde5 DESCRIPTION="KDE Interactive Geometry tool" HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig; KEYWORDS="" -IUSE="scripting" +IUSE="geogebra scripting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -33,7 +33,7 @@ DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - $(add_qt_dep qtxmlpatterns) + geogebra? ( $(add_qt_dep qtxmlpatterns) ) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " RDEPEND="${DEPEND}" @@ -53,6 +53,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) $(cmake-utils_use_find_package scripting BoostPython) ) diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index e13d6f5..0de3d76 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -11,7 +11,7 @@ inherit python-single-r1 kde5 DESCRIPTION="KDE Interactive Geometry tool" HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig; KEYWORDS="" -IUSE="scripting" +IUSE="geogebra scripting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -21,8 +21,8 @@ DEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcrash) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kparts) @@ -34,7 +34,7 @@ DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - $(add_qt_dep qtxmlpatterns) + geogebra? ( $(add_qt_dep qtxmlpatterns) ) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " RDEPEND="${DEPEND}" @@ -54,6 +54,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + $(cmake-utils_use_find_package geogebra Qt5XmlPatterns) $(cmake-utils_use_find_package scripting BoostPython) ) diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml index a190707..37e629d 100644 --- a/kde-apps/kig/metadata.xml +++ b/kde-apps/kig/metadata.xml @@ -2,6 +2,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> + Support files created by sci-mathematics/geogebra Support Python scripting
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 9136601876838e39dc5970bdeab51d3d4029d0ba Author: Michael Palimaka gentoo org> AuthorDate: Thu Mar 10 08:02:07 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Mar 10 08:02:07 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=91366018 kde-apps/kig: port to EAPI 6 Package-Manager: portage-2.2.27 kde-apps/kig/kig-15.12.2.ebuild | 2 +- kde-apps/kig/kig-15.12.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-apps/kig/kig-15.12.2.ebuild b/kde-apps/kig/kig-15.12.2.ebuild index 278d835..3184c30 100644 --- a/kde-apps/kig/kig-15.12.2.ebuild +++ b/kde-apps/kig/kig-15.12.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_HANDBOOK=true PYTHON_COMPAT=( python2_7 ) diff --git a/kde-apps/kig/kig-15.12.49..ebuild b/kde-apps/kig/kig-15.12.49..ebuild index 45047ca..f72ffce 100644 --- a/kde-apps/kig/kig-15.12.49..ebuild +++ b/kde-apps/kig/kig-15.12.49..ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_HANDBOOK=true PYTHON_COMPAT=( python2_7 ) diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index a80f7a4..d7b7d4b 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_HANDBOOK=true PYTHON_COMPAT=( python2_7 )
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 81af2347f21811cee69a23b781b4ba7bb02d97e8 Author: Michael Palimaka gentoo org> AuthorDate: Thu Mar 10 08:01:14 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Mar 10 08:01:14 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=81af2347 kde-apps/kig: add missing dependency Package-Manager: portage-2.2.27 kde-apps/kig/kig-15.12.2.ebuild | 3 ++- kde-apps/kig/kig-15.12.49..ebuild | 1 + kde-apps/kig/kig-.ebuild | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-apps/kig/kig-15.12.2.ebuild b/kde-apps/kig/kig-15.12.2.ebuild index 12dab24..278d835 100644 --- a/kde-apps/kig/kig-15.12.2.ebuild +++ b/kde-apps/kig/kig-15.12.2.ebuild @@ -10,7 +10,7 @@ inherit python-single-r1 kde5 DESCRIPTION="KDE Interactive Geometry tool" HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig; -KEYWORDS=" ~amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="scripting" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -33,6 +33,7 @@ DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " RDEPEND="${DEPEND}" diff --git a/kde-apps/kig/kig-15.12.49..ebuild b/kde-apps/kig/kig-15.12.49..ebuild index ffe3ad5..45047ca 100644 --- a/kde-apps/kig/kig-15.12.49..ebuild +++ b/kde-apps/kig/kig-15.12.49..ebuild @@ -33,6 +33,7 @@ DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " RDEPEND="${DEPEND}" diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index ed2570f..a80f7a4 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -34,6 +34,7 @@ DEPEND=" $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: b8ddd26cbbde0a262a97a6edbf4db3d3d7086c89 Author: Michael Palimaka gentoo org> AuthorDate: Thu Mar 10 08:03:42 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Mar 10 08:03:42 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b8ddd26c kde-apps/kig: force handbook to be optional Package-Manager: portage-2.2.27 kde-apps/kig/kig-15.12.2.ebuild | 2 +- kde-apps/kig/kig-15.12.49..ebuild | 2 +- kde-apps/kig/kig-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-apps/kig/kig-15.12.2.ebuild b/kde-apps/kig/kig-15.12.2.ebuild index 3184c30..5f73387 100644 --- a/kde-apps/kig/kig-15.12.2.ebuild +++ b/kde-apps/kig/kig-15.12.2.ebuild @@ -4,7 +4,7 @@ EAPI=6 -KDE_HANDBOOK=true +KDE_HANDBOOK="forceoptional" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5 diff --git a/kde-apps/kig/kig-15.12.49..ebuild b/kde-apps/kig/kig-15.12.49..ebuild index f72ffce..a915275 100644 --- a/kde-apps/kig/kig-15.12.49..ebuild +++ b/kde-apps/kig/kig-15.12.49..ebuild @@ -4,7 +4,7 @@ EAPI=6 -KDE_HANDBOOK=true +KDE_HANDBOOK="forceoptional" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5 diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index d7b7d4b..e13d6f5 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -4,7 +4,7 @@ EAPI=6 -KDE_HANDBOOK=true +KDE_HANDBOOK="forceoptional" PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 kde5
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 5a9b217f797023148d1a104cb022c936bc465304 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jan 3 01:30:58 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jan 4 16:21:35 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a9b217f kde-apps/kig: Add kcrash DEPEND Package-Manager: portage-2.2.26 kde-apps/kig/kig-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 6e09586..5618a9c 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -21,6 +21,7 @@ DEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcrash) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes)
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: 9583f5bed04856d0d220cdcaf3154a049edf5bf8 Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com AuthorDate: Wed Jul 22 08:43:45 2015 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Wed Jul 22 08:43:45 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9583f5be [kde-apps/kig] Drop DEPEND on kdelibs4support Package-Manager: portage-2.2.20 kde-apps/kig/kig-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 8ff447c..fb4efb7 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -22,7 +22,6 @@ DEPEND= $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kparts)
[gentoo-commits] proj/kde:master commit in: kde-apps/kig/
commit: c1342dbde5667f7893cecddd3d5f8bc041000c7e Author: Johannes Huber johu AT gentoo DOT org AuthorDate: Sun Feb 22 21:28:14 2015 + Commit: Johannes Huber johu AT gentoo DOT org CommitDate: Sun Feb 22 21:28:14 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c1342dbd [kde-apps/kig] Ported to KF5 Package-Manager: portage-2.2.17 --- kde-apps/kig/kig-.ebuild | 29 +++-- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/kde-apps/kig/kig-.ebuild b/kde-apps/kig/kig-.ebuild index 9719f94..8ff447c 100644 --- a/kde-apps/kig/kig-.ebuild +++ b/kde-apps/kig/kig-.ebuild @@ -4,19 +4,36 @@ EAPI=5 -KDE_HANDBOOK=optional +KDE_HANDBOOK=true PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 kde4-base +inherit python-single-r1 kde5 DESCRIPTION=KDE Interactive Geometry tool HOMEPAGE=http://www.kde.org/applications/education/kig http://edu.kde.org/kig; KEYWORDS= -IUSE=debug scripting +IUSE=scripting REQUIRED_USE=${PYTHON_REQUIRED_USE} DEPEND= ${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 kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 scripting? ( =dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) RDEPEND=${DEPEND} @@ -25,11 +42,11 @@ PATCHES=( ${FILESDIR}/${PN}-4.12.0-boostpython.patch ) pkg_setup() { python-single-r1_pkg_setup - kde4-base_pkg_setup + kde5_pkg_setup } src_prepare() { - kde4-base_src_prepare + kde5_src_prepare python_fix_shebang . } @@ -39,5 +56,5 @@ src_configure() { $(cmake-utils_use_find_package scripting BoostPython) ) - kde4-base_src_configure + kde5_src_configure }