Support /etc/machine-id fallback wrt #390463 by "Alphat-PC"

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index b6a82f55ccfa300f4b97719f644c7e3dadc32331..c2f3d0baedf6ed682ded440e3b52b9e4f6331012 100644 (file)
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.94 2011/11/22 23:27:59 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.95 2011/12/23 07:59:07 ssuominen Exp $
+
+*ibus-1.4.0-r1 (23 Dec 2011)
+
+  23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> +ibus-1.4.0-r1.ebuild,
+  +files/ibus-1.4.0-machine-id-fallback.patch:
+  Support /etc/machine-id fallback wrt #390463 by "Alphat-PC"
 
   22 Nov 2011; Naohiro Aota <naota@gentoo.org> ibus-1.2.0.20100111.ebuild,
   ibus-1.3.9.ebuild, ibus-1.3.9-r2.ebuild, ibus-1.3.99.20110817.ebuild,

diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 6df779f08ce474585c6e78ac2128fbd380c09e0c..41a3fb970a4324c7db4129b490d9ed54983499bf 100644 (file)
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ibus-1.3.9-remove-unused-build.patch 367 RMD160 ff8c355dc1eb3b70cb1efeac4008cf515bef21ac SHA1 715796b48a66267dd13398c37b9a0ce6bb40b889 SHA256 f162a04558da12bc891786535d46c2fcf0a56428e36299c5c8f74f173ad46d7f
 AUX ibus-1.4.0-doc-typo.patch 603 RMD160 ae52cf4cacb59f75c53ec9142f4c80f922426e91 SHA1 bc0b3b774cf36804080f0298958f901f0a00fb82 SHA256 88f7894361c46008451d4be1b2735e7d5daa1b30504961272a52982acb379733
+AUX ibus-1.4.0-machine-id-fallback.patch 750 RMD160 2d02699dbd9555adcc18c4bd9afb15b1c4c33673 SHA1 b007aedfe70d2ab1e69581c07a4c43595328151e SHA256 ad1b7538e324a29fd779d7545860e06f22904974bae931fa3cda045ae74af8ed
 DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
 DIST ibus-1.3.9.tar.gz 1380081 RMD160 8cf8712d29369bb1934c0d9d66ce5f15953a60d0 SHA1 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 SHA256 b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
 DIST ibus-1.3.99.20110817.tar.gz 1470606 RMD160 3b56578153ffd27080d6f2a136823ef00e1c00bf SHA1 c2b941b17deba1b2ff43b6e4c68ea1854b2b09ac SHA256 5bb66690da0c675bee340388ef26c6ac9558d8480d2b65be0e280cd024a95b32
@@ -11,23 +12,18 @@ EBUILD ibus-1.2.0.20100111.ebuild 2568 RMD160 cfa1b4e13a24ebfeb6ec2d5ccf51416ce1
 EBUILD ibus-1.3.9-r2.ebuild 3931 RMD160 c35d203eb28780d59f726119971581443e8d9269 SHA1 cb58b0dbd3d5eeadc89ab09d6403b7d8273e0e68 SHA256 7229027e95381ebb15c6c242c946bba4942235af87ef39d146c61238d2786ecc
 EBUILD ibus-1.3.9.ebuild 3348 RMD160 59a7a393f71df020a8c8a4bab97c7652fe766517 SHA1 37d2e8854bed892ccf1d9beda18e9f946fbbf91a SHA256 283a0aa15396f8ad892249c86c50cd0b58de8b0474161525b2a4e21dff44cab3
 EBUILD ibus-1.3.99.20110817.ebuild 3863 RMD160 224628c42228bb76768b88d28f5ea723f50d8433 SHA1 955118376853936ee99bc998ba7bec11604bea9f SHA256 7b52822821a7fae2fe2e10cbed80990458566dca4aaff78e6b82ceeb3144e429
+EBUILD ibus-1.4.0-r1.ebuild 4032 RMD160 40c220b5427ac65243f3a359416b169bf68e7525 SHA1 335adc050270ff3ccddb00d4bdbcfc9b1f097aca SHA256 ef0105a2e38e45606f0bae7691da39ae0525792a4b4f0cd3472b22c19c9fd3c7
 EBUILD ibus-1.4.0.ebuild 3971 RMD160 dad149ed60ebcd3003958cf0f99810050d152bdb SHA1 b216d1d490f217439ef9258589d64f714d7f2ad8 SHA256 66510415c1fc87a1df66f77b2b78c69b8ac0448c94e8d1a3a673e7490b1192eb
