[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2024-02-22 Thread Sam James
commit: 6ce90854794a54a0e8759fd0a4f53b20a5a82d4b
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 23 06:24:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 23 06:24:53 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ce90854

kde-apps/kajongg: sync <

Signed-off-by: Sam James  gentoo.org>

 kde-apps/kajongg/kajongg-24.02.0.ebuild   | 1 -
 kde-apps/kajongg/kajongg-24.02.49..ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-24.02.0.ebuild 
b/kde-apps/kajongg/kajongg-24.02.0.ebuild
index 4209ed1bd2..d34b81340a 100644
--- a/kde-apps/kajongg/kajongg-24.02.0.ebuild
+++ b/kde-apps/kajongg/kajongg-24.02.0.ebuild
@@ -25,7 +25,6 @@ DEPEND="${PYTHON_DEPS}
>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
>=dev-qt/qtsvg-${QTMIN}:6
>=kde-apps/libkdegames-${PVCUT}:6
-   >=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
$(python_gen_cond_dep '
dev-python/QtPy[gui,svg,widgets,${PYTHON_USEDEP}]

diff --git a/kde-apps/kajongg/kajongg-24.02.49..ebuild 
b/kde-apps/kajongg/kajongg-24.02.49..ebuild
index 71bfc6693d..56236e2cf4 100644
--- a/kde-apps/kajongg/kajongg-24.02.49..ebuild
+++ b/kde-apps/kajongg/kajongg-24.02.49..ebuild
@@ -25,7 +25,6 @@ DEPEND="${PYTHON_DEPS}
>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
>=dev-qt/qtsvg-${QTMIN}:6
>=kde-apps/libkdegames-${PVCUT}:6
-   >=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
$(python_gen_cond_dep '
dev-python/QtPy[gui,svg,widgets,${PYTHON_USEDEP}]



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2024-02-22 Thread Sam James
commit: b34f01a69fcbc702c43821a4affa10f2a416148b
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 22 14:43:21 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 23 04:49:39 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b34f01a6

kde-apps/kajongg: refresh deps

* drop kconfig (upstream commit 3695b67f0277a076483c595ce13976023aec9cde)

Signed-off-by: Sam James  gentoo.org>

 kde-apps/kajongg/kajongg-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 71bfc6693d..56236e2cf4 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -25,7 +25,6 @@ DEPEND="${PYTHON_DEPS}
>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
>=dev-qt/qtsvg-${QTMIN}:6
>=kde-apps/libkdegames-${PVCUT}:6
-   >=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
$(python_gen_cond_dep '
dev-python/QtPy[gui,svg,widgets,${PYTHON_USEDEP}]



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2023-12-18 Thread Andreas Sturmlechner
commit: 7a3598c681e467ef886f85b44cf0b4d212447882
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 18 21:55:57 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 18 21:55:57 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a3598c6

kde-apps/kajongg: enable py3.12

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-23.08.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-23.08.49..ebuild 
b/kde-apps/kajongg/kajongg-23.08.49..ebuild
index 2026d311b6..9d0c598902 100644
--- a/kde-apps/kajongg/kajongg-23.08.49..ebuild
+++ b/kde-apps/kajongg/kajongg-23.08.49..ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.106.0
 QTMIN=5.15.9

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 7389dbb874..9fdbc547c4 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.245.0
 QTMIN=6.6.0



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2023-02-25 Thread Andreas Sturmlechner
commit: 6ebae7e102f08776fa664ec2577fc34d518c41a3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 25 08:34:01 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 25 08:34:01 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ebae7e1

kde-apps/kajongg: Upstream switched from PyQt5 to QtPy

Upstream commit dd01383c84dba7a66bf3bd48eaa17f5a5d21b75e

Bug: https://bugs.gentoo.org/896148
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-22.12.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-22.12.49..ebuild 
b/kde-apps/kajongg/kajongg-22.12.49..ebuild
index 3ef5675a0b..5dd08f5733 100644
--- a/kde-apps/kajongg/kajongg-22.12.49..ebuild
+++ b/kde-apps/kajongg/kajongg-22.12.49..ebuild
@@ -29,7 +29,7 @@ DEPEND="${PYTHON_DEPS}
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
$(python_gen_cond_dep '
-   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+   dev-python/QtPy[gui,svg,widgets,${PYTHON_USEDEP}]
>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
')
 "

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 6cf38c90d3..ac254e10ea 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -29,7 +29,7 @@ DEPEND="${PYTHON_DEPS}
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
$(python_gen_cond_dep '
-   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+   dev-python/QtPy[gui,svg,widgets,${PYTHON_USEDEP}]
>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
')
 "



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2022-07-03 Thread Andreas Sturmlechner
commit: 077701ade29f7826c76c30975a7e7da5ab3aa4b8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  3 23:02:00 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  3 23:02:00 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=077701ad

kde-apps/kajongg: python3_11

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

 kde-apps/kajongg/kajongg-22.04.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-22.04.49..ebuild 
b/kde-apps/kajongg/kajongg-22.04.49..ebuild
index 449e95e1ff..8fc52f3191 100644
--- a/kde-apps/kajongg/kajongg-22.04.49..ebuild
+++ b/kde-apps/kajongg/kajongg-22.04.49..ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.92.0
 QTMIN=5.15.4

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 449e95e1ff..8fc52f3191 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.92.0
 QTMIN=5.15.4



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2021-08-25 Thread Andreas Sturmlechner
commit: 9e2885fbb776dd0df18dd4bbe77f0145c6ea2fb1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 25 07:21:36 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 25 08:31:22 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9e2885fb

kde-apps/kajongg: python3_10

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

 kde-apps/kajongg/kajongg-21.08.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-21.08.49..ebuild 
b/kde-apps/kajongg/kajongg-21.08.49..ebuild
index d0c081d1cc..8f95d5a2d5 100644
--- a/kde-apps/kajongg/kajongg-21.08.49..ebuild
+++ b/kde-apps/kajongg/kajongg-21.08.49..ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.84.0
 QTMIN=5.15.2

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 3c826218f2..9cb4e25f0b 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.85.0
 QTMIN=5.15.2



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2021-07-22 Thread Andreas Sturmlechner
commit: 6db18d61769785635446eccce55f4a22996f138e
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul 17 18:15:58 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul 22 19:34:59 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6db18d61

kde-apps/kajongg: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP

Signed-off-by: David Seifert  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-21.07.80.ebuild  | 4 ++--
 kde-apps/kajongg/kajongg-21.08.49..ebuild | 4 ++--
 kde-apps/kajongg/kajongg-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-21.07.80.ebuild 
b/kde-apps/kajongg/kajongg-21.07.80.ebuild
index 368d9aede0..6e5ca686f4 100644
--- a/kde-apps/kajongg/kajongg-21.07.80.ebuild
+++ b/kde-apps/kajongg/kajongg-21.07.80.ebuild
@@ -29,8 +29,8 @@ DEPEND="${PYTHON_DEPS}
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
$(python_gen_cond_dep '
-   dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-   >=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
+   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+   >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
')
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/kajongg/kajongg-21.08.49..ebuild 
b/kde-apps/kajongg/kajongg-21.08.49..ebuild
index d0d7c00604..0bde33d341 100644
--- a/kde-apps/kajongg/kajongg-21.08.49..ebuild
+++ b/kde-apps/kajongg/kajongg-21.08.49..ebuild
@@ -29,8 +29,8 @@ DEPEND="${PYTHON_DEPS}
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
$(python_gen_cond_dep '
-   dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-   >=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
+   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+   >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
')
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index d2658a640a..7b67a93ad3 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -29,8 +29,8 @@ DEPEND="${PYTHON_DEPS}
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
$(python_gen_cond_dep '
-   dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-   >=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
+   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+   >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
')
 "
 RDEPEND="${DEPEND}



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2020-10-11 Thread Andreas Sturmlechner
commit: 3ee538611e327b7229a5468e19db28372e40d752
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 11 20:12:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 11 20:12:52 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3ee53861

kde-apps/kajongg: python3_9

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-20.08.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-20.08.49..ebuild 
b/kde-apps/kajongg/kajongg-20.08.49..ebuild
index 1bcaf8bc2c..35438d8775 100644
--- a/kde-apps/kajongg/kajongg-20.08.49..ebuild
+++ b/kde-apps/kajongg/kajongg-20.08.49..ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.72.0
 QTMIN=5.14.2

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 6c16ff83fc..617df07534 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.75.0
 QTMIN=5.15.1



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2020-04-10 Thread Andreas Sturmlechner
commit: a0125e26e3d891a22695c74b059243199fc7a21b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 10 19:47:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 10 19:47:34 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a0125e26

kde-apps/kajongg: Add python3_8

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-20.03.90.ebuild  | 2 +-
 kde-apps/kajongg/kajongg-20.04.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-20.03.90.ebuild 
b/kde-apps/kajongg/kajongg-20.03.90.ebuild
index 187de563c6..d3781d2778 100644
--- a/kde-apps/kajongg/kajongg-20.03.90.ebuild
+++ b/kde-apps/kajongg/kajongg-20.03.90.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.68.0
 QTMIN=5.12.3

diff --git a/kde-apps/kajongg/kajongg-20.04.49..ebuild 
b/kde-apps/kajongg/kajongg-20.04.49..ebuild
index 1fcba21730..7d49358e22 100644
--- a/kde-apps/kajongg/kajongg-20.04.49..ebuild
+++ b/kde-apps/kajongg/kajongg-20.04.49..ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.68.0
 QTMIN=5.12.3

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 50ca8fa806..cda412cd0e 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.68.0
 QTMIN=5.14.1



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2020-03-26 Thread Andreas Sturmlechner
commit: 2797889a0b121a8ac8644c7ae19434c957ad7036
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 25 18:43:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 26 13:48:59 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2797889a

kde-apps/kajongg: Drop obsolete cmake workaround

Upstream commit 106bfba0378204b6c2b87d0a7bc357ca01c91454

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-20.04.49..ebuild | 8 
 kde-apps/kajongg/kajongg-.ebuild  | 8 
 2 files changed, 16 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-20.04.49..ebuild 
b/kde-apps/kajongg/kajongg-20.04.49..ebuild
index cac1a411d2..1fcba21730 100644
--- a/kde-apps/kajongg/kajongg-20.04.49..ebuild
+++ b/kde-apps/kajongg/kajongg-20.04.49..ebuild
@@ -45,12 +45,4 @@ pkg_setup() {
 src_prepare() {
python_fix_shebang src
ecm_src_prepare
-   sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
-   ecm_src_install
-   dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
-   dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
-   fperms a+x /usr/share/kajongg/kajongg{,server}.py
 }

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index cac1a411d2..1fcba21730 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -45,12 +45,4 @@ pkg_setup() {
 src_prepare() {
python_fix_shebang src
ecm_src_prepare
-   sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
-   ecm_src_install
-   dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
-   dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
-   fperms a+x /usr/share/kajongg/kajongg{,server}.py
 }



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2020-02-09 Thread Andreas Sturmlechner
commit: 90ec1c9fc936cf7f2fa975586b70d72a0bc99427
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 14:55:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  9 18:05:15 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=90ec1c9f

kde-apps/kajongg: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-19.12.49..ebuild | 6 --
 kde-apps/kajongg/kajongg-.ebuild  | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-19.12.49..ebuild 
b/kde-apps/kajongg/kajongg-19.12.49..ebuild
index 2ee08d20c4..99e8d5abe2 100644
--- a/kde-apps/kajongg/kajongg-19.12.49..ebuild
+++ b/kde-apps/kajongg/kajongg-19.12.49..ebuild
@@ -28,8 +28,10 @@ DEPEND="${PYTHON_DEPS}
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
dev-db/sqlite:3
-   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
-   >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+   >=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
+   ')
 "
 RDEPEND="${DEPEND}
>=kde-apps/libkmahjongg-${PVCUT}:5

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 8d5713c8d3..48df8374da 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -28,8 +28,10 @@ DEPEND="${PYTHON_DEPS}
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
dev-db/sqlite:3
-   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
-   >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+   >=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
+   ')
 "
 RDEPEND="${DEPEND}
>=kde-apps/libkmahjongg-${PVCUT}:5



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2019-10-16 Thread Andreas Sturmlechner
commit: 01d0ce5aa0e3bf67fff2a2fad4d4b12af95c481b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct 16 12:51:12 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 12:51:12 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=01d0ce5a

kde-apps/kajongg: Drop KDE_AUTODEPS=false

Looks bogus in here, at least at this point.

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-19.08.49..ebuild | 3 ---
 kde-apps/kajongg/kajongg-.ebuild  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-19.08.49..ebuild 
b/kde-apps/kajongg/kajongg-19.08.49..ebuild
index f9a78148f4..4377f345c9 100644
--- a/kde-apps/kajongg/kajongg-19.08.49..ebuild
+++ b/kde-apps/kajongg/kajongg-19.08.49..ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
 PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1 kde5
@@ -16,11 +15,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep extra-cmake-modules)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep libkdegames)
-   $(add_qt_dep qtcore)
$(add_qt_dep qtgui)
$(add_qt_dep qtsvg)
$(add_qt_dep qtwidgets)

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index f9a78148f4..4377f345c9 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
 PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1 kde5
@@ -16,11 +15,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep extra-cmake-modules)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep ki18n)
$(add_kdeapps_dep libkdegames)
-   $(add_qt_dep qtcore)
$(add_qt_dep qtgui)
$(add_qt_dep qtsvg)
$(add_qt_dep qtwidgets)



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/, dev-util/kdevelop-python/, ...

2019-09-14 Thread Andreas Sturmlechner
commit: 44267b6fc151a3a6afd296ba1da5a8a1bd783b3c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 14 15:22:37 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 14 15:22:37 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=44267b6f

*/*: Drop python3_5 support

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/kdevelop-python/kdevelop-python-5.4..ebuild   | 2 +-
 dev-util/kdevelop-python/kdevelop-python-.ebuild   | 2 +-
 kde-apps/cantor/cantor-19.08.49..ebuild| 2 +-
 kde-apps/cantor/cantor-.ebuild | 2 +-
 kde-apps/kajongg/kajongg-19.08.49..ebuild  | 2 +-
 kde-apps/kajongg/kajongg-.ebuild   | 2 +-
 kde-apps/lokalize/lokalize-19.08.49..ebuild| 2 +-
 kde-apps/lokalize/lokalize-.ebuild | 2 +-
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 kde-frameworks/kfilemetadata/kfilemetadata-.ebuild | 2 +-
 kde-frameworks/ki18n/ki18n-.ebuild | 2 +-
 kde-plasma/breeze-gtk/breeze-gtk-.ebuild   | 2 +-
 media-gfx/krita/krita-.ebuild  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4..ebuild 
b/dev-util/kdevelop-python/kdevelop-python-5.4..ebuild
index 4329abd3e9..f85c7d2da5 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.4..ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4..ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_TEST="forceoptional"
 KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then

diff --git a/dev-util/kdevelop-python/kdevelop-python-.ebuild 
b/dev-util/kdevelop-python/kdevelop-python-.ebuild
index 4329abd3e9..f85c7d2da5 100644
--- a/dev-util/kdevelop-python/kdevelop-python-.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_TEST="forceoptional"
 KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then

diff --git a/kde-apps/cantor/cantor-19.08.49..ebuild 
b/kde-apps/cantor/cantor-19.08.49..ebuild
index 8a32077f6f..a681d25a65 100644
--- a/kde-apps/cantor/cantor-19.08.49..ebuild
+++ b/kde-apps/cantor/cantor-19.08.49..ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit kde5 python-single-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"

diff --git a/kde-apps/cantor/cantor-.ebuild 
b/kde-apps/cantor/cantor-.ebuild
index 8a32077f6f..a681d25a65 100644
--- a/kde-apps/cantor/cantor-.ebuild
+++ b/kde-apps/cantor/cantor-.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit kde5 python-single-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"

diff --git a/kde-apps/kajongg/kajongg-19.08.49..ebuild 
b/kde-apps/kajongg/kajongg-19.08.49..ebuild
index ecda0564ff..f9a78148f4 100644
--- a/kde-apps/kajongg/kajongg-19.08.49..ebuild
+++ b/kde-apps/kajongg/kajongg-19.08.49..ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1 kde5
 
 DESCRIPTION="Classical Mah Jongg for four players"

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index ecda0564ff..f9a78148f4 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1 kde5
 
 DESCRIPTION="Classical Mah Jongg for four players"

diff --git a/kde-apps/lokalize/lokalize-19.08.49..ebuild 
b/kde-apps/lokalize/lokalize-19.08.49..ebuild
index aae78034f9..dfe06c5411 100644
--- a/kde-apps/lokalize/lokalize-19.08.49..ebuild
+++ b/kde-apps/lokalize/lokalize-19.08.49..ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1 kde5
 
 DESCRIPTION="KDE Applications 5 translation tool"

diff --git a/kde-apps/lokalize/lokalize-.ebuild 
b/kde-apps/lokalize/lokalize-.ebuild
index aae78034f9..dfe06c5411 100644
--- a/kde-apps/lokalize/lokalize-.ebuild
+++ 

[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2019-01-08 Thread Andreas Sturmlechner
commit: 207b3d5930ef1b0de8ace506cc5542f08431faa6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan  9 02:14:37 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  9 02:14:37 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=207b3d59

kde-apps/kajongg: Drop obsolete kde4-l10n blocker

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index a28fcad104..f6afaa24d3 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -31,7 +31,6 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
$(add_kdeapps_dep libkmahjongg)
!kde-apps/kajongg:4
-   !

[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2018-12-03 Thread Andreas Sturmlechner
commit: afa971f62682deffd455c3afa9ac01e48ed56841
Author: Jonathan Callen  gentoo  org>
AuthorDate: Mon Dec  3 01:37:18 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec  3 20:23:56 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=afa971f6

kde-apps/kajongg: add python3_7

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jonathan Callen  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/kajongg/kajongg-18.11.90.ebuild  | 2 +-
 kde-apps/kajongg/kajongg-18.12.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-18.11.90.ebuild 
b/kde-apps/kajongg/kajongg-18.11.90.ebuild
index 208d94a674..fc30aeff89 100644
--- a/kde-apps/kajongg/kajongg-18.11.90.ebuild
+++ b/kde-apps/kajongg/kajongg-18.11.90.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit python-single-r1 kde5
 
 DESCRIPTION="Classical Mah Jongg for four players"

diff --git a/kde-apps/kajongg/kajongg-18.12.49..ebuild 
b/kde-apps/kajongg/kajongg-18.12.49..ebuild
index 6de52d7102..570ebdebb6 100644
--- a/kde-apps/kajongg/kajongg-18.12.49..ebuild
+++ b/kde-apps/kajongg/kajongg-18.12.49..ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit python-single-r1 kde5
 
 DESCRIPTION="Classical Mah Jongg for four players"

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 4965fae668..02d04b1c37 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit python-single-r1 kde5
 
 DESCRIPTION="Classical Mah Jongg for four players"



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2017-05-06 Thread Andreas Sturmlechner
commit: aa4cfbf3a8fc60585737cc1f45f594106aea0872
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  6 22:26:00 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  6 22:26:00 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=aa4cfbf3

kde-apps/kajongg: Fix dosym to relative first argument

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-apps/kajongg/kajongg-17.04.49..ebuild | 4 ++--
 kde-apps/kajongg/kajongg-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-17.04.49..ebuild 
b/kde-apps/kajongg/kajongg-17.04.49..ebuild
index 42fbb78d56..5cbe8b3e70 100644
--- a/kde-apps/kajongg/kajongg-17.04.49..ebuild
+++ b/kde-apps/kajongg/kajongg-17.04.49..ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 
 src_install() {
kde5_src_install
-   dosym /usr/share/kajongg/kajongg.py /usr/bin/kajongg
-   dosym /usr/share/kajongg/kajonggserver.py /usr/bin/kajonggserver
+   dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
+   dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
fperms a+x /usr/share/kajongg/kajongg{,server}.py
 }

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 42fbb78d56..5cbe8b3e70 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 
 src_install() {
kde5_src_install
-   dosym /usr/share/kajongg/kajongg.py /usr/bin/kajongg
-   dosym /usr/share/kajongg/kajonggserver.py /usr/bin/kajonggserver
+   dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
+   dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
fperms a+x /usr/share/kajongg/kajongg{,server}.py
 }



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/files/, kde-apps/kajongg/

2017-04-08 Thread Andreas Sturmlechner
commit: e779b4fb6ba3edce651de732865a874bf9cca158
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  8 19:36:31 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  8 19:37:44 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e779b4fb

kde-apps/kajongg: Add missing DEPEND, block 
+Date:   Sat Apr 8 21:17:03 2017 +0200
+
+Add missing KF5I18n dependency
+
+Release tarball expects it for ki18n_install.
+
+REVIEW: 130071
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c25a94ff..bca3692d 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -9,13 +9,13 @@ set(KF5_MIN_VERSION "5.15.0")
+ set(TWISTED_MIN_VERSION "16.6.0")
+ 
+ find_package(ECM 1.2.0 REQUIRED NO_MODULE)
+-
++
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules 
${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+ 
+ find_package(PythonInterp ${PYTHON_MIN_VERSION} REQUIRED)
+ find_package(Twisted ${TWISTED_MIN_VERSION} REQUIRED)
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Svg 
Widgets)
+-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools)
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools I18n)
+ 
+ include(FeatureSummary)
+ include(ECMPackageConfigHelpers)

diff --git a/kde-apps/kajongg/kajongg-17.03.90.ebuild 
b/kde-apps/kajongg/kajongg-17.03.90.ebuild
index 45b15136e2..56492bd2ea 100644
--- a/kde-apps/kajongg/kajongg-17.03.90.ebuild
+++ b/kde-apps/kajongg/kajongg-17.03.90.ebuild
@@ -18,6 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
$(add_frameworks_dep extra-cmake-modules)
$(add_frameworks_dep kconfig)
+   $(add_frameworks_dep ki18n)
$(add_kdeapps_dep libkdegames)
$(add_qt_dep qtcore)
$(add_qt_dep qtgui)
@@ -30,8 +31,11 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
$(add_kdeapps_dep libkmahjongg)
!kde-apps/kajongg:4
+   !

[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2017-03-30 Thread Andreas Sturmlechner
commit: dd9a822ad013ace169c6f1f6cb45aff7fa6370f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 30 22:52:51 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 30 22:52:51 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dd9a822a

kde-apps/kajongg: Add python3_6, improve description

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kajongg/kajongg-17.03.80-r1.ebuild   | 4 ++--
 kde-apps/kajongg/kajongg-17.04.49..ebuild | 4 ++--
 kde-apps/kajongg/kajongg-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild 
b/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild
index 44931ebc78..45b15136e2 100644
--- a/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild
+++ b/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild
@@ -5,10 +5,10 @@ EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_5 )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit python-single-r1 kde5
 
-DESCRIPTION="The classical Mah Jongg for four players"
+DESCRIPTION="Classical Mah Jongg for four players"
 HOMEPAGE="https://www.kde.org/applications/games/kajongg/;
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

diff --git a/kde-apps/kajongg/kajongg-17.04.49..ebuild 
b/kde-apps/kajongg/kajongg-17.04.49..ebuild
index 7f9bda17a4..af2f3e6838 100644
--- a/kde-apps/kajongg/kajongg-17.04.49..ebuild
+++ b/kde-apps/kajongg/kajongg-17.04.49..ebuild
@@ -5,10 +5,10 @@ EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_5 )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit python-single-r1 kde5
 
-DESCRIPTION="The classical Mah Jongg for four players"
+DESCRIPTION="Classical Mah Jongg for four players"
 HOMEPAGE="https://www.kde.org/applications/games/kajongg/;
 KEYWORDS=""
 IUSE=""

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 7f9bda17a4..af2f3e6838 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -5,10 +5,10 @@ EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_5 )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit python-single-r1 kde5
 
-DESCRIPTION="The classical Mah Jongg for four players"
+DESCRIPTION="Classical Mah Jongg for four players"
 HOMEPAGE="https://www.kde.org/applications/games/kajongg/;
 KEYWORDS=""
 IUSE=""



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2017-03-30 Thread Andreas Sturmlechner
commit: 02d9c00d389133369f432762d381bc2130476f55
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 30 09:35:06 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 30 09:35:16 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=02d9c00d

kde-apps/kajongg: Remove sed leftovers

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kajongg/kajongg-17.03.80-r1.ebuild   | 1 -
 kde-apps/kajongg/kajongg-17.04.49..ebuild | 1 -
 kde-apps/kajongg/kajongg-.ebuild  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild 
b/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild
index 170aa14d28..44931ebc78 100644
--- a/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild
+++ b/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild
@@ -40,7 +40,6 @@ pkg_setup() {
 src_prepare() {
python_fix_shebang src
kde5_src_prepare
-   sed -i -e "/PYTHON_MIN_VERSION/s/\"[0-9.]*\"/\"3.4.0\"/" CMakeLists.txt 
|| die
sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
 }
 

diff --git a/kde-apps/kajongg/kajongg-17.04.49..ebuild 
b/kde-apps/kajongg/kajongg-17.04.49..ebuild
index d9b7a00eba..7f9bda17a4 100644
--- a/kde-apps/kajongg/kajongg-17.04.49..ebuild
+++ b/kde-apps/kajongg/kajongg-17.04.49..ebuild
@@ -40,7 +40,6 @@ pkg_setup() {
 src_prepare() {
python_fix_shebang src
kde5_src_prepare
-   sed -i -e "/PYTHON_MIN_VERSION/s/\"[0-9.]*\"/\"3.4.0\"/" CMakeLists.txt 
|| die
sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
 }
 

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index d9b7a00eba..7f9bda17a4 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -40,7 +40,6 @@ pkg_setup() {
 src_prepare() {
python_fix_shebang src
kde5_src_prepare
-   sed -i -e "/PYTHON_MIN_VERSION/s/\"[0-9.]*\"/\"3.4.0\"/" CMakeLists.txt 
|| die
sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
 }
 



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2017-03-30 Thread Andreas Sturmlechner
commit: 13c660f4bfac270ad63b25bcedfb6ff2f76835e1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 15 22:56:20 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 30 06:41:10 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=13c660f4

kde-apps/kajongg: Ported to PyQt5

Package-Manager: portage-2.3.0

 kde-apps/kajongg/kajongg-17.03.80-r1.ebuild   | 52 +++
 kde-apps/kajongg/kajongg-17.03.80.ebuild  | 35 --
 kde-apps/kajongg/kajongg-17.04.49..ebuild | 33 -
 kde-apps/kajongg/kajongg-.ebuild  | 33 -
 4 files changed, 102 insertions(+), 51 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild 
b/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild
new file mode 100644
index 00..170aa14d28
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-17.03.80-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_5 )
+inherit python-single-r1 kde5
+
+DESCRIPTION="The classical Mah Jongg for four players"
+HOMEPAGE="https://www.kde.org/applications/games/kajongg/;
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep extra-cmake-modules)
+   $(add_frameworks_dep kconfig)
+   $(add_kdeapps_dep libkdegames)
+   $(add_qt_dep qtcore)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   dev-db/sqlite:3
+   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+   >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+   $(add_kdeapps_dep libkmahjongg)
+   !kde-apps/kajongg:4
+"
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   kde5_pkg_setup
+}
+
+src_prepare() {
+   python_fix_shebang src
+   kde5_src_prepare
+   sed -i -e "/PYTHON_MIN_VERSION/s/\"[0-9.]*\"/\"3.4.0\"/" CMakeLists.txt 
|| die
+   sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
+}
+
+src_install() {
+   kde5_src_install
+   dosym /usr/share/kajongg/kajongg.py /usr/bin/kajongg
+   dosym /usr/share/kajongg/kajonggserver.py /usr/bin/kajonggserver
+   fperms a+x /usr/share/kajongg/kajongg{,server}.py
+}

diff --git a/kde-apps/kajongg/kajongg-17.03.80.ebuild 
b/kde-apps/kajongg/kajongg-17.03.80.ebuild
deleted file mode 100644
index cb06e50129..00
--- a/kde-apps/kajongg/kajongg-17.03.80.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 kde4-base
-
-DESCRIPTION="The classical Mah Jongg for four players"
-HOMEPAGE="https://www.kde.org/applications/games/kajongg/;
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_kdeapps_dep libkdegames)
-   $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
-   dev-db/sqlite:3
-"
-RDEPEND="${DEPEND}
-   $(add_kdeapps_dep libkmahjongg)
-   >=dev-python/twisted-core-8.2.0
-"
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   kde4-base_pkg_setup
-}
-
-src_prepare() {
-   python_fix_shebang src
-   kde4-base_src_prepare
-}

diff --git a/kde-apps/kajongg/kajongg-17.04.49..ebuild 
b/kde-apps/kajongg/kajongg-17.04.49..ebuild
index 3e869778ce..d9b7a00eba 100644
--- a/kde-apps/kajongg/kajongg-17.04.49..ebuild
+++ b/kde-apps/kajongg/kajongg-17.04.49..ebuild
@@ -3,33 +3,50 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 kde4-base
+KDE_AUTODEPS="false"
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_5 )
+inherit python-single-r1 kde5
 
 DESCRIPTION="The classical Mah Jongg for four players"
 HOMEPAGE="https://www.kde.org/applications/games/kajongg/;
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep extra-cmake-modules)
+   $(add_frameworks_dep kconfig)
$(add_kdeapps_dep libkdegames)
-   $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
+   $(add_qt_dep qtcore)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
dev-db/sqlite:3
+   dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+   >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}
$(add_kdeapps_dep libkmahjongg)
-   >=dev-python/twisted-core-8.2.0
+   !kde-apps/kajongg:4
 "
 
 pkg_setup() {
python-single-r1_pkg_setup
-   kde4-base_pkg_setup
+   kde5_pkg_setup
 }
 
 src_prepare() {
python_fix_shebang src
-   kde4-base_src_prepare
+   kde5_src_prepare
+   sed 

[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2016-12-23 Thread Johannes Huber
commit: 5aee93f69dbf1a2a3ea6990947f96061c97b4029
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Dec 23 20:11:12 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Dec 23 20:11:12 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5aee93f6

kde-apps/kajongg: Update DEPEND

Due to package move.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kajongg/kajongg-16.12.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-16.12.49..ebuild 
b/kde-apps/kajongg/kajongg-16.12.49..ebuild
index 723c6aa..3faf132 100644
--- a/kde-apps/kajongg/kajongg-16.12.49..ebuild
+++ b/kde-apps/kajongg/kajongg-16.12.49..ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
$(add_kdeapps_dep libkdegames)
-   $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+   $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
dev-db/sqlite:3
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 723c6aa..3faf132 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
$(add_kdeapps_dep libkdegames)
-   $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+   $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}")
dev-db/sqlite:3
 "
 RDEPEND="${DEPEND}



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2016-04-02 Thread Johannes Huber
commit: 704f95497658ffd714725fdf49a4b7780abd4919
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr  2 22:11:23 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Apr  2 22:11:23 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=704f9549

kde-apps/kajongg: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/kajongg/kajongg-16.04.49..ebuild | 2 +-
 kde-apps/kajongg/kajongg-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kajongg/kajongg-16.04.49..ebuild 
b/kde-apps/kajongg/kajongg-16.04.49..ebuild
index 03004f1..723c6aa 100644
--- a/kde-apps/kajongg/kajongg-16.04.49..ebuild
+++ b/kde-apps/kajongg/kajongg-16.04.49..ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 PYTHON_COMPAT=( python2_7 )

diff --git a/kde-apps/kajongg/kajongg-.ebuild 
b/kde-apps/kajongg/kajongg-.ebuild
index 03004f1..723c6aa 100644
--- a/kde-apps/kajongg/kajongg-.ebuild
+++ b/kde-apps/kajongg/kajongg-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 PYTHON_COMPAT=( python2_7 )



[gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/

2015-04-18 Thread Manuel Rüger
commit: 9220bc5adf8ff4bbe041258218ef15c3bb58be62
Author: Manuel Rüger manuel AT rueg DOT eu
AuthorDate: Sat Apr 18 13:11:33 2015 +
Commit: Manuel Rüger mrueg AT gentoo DOT org
CommitDate: Sat Apr 18 13:11:33 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9220bc5a

[kde-apps/kajongg] Relax dep on kde-apps/libkmahjongg:4

Package-Manager: portage-2.2.18

 kde-apps/kajongg/kajongg-15.04.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kajongg/kajongg-15.04.0.ebuild 
b/kde-apps/kajongg/kajongg-15.04.0.ebuild
index 4b0d2f5..2438e21 100644
--- a/kde-apps/kajongg/kajongg-15.04.0.ebuild
+++ b/kde-apps/kajongg/kajongg-15.04.0.ebuild
@@ -22,7 +22,7 @@ DEPEND=
$(add_kdebase_dep pykde4 ${PYTHON_USEDEP})
 
 RDEPEND=${DEPEND}
-   $(add_kdeapps_dep libkmahjongg)
+   $(add_kdeapps_dep libkmahjongg '' '14.12.3')
=dev-python/twisted-core-8.2.0