commit: 5daefd4f3809ca1528ac6a38ee537adccc6fde19 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Sun Oct 31 12:58:21 2021 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Sun Oct 31 13:01:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5daefd4f
app-i18n/imsettings: drop gtk2 USE flag Closes: https://bugs.gentoo.org/769089 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> app-i18n/imsettings/imsettings-1.7.2.ebuild | 13 +++++-------- app-i18n/imsettings/metadata.xml | 25 +++++++++++-------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild index 96fd60a9e3c..0ad03979e2a 100644 --- a/app-i18n/imsettings/imsettings-1.7.2.ebuild +++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit autotools @@ -12,23 +12,21 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"; LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="gconf gtk2 qt5 +introspection xfconf" +IUSE="gconf qt5 +introspection xfconf" RESTRICT="test" RDEPEND="dev-libs/glib:2 sys-apps/dbus virtual/libintl + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )" DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils +BDEPEND="dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext @@ -41,8 +39,7 @@ MY_XINPUTSH="90-xinput" src_prepare() { sed -i \ -e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \ - -e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/$(usex gtk2 '\1' _)/" \ - -e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \ + -e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \ -e "/PKG_CHECK_MODULES/s/\(check\)/_/" \ -e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \ -e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \ diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml index 8120f5ba616..25862f59a7e 100644 --- a/app-i18n/imsettings/metadata.xml +++ b/app-i18n/imsettings/metadata.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>c...@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <use> - <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> - <flag name="gtk2"> - Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3 - </flag> - <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag> - </use> - <upstream> - <remote-id type="bitbucket">tagoh/imsettings</remote-id> - </upstream> + <maintainer type="project"> + <email>c...@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <use> + <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> + <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag> + </use> + <upstream> + <remote-id type="bitbucket">tagoh/imsettings</remote-id> + </upstream> </pkgmetadata>