-MISC ChangeLog 15621 RMD160 52b34198975db2d5196cb516fb96fc7962dba696 SHA1 a878c12afc527644b1c8c8cbb8ea966d2637d3e0 SHA256 40cbc8c69606864d72f8245b1ed303989cf50d5d4b4f9aa69f08ac9a9d8cc47c
+MISC ChangeLog 15842 RMD160 78d28cd26d1a1209fd6c9f4888dd6f7257fa2cbf SHA1 9448a50c0b617562f68b1a2aa3c1e6f73996418d SHA256 be10f6afeea8f3bd26f143c39911654dbb0fbaaaa2f2851c1eeb9de3f0ce090f
 MISC metadata.xml 798 RMD160 00aebf0dab958b7d9a13d7456d9f19c07d247641 SHA1 9208222da6f4015ba64ce30f59ccf20069507159 SHA256 f8cfd5b99a00d0b8cef1a903818e00a957cebb4612dc482b4cb34ed19d73958d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOzDAHAAoJEDYO1FT4VRUUCmEP/RL/PTfm99E/5BHMawHJDqUR
-glRw/GftZ59Ugb0EOung6Q81MNtH5iSnf5U1ghfD1GYPf2f4Bq+l9BfiQIsjdqFj
-xI+O1Y1BCWElJaLFYVRonp5y28vWCJIGF/g6u/3vIT91/l7TLTUlBpx1GxOcIMtF
-p6/Q2jOVNVL071TBuvfr4/9R5Khp8+pu9operupZUHGDLiDTe/27DFUACYc2BEww
-WmypGyj9dFyNvngatt+i5Jlqo3k2hVmzQ/OwRQzu/RzTA/dS3JVXX/BXqTNWIWDg
-wtpLvGm1uroXloZoVPVOMzYcjBdaWbKjzxxHgqrJrZw6cVvx47iKzzZEnGjKncKS
-7lP2f21PrdaBEEVuarad2LiKuMLZ2upPUzt9PGP6A2g0laxf3uH9BVgwBTJIpCVF
-rnu3iS3R36AJ7Z25rPMU0J/ggHpj6oViltzqYfjn1/M/1k4TUj7mcOD0p5i+zT+p
-5MQDZ/+VSeXBLsP2ujz95EkD8RPGMi5IZWttNFYQYeGSghjjY5m4VoCKBGtXFJ/+
-UH1RoaAzWlvFX8S8hIA1PNYdsS/7bV1xbkdW/2jk6H1db8fL/xmTqW0J7SLzzwe1
-+SYGBGkZPEm2fPZDP6UES2g+bX7Zg/QSE1N1RRlSdC03ZXZ5gS4Ypb8UBpa7/rqU
-6D7SVdAAQnp5VsVKL2jk
-=8BWf
+iQEcBAEBAgAGBQJO9DSSAAoJEEdUh39IaPFNyXUH/j2ZVBdoUG3DAsCbWRydTm6H
+q/ZshxuTchbrZ6mV1Y3X4wtsG6PTQE0bdNR/6IBH6P1I/4700Ko2mwDYrudVhFs/
+74iPRl7LT7mz2b2hA1WUYd5VYNCenxZaT/rePpFTcsufk30G8bQ55QPV3H+FlojG
+RPz4oFVeCks4Sg+KicDsnZKsBkTlkguHECYhIlAlqDZDN1BDmcGUc7U7W0VMPNrR
+CfoUBSYFqjSV/HUtrO0mF4Zhuxp3jPFm375YhaInzYOfRBgAEyPcn+gAuvpdGQKU
+CufOad/qQizg1MDxUdduN//zsTh3GBu6CsSrDbz397dEgXFC9dSDmz0hDBm196w=
+=s0U9
 -----END PGP SIGNATURE-----

