| 1 |
commit: 2982529d6c6141e3ebdba3bfb490fcc3fc93df38 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 1 16:44:18 2013 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 1 16:44:18 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2982529d |
| 7 |
|
| 8 |
[kde-base/kate] Migrate to python-single-r1 and add Python 3 support wrt bug #457920. |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.11.52 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kate/kate-4.10.49.9999.ebuild | 17 ++++++++--------- |
| 14 |
kde-base/kate/kate-9999.ebuild | 17 ++++++++--------- |
| 15 |
kde-base/kate/metadata.xml | 3 --- |
| 16 |
3 files changed, 16 insertions(+), 21 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/kate/kate-4.10.49.9999.ebuild b/kde-base/kate/kate-4.10.49.9999.ebuild |
| 19 |
index 4771195..63b035d 100644 |
| 20 |
--- a/kde-base/kate/kate-4.10.49.9999.ebuild |
| 21 |
+++ b/kde-base/kate/kate-4.10.49.9999.ebuild |
| 22 |
@@ -3,36 +3,35 @@ |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
EAPI=5 |
| 26 |
- |
| 27 |
KDE_HANDBOOK="optional" |
| 28 |
KMNAME="kate" |
| 29 |
-PYTHON_DEPEND="pate? 2" |
| 30 |
-inherit python kde4-meta |
| 31 |
+PYTHON_COMPAT=( python{2_7,3_1,3_2} ) |
| 32 |
+ |
| 33 |
+inherit python-single-r1 kde4-meta |
| 34 |
|
| 35 |
DESCRIPTION="Kate is an MDI texteditor." |
| 36 |
KEYWORDS="" |
| 37 |
-IUSE="debug pate +plasma" |
| 38 |
+IUSE="debug +plasma python" |
| 39 |
|
| 40 |
DEPEND=" |
| 41 |
dev-libs/libxml2 |
| 42 |
dev-libs/libxslt |
| 43 |
- pate? ( $(add_kdebase_dep pykde4 '' 4.9.2-r1) ) |
| 44 |
+ python? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" 4.9.2-r1) ) |
| 45 |
" |
| 46 |
RDEPEND="${DEPEND} |
| 47 |
$(add_kdebase_dep katepart) |
| 48 |
" |
| 49 |
|
| 50 |
pkg_setup() { |
| 51 |
- if use pate; then |
| 52 |
- python_set_active_version 2 |
| 53 |
- python_pkg_setup |
| 54 |
+ if use python; then |
| 55 |
+ python-single-r1_pkg_setup |
| 56 |
fi |
| 57 |
kde4-meta_pkg_setup |
| 58 |
} |
| 59 |
|
| 60 |
src_configure() { |
| 61 |
mycmakeargs=( |
| 62 |
- $(cmake-utils_use_build pate) |
| 63 |
+ $(cmake-utils_use_build python pate) |
| 64 |
$(cmake-utils_use_with plasma) |
| 65 |
) |
| 66 |
|
| 67 |
|
| 68 |
diff --git a/kde-base/kate/kate-9999.ebuild b/kde-base/kate/kate-9999.ebuild |
| 69 |
index 4771195..63b035d 100644 |
| 70 |
--- a/kde-base/kate/kate-9999.ebuild |
| 71 |
+++ b/kde-base/kate/kate-9999.ebuild |
| 72 |
@@ -3,36 +3,35 @@ |
| 73 |
# $Header: $ |
| 74 |
|
| 75 |
EAPI=5 |
| 76 |
- |
| 77 |
KDE_HANDBOOK="optional" |
| 78 |
KMNAME="kate" |
| 79 |
-PYTHON_DEPEND="pate? 2" |
| 80 |
-inherit python kde4-meta |
| 81 |
+PYTHON_COMPAT=( python{2_7,3_1,3_2} ) |
| 82 |
+ |
| 83 |
+inherit python-single-r1 kde4-meta |
| 84 |
|
| 85 |
DESCRIPTION="Kate is an MDI texteditor." |
| 86 |
KEYWORDS="" |
| 87 |
-IUSE="debug pate +plasma" |
| 88 |
+IUSE="debug +plasma python" |
| 89 |
|
| 90 |
DEPEND=" |
| 91 |
dev-libs/libxml2 |
| 92 |
dev-libs/libxslt |
| 93 |
- pate? ( $(add_kdebase_dep pykde4 '' 4.9.2-r1) ) |
| 94 |
+ python? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" 4.9.2-r1) ) |
| 95 |
" |
| 96 |
RDEPEND="${DEPEND} |
| 97 |
$(add_kdebase_dep katepart) |
| 98 |
" |
| 99 |
|
| 100 |
pkg_setup() { |
| 101 |
- if use pate; then |
| 102 |
- python_set_active_version 2 |
| 103 |
- python_pkg_setup |
| 104 |
+ if use python; then |
| 105 |
+ python-single-r1_pkg_setup |
| 106 |
fi |
| 107 |
kde4-meta_pkg_setup |
| 108 |
} |
| 109 |
|
| 110 |
src_configure() { |
| 111 |
mycmakeargs=( |
| 112 |
- $(cmake-utils_use_build pate) |
| 113 |
+ $(cmake-utils_use_build python pate) |
| 114 |
$(cmake-utils_use_with plasma) |
| 115 |
) |
| 116 |
|
| 117 |
|
| 118 |
diff --git a/kde-base/kate/metadata.xml b/kde-base/kate/metadata.xml |
| 119 |
index 5f79c0f..a23f444 100644 |
| 120 |
--- a/kde-base/kate/metadata.xml |
| 121 |
+++ b/kde-base/kate/metadata.xml |
| 122 |
@@ -2,7 +2,4 @@ |
| 123 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 124 |
<pkgmetadata> |
| 125 |
<herd>kde</herd> |
| 126 |
- <use> |
| 127 |
- <flag name="pate">Enable tasty Python plugins</flag> |
| 128 |
- </use> |
| 129 |
</pkgmetadata> |
Archives