| 1 |
commit: 5daefd4f3809ca1528ac6a38ee537adccc6fde19 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 31 12:58:21 2021 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 31 13:01:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5daefd4f |
| 7 |
|
| 8 |
app-i18n/imsettings: drop gtk2 USE flag |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/769089 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
| 13 |
|
| 14 |
app-i18n/imsettings/imsettings-1.7.2.ebuild | 13 +++++-------- |
| 15 |
app-i18n/imsettings/metadata.xml | 25 +++++++++++-------------- |
| 16 |
2 files changed, 16 insertions(+), 22 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild |
| 19 |
index 96fd60a9e3c..0ad03979e2a 100644 |
| 20 |
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild |
| 21 |
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
# Copyright 1999-2021 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=7 |
| 27 |
+EAPI="7" |
| 28 |
|
| 29 |
inherit autotools |
| 30 |
|
| 31 |
@@ -12,23 +12,21 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2" |
| 32 |
LICENSE="LGPL-2.1" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="amd64 ~x86" |
| 35 |
-IUSE="gconf gtk2 qt5 +introspection xfconf" |
| 36 |
+IUSE="gconf qt5 +introspection xfconf" |
| 37 |
RESTRICT="test" |
| 38 |
|
| 39 |
RDEPEND="dev-libs/glib:2 |
| 40 |
sys-apps/dbus |
| 41 |
virtual/libintl |
| 42 |
+ x11-libs/gtk+:3 |
| 43 |
x11-libs/libX11 |
| 44 |
x11-libs/libgxim |
| 45 |
x11-libs/libnotify |
| 46 |
gconf? ( gnome-base/gconf ) |
| 47 |
- gtk2? ( x11-libs/gtk+:2 ) |
| 48 |
- !gtk2? ( x11-libs/gtk+:3 ) |
| 49 |
introspection? ( dev-libs/gobject-introspection ) |
| 50 |
xfconf? ( xfce-base/xfconf )" |
| 51 |
DEPEND="${RDEPEND}" |
| 52 |
-BDEPEND=" |
| 53 |
- dev-util/glib-utils |
| 54 |
+BDEPEND="dev-util/glib-utils |
| 55 |
dev-util/intltool |
| 56 |
sys-devel/autoconf-archive |
| 57 |
sys-devel/gettext |
| 58 |
@@ -41,8 +39,7 @@ MY_XINPUTSH="90-xinput" |
| 59 |
src_prepare() { |
| 60 |
sed -i \ |
| 61 |
-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \ |
| 62 |
- -e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/$(usex gtk2 '\1' _)/" \ |
| 63 |
- -e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \ |
| 64 |
+ -e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \ |
| 65 |
-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \ |
| 66 |
-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \ |
| 67 |
-e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \ |
| 68 |
|
| 69 |
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml |
| 70 |
index 8120f5ba616..25862f59a7e 100644 |
| 71 |
--- a/app-i18n/imsettings/metadata.xml |
| 72 |
+++ b/app-i18n/imsettings/metadata.xml |
| 73 |
@@ -1,18 +1,15 @@ |
| 74 |
<?xml version="1.0" encoding="UTF-8"?> |
| 75 |
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 76 |
<pkgmetadata> |
| 77 |
- <maintainer type="project"> |
| 78 |
- <email>cjk@g.o</email> |
| 79 |
- <name>Cjk</name> |
| 80 |
- </maintainer> |
| 81 |
- <use> |
| 82 |
- <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> |
| 83 |
- <flag name="gtk2"> |
| 84 |
- Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3 |
| 85 |
- </flag> |
| 86 |
- <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag> |
| 87 |
- </use> |
| 88 |
- <upstream> |
| 89 |
- <remote-id type="bitbucket">tagoh/imsettings</remote-id> |
| 90 |
- </upstream> |
| 91 |
+ <maintainer type="project"> |
| 92 |
+ <email>cjk@g.o</email> |
| 93 |
+ <name>Cjk</name> |
| 94 |
+ </maintainer> |
| 95 |
+ <use> |
| 96 |
+ <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> |
| 97 |
+ <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag> |
| 98 |
+ </use> |
| 99 |
+ <upstream> |
| 100 |
+ <remote-id type="bitbucket">tagoh/imsettings</remote-id> |
| 101 |
+ </upstream> |
| 102 |
</pkgmetadata> |
Archives