public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2017-07-23 14:04 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2017-07-23 14:04 UTC (permalink / raw
  To: gentoo-commits

commit:     d3620d0162d0783371406756bc90896e9017c1b9
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 14:03:21 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 14:03:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3620d01

app-i18n/imsettings: new upstream release

Gentoo-Bug: 587020

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/imsettings/Manifest                |  1 +
 app-i18n/imsettings/imsettings-1.7.2.ebuild | 71 +++++++++++++++++++++++++++++
 app-i18n/imsettings/metadata.xml            |  7 ++-
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index be2aa02593f..9085198e877 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1 +1,2 @@
 DIST imsettings-1.6.8.tar.bz2 593942 SHA256 2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba SHA512 a15a4824529b16f61653fdf3e149656c7a2ca1384579c755cec6650414499c3d24ac15178971d961f327c5fd8acd7892b9b4f9c60608166c281c11ab3f2b25b0 WHIRLPOOL c39cb54b9be8424dc1d9eceae12f793847585638f29a52282427c3c07ee1bd3e5ed9d67ff73727b055499c3963e106024eb9f164b32ebcf553b2dfccf1114a6d
+DIST imsettings-1.7.2.tar.bz2 595754 SHA256 41addf0458f760212b6b6100835066e16deb3a8a50eb005a0fc17fbac0a2ae66 SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0 WHIRLPOOL 018baea019f67bd19744facd981d5b6154de9ee19fa0565d9d7d11c6de02cfc1e3027424326700078eed979012e51b685abaaac0ae49a773bb9f088197ba6766

diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
new file mode 100644
index 00000000000..bc89ae3d089
--- /dev/null
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools ltprune xdg-utils
+
+DESCRIPTION="Delivery framework for general Input Method configuration"
+HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
+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 static-libs xfconf"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libintl
+	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}
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+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/\(check\)/_/" \
+		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
+		-e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--with-xinputsh=${MY_XINPUTSH}
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EPREFIX}"/etc/X11/xinit/xinputrc ]]; then
+		ln -sf xinput.d/xcompose.conf "${EPREFIX}"/etc/X11/xinit/xinputrc
+	fi
+}

diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 4024cc0e33a..f3d313f59e1 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -6,9 +6,12 @@
     <name>Cjk</name>
   </maintainer>
   <use>
-    <flag name="xfconf">Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
-    <flag name="gconf">Enable GConf support</flag>
+    <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="gtk3">Enable support for <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>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2017-07-23 14:04 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2017-07-23 14:04 UTC (permalink / raw
  To: gentoo-commits

commit:     5cbe02e402fda686a067d56b84ff1f600611e012
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 14:04:27 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 14:04:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cbe02e4

app-i18n/imsettings: drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/imsettings/Manifest                |  1 -
 app-i18n/imsettings/imsettings-1.6.8.ebuild | 75 -----------------------------
 app-i18n/imsettings/metadata.xml            |  1 -
 3 files changed, 77 deletions(-)

diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index 9085198e877..18019fd697e 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1,2 +1 @@
-DIST imsettings-1.6.8.tar.bz2 593942 SHA256 2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba SHA512 a15a4824529b16f61653fdf3e149656c7a2ca1384579c755cec6650414499c3d24ac15178971d961f327c5fd8acd7892b9b4f9c60608166c281c11ab3f2b25b0 WHIRLPOOL c39cb54b9be8424dc1d9eceae12f793847585638f29a52282427c3c07ee1bd3e5ed9d67ff73727b055499c3963e106024eb9f164b32ebcf553b2dfccf1114a6d
 DIST imsettings-1.7.2.tar.bz2 595754 SHA256 41addf0458f760212b6b6100835066e16deb3a8a50eb005a0fc17fbac0a2ae66 SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0 WHIRLPOOL 018baea019f67bd19744facd981d5b6154de9ee19fa0565d9d7d11c6de02cfc1e3027424326700078eed979012e51b685abaaac0ae49a773bb9f088197ba6766

diff --git a/app-i18n/imsettings/imsettings-1.6.8.ebuild b/app-i18n/imsettings/imsettings-1.6.8.ebuild
deleted file mode 100644
index f2609576b33..00000000000
--- a/app-i18n/imsettings/imsettings-1.6.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="https://tagoh.bitbucket.org/imsettings/"
-SRC_URI="https://bitbucket.org/tagoh/imsettings/downloads/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gconf gtk3 qt4 static-libs xfconf"
-
-# X11 connections are required for test.
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/check-0.9.4
-	>=dev-libs/glib-2.32
-	sys-apps/dbus
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libgxim-0.5.0
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	gconf? ( gnome-base/gconf )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt4? ( dev-qt/qtcore:4 )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	doc? ( dev-util/gtk-doc )"
-
-MY_XINPUTSH="90-xinput"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	# Prevent automagic linking to libxfconf-0.
-	if ! use gconf; then
-		sed -i -e 's:gconf-2.0:dIsAbLe&:' configure || die
-	fi
-	if ! use gtk3; then
-		sed -i -e 's:gtk+-3.0:dIsAbLe&:' configure || die
-	fi
-	if ! use qt4; then
-		sed -i -e 's:use_qt="yes":use_qt="no":' configure || die
-	fi
-	if ! use xfconf; then
-		sed -i -e 's:libxfconf-0:dIsAbLe&:' configure || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-xinputsh="${MY_XINPUTSH}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-
-	fperms 0755 /usr/libexec/xinputinfo.sh
-	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}"
-}
-
-pkg_postinst() {
-	if [ ! -e "${EPREFIX}/etc/X11/xinit/xinputrc" ] ; then
-		ln -sf xinput.d/xcompose.conf "${EPREFIX}/etc/X11/xinit/xinputrc"
-	fi
-}

diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index f3d313f59e1..094115428fb 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -10,7 +10,6 @@
     <flag name="gtk2">
       Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
      </flag>
-    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
     <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag>
   </use>
   <upstream>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2018-10-16  6:40 Naohiro Aota
  0 siblings, 0 replies; 9+ messages in thread
From: Naohiro Aota @ 2018-10-16  6:40 UTC (permalink / raw
  To: gentoo-commits

commit:     66bffa8b3db45b3430f9de7243f4aa3894094318
Author:     Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 06:39:15 2018 +0000
Commit:     Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 06:39:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66bffa8b

app-i18n/imsettings: add missing dependency

add missing dependency: dev-util/glib-utils. Also, use find instead of
ltrpune.

Closes: https://bugs.gentoo.org/668378
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-i18n/imsettings/imsettings-1.7.2.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
index bc89ae3d089..5fce6e8f9e6 100644
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools ltprune xdg-utils
+inherit autotools xdg-utils
 
 DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
@@ -27,6 +27,7 @@ RDEPEND="dev-libs/glib:2
 	introspection? ( dev-libs/gobject-introspection )
 	xfconf? ( xfce-base/xfconf )"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/autoconf-archive
 	sys-devel/gettext
@@ -59,7 +60,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 
 	fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
 }


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2019-06-05  6:48 Agostino Sarubbo
  0 siblings, 0 replies; 9+ messages in thread
