From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/
Date: Thu, 30 Mar 2017 06:41:30 +0000 (UTC) [thread overview]
Message-ID: <1490856070.13c660f4bfac270ad63b25bcedfb6ff2f76835e1.asturm@gentoo> (raw)
commit: 13c660f4bfac270ad63b25bcedfb6ff2f76835e1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 22:56:20 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 06:41:10 2017 +0000
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.9999.ebuild | 33 ++++++++++++-----
kde-apps/kajongg/kajongg-9999.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 0000000000..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..0000000000
--- 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.9999.ebuild b/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild
index 3e869778ce..d9b7a00eba 100644
--- a/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild
+++ b/kde-apps/kajongg/kajongg-17.04.49.9999.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 -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-9999.ebuild b/kde-apps/kajongg/kajongg-9999.ebuild
index 3e869778ce..d9b7a00eba 100644
--- a/kde-apps/kajongg/kajongg-9999.ebuild
+++ b/kde-apps/kajongg/kajongg-9999.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 -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
}
next reply other threads:[~2017-03-30 6:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 6:41 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-11 6:52 [gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/ Andreas Sturmlechner
2024-09-11 6:52 Andreas Sturmlechner
2024-02-23 6:26 Sam James
2024-02-23 4:49 Sam James
2023-12-18 22:14 Andreas Sturmlechner
2023-02-25 8:35 Andreas Sturmlechner
2022-07-03 23:06 Andreas Sturmlechner
2021-08-25 9:00 Andreas Sturmlechner
2021-07-22 20:00 Andreas Sturmlechner
2020-10-11 21:33 Andreas Sturmlechner
2020-04-10 19:53 Andreas Sturmlechner
2020-03-26 13:49 Andreas Sturmlechner
2020-02-09 18:06 Andreas Sturmlechner
2019-10-16 13:21 Andreas Sturmlechner
2019-01-09 2:15 Andreas Sturmlechner
2018-12-03 20:24 Andreas Sturmlechner
2017-05-06 22:26 Andreas Sturmlechner
2017-03-30 22:53 Andreas Sturmlechner
2017-03-30 9:35 Andreas Sturmlechner
2016-12-23 20:11 Johannes Huber
2016-04-02 22:15 Johannes Huber
2015-04-18 13:11 Manuel Rüger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1490856070.13c660f4bfac270ad63b25bcedfb6ff2f76835e1.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox