| 1 |
commit: 0f0b2c8b7c4d48faa49167d3f227ce3a63ac18d3 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 12 14:11:47 2017 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 12 14:21:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0b2c8b |
| 7 |
|
| 8 |
app-i18n/tomoe-gtk: fix build with USE=python |
| 9 |
|
| 10 |
Gentoo-Bug: 567632 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 13 |
|
| 14 |
app-i18n/tomoe-gtk/metadata.xml | 16 ++++++------ |
| 15 |
app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild | 38 ++++++++-------------------- |
| 16 |
2 files changed, 18 insertions(+), 36 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-i18n/tomoe-gtk/metadata.xml b/app-i18n/tomoe-gtk/metadata.xml |
| 19 |
index bb5bed5adfa..b26c59a53cf 100644 |
| 20 |
--- a/app-i18n/tomoe-gtk/metadata.xml |
| 21 |
+++ b/app-i18n/tomoe-gtk/metadata.xml |
| 22 |
@@ -1,12 +1,12 @@ |
| 23 |
<?xml version="1.0" encoding="UTF-8"?> |
| 24 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 25 |
<pkgmetadata> |
| 26 |
- <maintainer type="project"> |
| 27 |
- <email>cjk@g.o</email> |
| 28 |
- <name>Cjk</name> |
| 29 |
- </maintainer> |
| 30 |
- <upstream> |
| 31 |
- <remote-id type="sourceforge">tomoe</remote-id> |
| 32 |
- <remote-id type="sourceforge-jp">tomoe</remote-id> |
| 33 |
- </upstream> |
| 34 |
+ <maintainer type="project"> |
| 35 |
+ <email>cjk@g.o</email> |
| 36 |
+ <name>Cjk</name> |
| 37 |
+ </maintainer> |
| 38 |
+ <upstream> |
| 39 |
+ <remote-id type="sourceforge">tomoe</remote-id> |
| 40 |
+ <remote-id type="sourceforge-jp">tomoe</remote-id> |
| 41 |
+ </upstream> |
| 42 |
</pkgmetadata> |
| 43 |
|
| 44 |
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild |
| 45 |
index 6bb529d3d14..91da3cffbfd 100644 |
| 46 |
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild |
| 47 |
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild |
| 48 |
@@ -1,59 +1,41 @@ |
| 49 |
-# Copyright 1999-2016 Gentoo Foundation |
| 50 |
+# Copyright 1999-2017 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
|
| 53 |
-EAPI=6 |
| 54 |
+EAPI="6" |
| 55 |
PYTHON_COMPAT=( python2_7 ) |
| 56 |
|
| 57 |
inherit python-single-r1 |
| 58 |
|
| 59 |
-MY_P="tomoe-gtk-${PV}" |
| 60 |
DESCRIPTION="Tomoe GTK+ interface widget library" |
| 61 |
HOMEPAGE="http://tomoe.sourceforge.jp/" |
| 62 |
-SRC_URI="mirror://sourceforge/tomoe/${MY_P}.tar.gz" |
| 63 |
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz" |
| 64 |
|
| 65 |
LICENSE="LGPL-2.1" |
| 66 |
SLOT="0" |
| 67 |
KEYWORDS="amd64 ~x86" |
| 68 |
- |
| 69 |
IUSE="python static-libs" |
| 70 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 71 |
|
| 72 |
-RDEPEND=" |
| 73 |
- >=app-i18n/tomoe-0.6.0 |
| 74 |
+RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_USEDEP}] |
| 75 |
python? ( |
| 76 |
${PYTHON_DEPS} |
| 77 |
- >=app-i18n/tomoe-0.6.0[python,${PYTHON_USEDEP}] |
| 78 |
- dev-python/pygtk:2[${PYTHON_USEDEP}] |
| 79 |
dev-python/pygobject:2[${PYTHON_USEDEP}] |
| 80 |
- ) |
| 81 |
-" |
| 82 |
+ dev-python/pygtk:2[${PYTHON_USEDEP}] |
| 83 |
+ )" |
| 84 |
DEPEND="${RDEPEND} |
| 85 |
dev-util/gtk-doc-am |
| 86 |
- virtual/pkgconfig |
| 87 |
sys-devel/gettext |
| 88 |
-" |
| 89 |
- |
| 90 |
-S="${WORKDIR}/${MY_P}" |
| 91 |
+ virtual/pkgconfig" |
| 92 |
|
| 93 |
pkg_setup() { |
| 94 |
- if use python ; then |
| 95 |
- python-single-r1_pkg_setup |
| 96 |
- fi |
| 97 |
+ use python && python-single-r1_pkg_setup |
| 98 |
} |
| 99 |
|
| 100 |
src_configure() { |
| 101 |
- local myconf |
| 102 |
- #--with-python b0rked hard |
| 103 |
- unset PYTHON |
| 104 |
- use python || myconf="${myconf} --without-python" |
| 105 |
- |
| 106 |
- # Rely on precompiled gtk-doc files, |
| 107 |
- # https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#gtk-doc |
| 108 |
econf \ |
| 109 |
- --disable-gtk-doc \ |
| 110 |
- --without-gucharmap \ |
| 111 |
$(use_enable static-libs static) \ |
| 112 |
- ${myconf} |
| 113 |
+ $(use_with python python "") \ |
| 114 |
+ --without-gucharmap |
| 115 |
} |
| 116 |
|
| 117 |
src_install() { |
Archives