commit: 51bee5a21ca587c831c94b63ca64c193ec529850
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 2 10:54:31 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 2 10:54:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51bee5a2
app-i18n/ibus-unikey: Fix depend on app-i18n/ibus
This commit fixes the breakage caused by commit
fab5df2eef030ab7d815a82592a727fc78390710
which removed the dedicated gtk3 USE flag.
With this commit, ibus-unikey now depends on app-i18n/ibus[gtk] when gtk3 USE
flag
was set and app-i18n/ibus[gtk2] when not (due to required_use in app-i18n/ibus
you
will be required to emerge app-i18n/ibus with gtk USE flag anyway but this is
something which should be addressed by package maintainer).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
...0.6.1-r1.ebuild => ibus-unikey-0.6.1-r2.ebuild} | 6 ++---
app-i18n/ibus-unikey/ibus-unikey-0.6.1.ebuild | 29 ----------------------
2 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r1.ebuild
b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
similarity index 85%
rename from app-i18n/ibus-unikey/ibus-unikey-0.6.1-r1.ebuild
rename to app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
index 717d3e93620..5883a554f0f 100644
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r1.ebuild
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,9 +14,9 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gtk3"
-RDEPEND="gtk3? ( >app-i18n/ibus-1.4.0[gtk3]
+RDEPEND="gtk3? ( >app-i18n/ibus-1.4.0[gtk]
x11-libs/gtk+:3 )
- !gtk3? ( >=app-i18n/ibus-1.4.0
+ !gtk3? ( >=app-i18n/ibus-1.4.0[gtk2]
>=x11-libs/gtk+-2.12:2 )
x11-libs/libX11"
DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1.ebuild
b/app-i18n/ibus-unikey/ibus-unikey-0.6.1.ebuild
deleted file mode 100644
index 64a0c43c0e8..00000000000
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME"
-HOMEPAGE="https://code.google.com/p/ibus-unikey/";
-SRC_URI="https://ibus-unikey.googlecode.com/files/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk3"
-
-RDEPEND="gtk3? ( >app-i18n/ibus-1.4.0[gtk3]
- x11-libs/gtk+:3 )
- !gtk3? ( >=app-i18n/ibus-1.4.0
- >=x11-libs/gtk+-2.12:2 )
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dev-util/intltool
- >=sys-devel/gettext-0.17"
-
-src_configure() {
- use gtk3 && myconf="--with-gtk-version=3" || myconf=""
- econf ${myconf}
-}
