| 1 |
commit: 6e4df795f84fc1a29621fad200fd193ba447e879 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 1 14:14:58 2017 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 1 14:23:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4df795 |
| 7 |
|
| 8 |
app-i18n/ibus: add libnotify USE flag |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-i18n/ibus/ibus-1.5.12.ebuild | 17 +++++++++++------ |
| 13 |
app-i18n/ibus/ibus-1.5.15.ebuild | 17 +++++++++++------ |
| 14 |
2 files changed, 22 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild |
| 17 |
index 55ba530a056..ebad2ff67aa 100644 |
| 18 |
--- a/app-i18n/ibus/ibus-1.5.12.ebuild |
| 19 |
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild |
| 20 |
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
| 21 |
LICENSE="LGPL-2.1" |
| 22 |
SLOT="0" |
| 23 |
KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
| 24 |
-IUSE="gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" |
| 25 |
-REQUIRED_USE="python? ( |
| 26 |
+IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X" |
| 27 |
+REQUIRED_USE="libnotify? ( gtk ) |
| 28 |
+ python? ( |
| 29 |
${PYTHON_REQUIRED_USE} |
| 30 |
gtk |
| 31 |
introspection |
| 32 |
@@ -28,7 +29,6 @@ CDEPEND="app-text/iso-codes |
| 33 |
gnome-base/dconf |
| 34 |
gnome-base/librsvg:2 |
| 35 |
sys-apps/dbus[X?] |
| 36 |
- x11-libs/libnotify |
| 37 |
gconf? ( gnome-base/gconf:2 ) |
| 38 |
gtk? ( |
| 39 |
x11-libs/gtk+:3 |
| 40 |
@@ -37,6 +37,7 @@ CDEPEND="app-text/iso-codes |
| 41 |
gtk2? ( x11-libs/gtk+:2 ) |
| 42 |
) |
| 43 |
introspection? ( dev-libs/gobject-introspection ) |
| 44 |
+ libnotify? ( x11-libs/libnotify ) |
| 45 |
nls? ( virtual/libintl ) |
| 46 |
python? ( |
| 47 |
${PYTHON_DEPS} |
| 48 |
@@ -60,13 +61,16 @@ RDEPEND="${CDEPEND} |
| 49 |
) |
| 50 |
)" |
| 51 |
DEPEND="${CDEPEND} |
| 52 |
+ $(vala_depend) |
| 53 |
dev-util/intltool |
| 54 |
virtual/pkgconfig |
| 55 |
- nls? ( sys-devel/gettext ) |
| 56 |
- vala? ( $(vala_depend) )" |
| 57 |
+ nls? ( sys-devel/gettext )" |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
- use vala && vala_src_prepare |
| 61 |
+ vala_src_prepare --ignore-use |
| 62 |
+ if ! use libnotify; then |
| 63 |
+ touch ui/gtk3/panel.vala |
| 64 |
+ fi |
| 65 |
# for multiple Python implementations |
| 66 |
sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am |
| 67 |
# fix for parallel install |
| 68 |
@@ -105,6 +109,7 @@ src_configure() { |
| 69 |
$(use_enable gtk ui) \ |
| 70 |
$(use_enable gtk2) \ |
| 71 |
$(use_enable introspection) \ |
| 72 |
+ $(use_enable libnotify) \ |
| 73 |
$(use_enable nls) \ |
| 74 |
$(use_enable test tests) \ |
| 75 |
$(use_enable vala) \ |
| 76 |
|
| 77 |
diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild |
| 78 |
index afed2d1f73d..7dc6dcd6bed 100644 |
| 79 |
--- a/app-i18n/ibus/ibus-1.5.15.ebuild |
| 80 |
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild |
| 81 |
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
| 82 |
LICENSE="LGPL-2.1" |
| 83 |
SLOT="0" |
| 84 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 85 |
-IUSE="gconf +gtk +gtk2 +introspection nls +python test vala wayland +X" |
| 86 |
-REQUIRED_USE="python? ( |
| 87 |
+IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X" |
| 88 |
+REQUIRED_USE="libnotify? ( gtk ) |
| 89 |
+ python? ( |
| 90 |
${PYTHON_REQUIRED_USE} |
| 91 |
gtk |
| 92 |
introspection |
| 93 |
@@ -28,7 +29,6 @@ CDEPEND="app-text/iso-codes |
| 94 |
gnome-base/dconf |
| 95 |
gnome-base/librsvg:2 |
| 96 |
sys-apps/dbus[X?] |
| 97 |
- x11-libs/libnotify |
| 98 |
gconf? ( gnome-base/gconf:2 ) |
| 99 |
gtk? ( |
| 100 |
x11-libs/gtk+:3 |
| 101 |
@@ -37,6 +37,7 @@ CDEPEND="app-text/iso-codes |
| 102 |
gtk2? ( x11-libs/gtk+:2 ) |
| 103 |
) |
| 104 |
introspection? ( dev-libs/gobject-introspection ) |
| 105 |
+ libnotify? ( x11-libs/libnotify ) |
| 106 |
nls? ( virtual/libintl ) |
| 107 |
python? ( |
| 108 |
${PYTHON_DEPS} |
| 109 |
@@ -60,13 +61,16 @@ RDEPEND="${CDEPEND} |
| 110 |
) |
| 111 |
)" |
| 112 |
DEPEND="${CDEPEND} |
| 113 |
+ $(vala_depend) |
| 114 |
dev-util/intltool |
| 115 |
virtual/pkgconfig |
| 116 |
- nls? ( sys-devel/gettext ) |
| 117 |
- vala? ( $(vala_depend) )" |
| 118 |
+ nls? ( sys-devel/gettext )" |
| 119 |
|
| 120 |
src_prepare() { |
| 121 |
- use vala && vala_src_prepare |
| 122 |
+ vala_src_prepare --ignore-use |
| 123 |
+ if ! use libnotify; then |
| 124 |
+ touch ui/gtk3/panel.vala |
| 125 |
+ fi |
| 126 |
# for multiple Python implementations |
| 127 |
sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am |
| 128 |
# fix for parallel install |
| 129 |
@@ -101,6 +105,7 @@ src_configure() { |
| 130 |
$(use_enable gtk ui) \ |
| 131 |
$(use_enable gtk2) \ |
| 132 |
$(use_enable introspection) \ |
| 133 |
+ $(use_enable libnotify) \ |
| 134 |
$(use_enable nls) \ |
| 135 |
$(use_enable test tests) \ |
| 136 |
$(use_enable vala) \ |
Archives