From: Agostino Sarubbo @ 2019-06-05  6:48 UTC (permalink / raw
  To: gentoo-commits

commit:     735bc274fac0c6e217010e16fb6a3af10d37bac5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 06:47:23 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 06:47:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735bc274

app-i18n/imsettings: amd64 stable wrt bug #684954

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-i18n/imsettings/imsettings-1.7.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
index 5fce6e8f9e6..f2f473de2fa 100644
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gconf gtk2 qt5 +introspection static-libs xfconf"
 RESTRICT="test"
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2021-10-31 13:02 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2021-10-31 13:02 UTC (permalink / raw
  To: gentoo-commits

commit:     bd59e303a275c915bf174f22ad86f491a01f7fec
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 13:01:00 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 13:01:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd59e303

app-i18n/imsettings: new upstream release

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/imsettings/Manifest                |  1 +
 app-i18n/imsettings/imsettings-1.8.2.ebuild | 70 +++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index 97bc272eeb7..03b0826442c 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1 +1,2 @@
 DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0
+DIST imsettings-1.8.2.tar.bz2 705391 BLAKE2B 3b7f3e2ca2c08bc149be95fb97889ab58fc22be828b9801f4c342c1514a7be35644548d6a920fe657e1d85a9d35d8c2a40766f25d6420bb3da8a8f4e7a7ba739 SHA512 600315a20fd61eaa77a0add1e587861ad3ce70175d87639e43105d804cec59bfbc0219f2177c4d9e07d337231eb85514cbfd8af614a113b688ead372075b9ff4

diff --git a/app-i18n/imsettings/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2.ebuild
new file mode 100644
index 00000000000..a3af54bc07c
--- /dev/null
+++ b/app-i18n/imsettings/imsettings-1.8.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="Delivery framework for general Input Method configuration"
+HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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 )
+	introspection? ( dev-libs/gobject-introspection )
+	xfconf? ( xfce-base/xfconf )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
+
+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\)/_/" \
+		-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)\"/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-xinputsh=${MY_XINPUTSH}
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EPREFIX}"/etc/X11/xinit/xinputrc ]]; then
+		ln -sf xinput.d/xcompose.conf "${EPREFIX}"/etc/X11/xinit/xinputrc
+	fi
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2021-10-31 13:02 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2021-10-31 13:02 UTC (permalink / raw
  To: gentoo-commits

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>cjk@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>cjk@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>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2021-10-31 13:11 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2021-10-31 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ebc5daadfe16c54541495030bc85312ff3de6e52
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 13:10:32 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 13:10:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc5daad

app-i18n/imsettings: update LICENSE

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 | 2 +-
 app-i18n/imsettings/imsettings-1.8.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
index 0ad03979e2a..65c929f28aa 100644
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
 SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="gconf qt5 +introspection xfconf"

diff --git a/app-i18n/imsettings/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2.ebuild
index a3af54bc07c..6b4b324e653 100644
--- a/app-i18n/imsettings/imsettings-1.8.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.8.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
 SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gconf qt5 +introspection xfconf"


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2021-10-31 13:11 Akinori Hattori
  0 siblings, 0 replies; 9+ messages in thread
From: Akinori Hattori @ 2021-10-31 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     07c9d46c95085e217fc28febf26cf1f210455a95
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 13:11:19 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 13:11:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c9d46c

app-i18n/imsettings: update to EAPI 8

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 | 2 +-
 app-i18n/imsettings/imsettings-1.8.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
index 65c929f28aa..bd16d48dc80 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="8"
 
 inherit autotools
 

diff --git a/app-i18n/imsettings/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2.ebuild
index 6b4b324e653..6478f417a85 100644
--- a/app-i18n/imsettings/imsettings-1.8.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.8.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="8"
 
 inherit autotools
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/
@ 2022-12-02  2:48 Matt Turner
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Turner @ 2022-12-02  2:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9ebdee63336b59445214386fa5111b9126d52158
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 02:40:46 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 02:40:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ebdee63

app-i18n/imsettings: Drop dependency on gnome-base/gconf

Closes: https://bugs.gentoo.org/873850
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../{imsettings-1.8.2.ebuild => imsettings-1.8.2-r1.ebuild}          | 5 ++---
 app-i18n/imsettings/metadata.xml                                     | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-i18n/imsettings/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
similarity index 91%
rename from app-i18n/imsettings/imsettings-1.8.2.ebuild
rename to app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
index 9fad1e854c63..ed1257e0f018 100644
--- a/app-i18n/imsettings/imsettings-1.8.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="gconf qt5 +introspection xfconf"
+IUSE="qt5 +introspection xfconf"
 RESTRICT="test"
 
 RDEPEND="dev-libs/glib:2
@@ -22,7 +22,6 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/libX11
 	x11-libs/libgxim
 	x11-libs/libnotify
-	gconf? ( gnome-base/gconf )
 	introspection? ( dev-libs/gobject-introspection )
 	xfconf? ( xfce-base/xfconf )"
 DEPEND="${RDEPEND}"
@@ -37,7 +36,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/\(gconf-2\.0\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \

diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 25862f59a7ee..7593ee8f578e 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -6,7 +6,6 @@
 		<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>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-12-02  2:48 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-31 13:11 [gentoo-commits] repo/gentoo:master commit in: app-i18n/imsettings/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2022-12-02  2:48 Matt Turner
2021-10-31 13:11 Akinori Hattori
2021-10-31 13:02 Akinori Hattori
2021-10-31 13:02 Akinori Hattori
2019-06-05  6:48 Agostino Sarubbo
2018-10-16  6:40 Naohiro Aota
2017-07-23 14:04 Akinori Hattori
2017-07-23 14:04 Akinori Hattori

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox