Add patch to build on >=glib-2.32. Bump. #411239

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

9 files changed, 38 insertions, 192 deletions

diff --git a/app-i18n/imsettings/ChangeLog b/app-i18n/imsettings/ChangeLog
index 0c5227e3c7bb..c5c0abea6e64 100644
--- a/app-i18n/imsettings/ChangeLog
+++ b/app-i18n/imsettings/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/imsettings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v 1.11 2012/05/23 13:12:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v 1.12 2012/05/31 13:20:54 naota Exp $
+
+*imsettings-1.2.8.1 (31 May 2012)
+
+  31 May 2012; Naohiro Aota <naota@gentoo.org>
+  +files/imsettings-1.2.8.1-glib32.patch, +imsettings-1.2.8.1.ebuild,
+  -imsettings-1.0.0.ebuild, -imsettings-1.0.1.ebuild, -imsettings-1.2.1.ebuild,
+  -imsettings-1.2.2.ebuild, imsettings-1.2.4.ebuild, imsettings-1.2.5.ebuild,
+  imsettings-1.2.6.ebuild:
+  Add patch to build on >=glib-2.32. Bump. #411239
 
   23 May 2012; Kacper Kowalik <xarthisius@gentoo.org> imsettings-1.2.2.ebuild:
   Add missing eutils.eclass for epatch