diff --git a/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch b/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch
new file mode 100644 (file)
index 0000000..6932e4c
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch
@@ -0,0 +1,19 @@
+http://cgit.freedesktop.org/dbus/dbus/commit/dbus/dbus-sysdeps-unix.c?id=66e52541d5bdd4927a5c702963749760643313f4
+
+http://bugs.gentoo.org/390463
+
+--- src/ibusshare.c
++++ src/ibusshare.c
+@@ -41,7 +41,11 @@ ibus_get_local_machine_id (void)
+ 
+     if (machine_id == NULL) {
+         GError *error = NULL;
+-        if (!g_file_get_contents ("/var/lib/dbus/machine-id",
++        if (!g_file_get_contents ("/etc/machine-id",
++                                  &machine_id,
++                                  NULL,
++                                  NULL) &&
++            !g_file_get_contents ("/var/lib/dbus/machine-id",
+                                   &machine_id,
+                                   NULL,
+                                   &error)) {

diff --git a/app-i18n/ibus/ibus-1.4.0-r1.ebuild b/app-i18n/ibus/ibus-1.4.0-r1.ebuild
new file mode 100644 (file)
index 0000000..1a04f42
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.4.0-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.0-r1.ebuild,v 1.1 2011/12/23 07:59:07 ssuominen Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.5"
+inherit confutils eutils gnome2-utils multilib python autotools
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+       dconf? ( >=gnome-base/dconf-0.7.5 )
+       gconf? ( >=gnome-base/gconf-2.12:2 )
+       gnome-base/librsvg:2
+       sys-apps/dbus[X?]
+       app-text/iso-codes
+       gtk? ( x11-libs/gtk+:2 )
+       gtk3? ( x11-libs/gtk+:3 )
+       X? (
+               x11-libs/libX11
+               x11-libs/gtk+:2
+       )
+       introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+       python? (
+               dev-python/notify-python
+               >=dev-python/dbus-python-0.83
+       )
+       nls? ( virtual/libintl )"
+#      X? ( x11-libs/libX11 )
+#      gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
+#      vala? ( dev-lang/vala )
+DEPEND="${RDEPEND}
+       >=dev-lang/perl-5.8.1
+       dev-perl/XML-Parser
+       dev-util/pkgconfig
+       doc? ( >=dev-util/gtk-doc-1.9 )
+       nls? ( >=sys-devel/gettext-0.16.1 )"
+RDEPEND="${RDEPEND}
+       python? (
+               dev-python/pygtk
+               dev-python/pyxdg
+       )"
+
+RESTRICT="test"
+
+update_gtk_immodules() {
+       local GTK2_CONFDIR="/etc/gtk-2.0"
+       # bug #366889
+       if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+               GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+       fi
+       mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+       if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+               "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+       fi
+}
+
+update_gtk3_immodules() {
+       if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+               "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+       fi
+}
+
+pkg_setup() {
+       # bug #342903
+       confutils_require_any X gtk gtk3
+       if use python; then
+               python_set_active_version 2
+               python_pkg_setup
+       fi
+}
+
+src_prepare() {
+       mv py-compile py-compile.orig || die
+       ln -s "$(type -P true)" py-compile || die
+       echo "ibus/_config.py" >> po/POTFILES.skip || die
+       sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
+
+       epatch \
+               "${FILESDIR}"/${P}-doc-typo.patch \
+               "${FILESDIR}"/${P}-machine-id-fallback.patch
+
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               $(use_enable dconf) \
+               $(use_enable doc gtk-doc) \
+               $(use_enable doc gtk-doc-html) \
+               $(use_enable introspection) \
+               $(use_enable gconf) \
+               $(use_enable gtk gtk2) \
+               $(use_enable gtk xim) \
+               $(use_enable gtk3) \
+               $(use_enable nls) \
+               $(use_enable python) \
+               $(use_enable vala) \
+               $(use_enable X xim) || die
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+
+       find "${ED}" -name '*.la' -type f -delete || die
+
+       insinto /etc/X11/xinit/xinput.d
+       newins xinput-ibus ibus.conf || die
+
+       # bug 289547
+       keepdir /usr/share/ibus/{engine,icons} || die
+
+       dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+pkg_preinst() {
+       use gconf && gnome2_gconf_savelist
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       use gconf && gnome2_gconf_install
+       use gtk && update_gtk_immodules
+       use gtk3 && update_gtk3_immodules
+       use python && python_mod_optimize /usr/share/${PN}
+       gnome2_icon_cache_update
+
+       elog "To use ibus, you should:"
+       elog "1. Get input engines from sunrise overlay."
+       elog "   Run \"emerge -s ibus-\" in your favorite terminal"
+       elog "   for a list of packages we already have."
+       elog
+       elog "2. Setup ibus:"
+       elog
+       elog "   $ ibus-setup"
+       elog
+       elog "3. Set the following in your user startup scripts"
+       elog "   such as .xinitrc, .xsession or .xprofile:"
+       elog
+       elog "   export XMODIFIERS=\"@im=ibus\""
+       elog "   export GTK_IM_MODULE=\"ibus\""
+       elog "   export QT_IM_MODULE=\"xim\""
+       elog "   ibus-daemon -d -x"
+}
+
+pkg_postrm() {
+       use gtk && update_gtk_immodules
+       use gtk3 && update_gtk3_immodules
+       use python && python_mod_cleanup /usr/share/${PN}
+       gnome2_icon_cache_update
+}