diff --git a/app-i18n/imsettings/files/imsettings-1.2.8.1-glib32.patch b/app-i18n/imsettings/files/imsettings-1.2.8.1-glib32.patch
new file mode 100644
index 000000000000..2cebb6d9b960
--- /dev/null
+++ b/app-i18n/imsettings/files/imsettings-1.2.8.1-glib32.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/rhbz_599924.c b/tests/rhbz_599924.c
+index 6741fd3..531043f 100644
+--- a/tests/rhbz_599924.c
++++ b/tests/rhbz_599924.c
+@@ -27,7 +27,6 @@
+ 
+ #include <unistd.h>
+ #include <glib.h>
+-#include <glib/gthread.h>
+ #include "imsettings-info.h"
+ #include "main.h"
+ 
diff --git a/app-i18n/imsettings/imsettings-1.0.0.ebuild b/app-i18n/imsettings/imsettings-1.0.0.ebuild
deleted file mode 100644
index 1cf6c64c57ed..000000000000
--- a/app-i18n/imsettings/imsettings-1.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild,v 1.4 2012/05/03 19:24:25 jdhore Exp $
-
-EAPI=3
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="http://tagoh.github.com/imsettings/"
-SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 static-libs xfconf"
-
-# X11 connections are required for test.
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/check-0.9.4
-	>=dev-libs/glib-2.26
-	sys-apps/dbus
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libgxim-0.3.1
-	x11-libs/libnotify
-	x11-libs/libX11
-	qt4? ( x11-libs/qt-core:4 )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MY_XINPUTSH="90-xinput"
-
-src_prepare() {
-	# Prevent automagic linking to libxfconf-0.
-	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() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-
-	fperms 0755 /usr/libexec/xinputinfo.sh || die
-	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-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/imsettings-1.0.1.ebuild b/app-i18n/imsettings/imsettings-1.0.1.ebuild
deleted file mode 100644
index 8a6b2bf1a542..000000000000
--- a/app-i18n/imsettings/imsettings-1.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.0.1.ebuild,v 1.3 2012/05/03 19:24:25 jdhore Exp $
-
-EAPI=3
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="http://tagoh.github.com/imsettings/"
-SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 static-libs xfconf"
-
-# X11 connections are required for test.
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/check-0.9.4
-	>=dev-libs/glib-2.26
-	sys-apps/dbus
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libgxim-0.3.1
-	x11-libs/libnotify
-	x11-libs/libX11
-	qt4? ( x11-libs/qt-core:4 )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MY_XINPUTSH="90-xinput"
-
-src_prepare() {
-	# Prevent automagic linking to libxfconf-0.
-	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() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-
-	fperms 0755 /usr/libexec/xinputinfo.sh || die
-	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-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/imsettings-1.2.1.ebuild b/app-i18n/imsettings/imsettings-1.2.1.ebuild
deleted file mode 100644
index ca0b6d345470..000000000000
--- a/app-i18n/imsettings/imsettings-1.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.1.ebuild,v 1.3 2012/05/03 19:24:25 jdhore Exp $
-
-EAPI=3
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="http://tagoh.github.com/imsettings/"
-SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc qt4 static-libs xfconf"
-
-# X11 connections are required for test.
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/check-0.9.4
-	>=dev-libs/glib-2.26
-	sys-apps/dbus
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libgxim-0.3.1
-	x11-libs/libnotify
-	x11-libs/libX11
-	qt4? ( x11-libs/qt-core:4 )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-MY_XINPUTSH="90-xinput"
-
-src_prepare() {
-	# Prevent automagic linking to libxfconf-0.
-	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() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-
-	fperms 0755 /usr/libexec/xinputinfo.sh || die
-	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-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/imsettings-1.2.4.ebuild b/app-i18n/imsettings/imsettings-1.2.4.ebuild
index 8824ad8758e7..e9a04b45b607 100644
--- a/app-i18n/imsettings/imsettings-1.2.4.ebuild
+++ b/app-i18n/imsettings/imsettings-1.2.4.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.4.ebuild,v 1.3 2012/05/03 19:24:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.4.ebuild,v 1.4 2012/05/31 13:20:54 naota Exp $
 
 EAPI=3
 
+inherit eutils
+
 DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="http://tagoh.github.com/imsettings/"
 SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
@@ -39,6 +41,7 @@ src_prepare() {
 	if ! use qt4; then
 		sed -i -e 's:QtCore:dIsAbLe&:' configure || die
 	fi
+	epatch "${FILESDIR}"/${PN}-1.2.8.1-glib32.patch
 }
 
 src_configure() {
diff --git a/app-i18n/imsettings/imsettings-1.2.5.ebuild b/app-i18n/imsettings/imsettings-1.2.5.ebuild
index 6fc90245579e..8dff4d9bfb07 100644
--- a/app-i18n/imsettings/imsettings-1.2.5.ebuild
+++ b/app-i18n/imsettings/imsettings-1.2.5.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.5.ebuild,v 1.3 2012/05/03 19:24:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.5.ebuild,v 1.4 2012/05/31 13:20:54 naota Exp $
 
 EAPI=3
 
+inherit eutils
+
 DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="http://tagoh.github.com/imsettings/"
 SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
@@ -39,6 +41,7 @@ src_prepare() {
 	if ! use qt4; then
 		sed -i -e 's:QtCore:dIsAbLe&:' configure || die
 	fi
+	epatch "${FILESDIR}"/${PN}-1.2.8.1-glib32.patch
 }
 
 src_configure() {
diff --git a/app-i18n/imsettings/imsettings-1.2.6.ebuild b/app-i18n/imsettings/imsettings-1.2.6.ebuild
index 75cd6f2e851a..e2328dba30a7 100644
--- a/app-i18n/imsettings/imsettings-1.2.6.ebuild
+++ b/app-i18n/imsettings/imsettings-1.2.6.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.6.ebuild,v 1.3 2012/05/03 19:24:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.6.ebuild,v 1.4 2012/05/31 13:20:54 naota Exp $
 
 EAPI=3
 
+inherit eutils
+
 DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="http://tagoh.github.com/imsettings/"
 SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
@@ -39,6 +41,7 @@ src_prepare() {
 	if ! use qt4; then
 		sed -i -e 's:QtCore:dIsAbLe&:' configure || die
 	fi
+	epatch "${FILESDIR}"/${PN}-1.2.8.1-glib32.patch
 }
 
 src_configure() {
diff --git a/app-i18n/imsettings/imsettings-1.2.2.ebuild b/app-i18n/imsettings/imsettings-1.2.8.1.ebuild
index c76db93ec412..cf947d61f89a 100644
--- a/app-i18n/imsettings/imsettings-1.2.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.2.ebuild,v 1.4 2012/05/23 13:12:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.8.1.ebuild,v 1.1 2012/05/31 13:20:54 naota Exp $
 
 EAPI=3
 
@@ -28,7 +28,8 @@ RDEPEND=">=dev-libs/check-0.9.4
 	qt4? ( x11-libs/qt-core:4 )
 	xfconf? ( xfce-base/xfconf )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	dev-util/pkgconfig
+	dev-util/intltool
 	doc? ( dev-util/gtk-doc )"
 
 MY_XINPUTSH="90-xinput"
@@ -41,8 +42,7 @@ src_prepare() {
 	if ! use qt4; then
 		sed -i -e 's:QtCore:dIsAbLe&:' configure || die
 	fi
-
-	epatch "${FILESDIR}/${P}-gtk.patch"
+	epatch "${FILESDIR}"/${PN}-1.2.8.1-glib32.patch
 }
 
 src_configure() {