| 1 |
ssuominen 11/12/23 07:59:07 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: ibus-1.4.0-r1.ebuild |
| 5 |
Log: |
| 6 |
Support /etc/machine-id fallback wrt #390463 by "Alphat-PC" |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.95 app-i18n/ibus/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?rev=1.95&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?rev=1.95&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?r1=1.94&r2=1.95 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v |
| 20 |
retrieving revision 1.94 |
| 21 |
retrieving revision 1.95 |
| 22 |
diff -u -r1.94 -r1.95 |
| 23 |
--- ChangeLog 22 Nov 2011 23:27:59 -0000 1.94 |
| 24 |
+++ ChangeLog 23 Dec 2011 07:59:07 -0000 1.95 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for app-i18n/ibus |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.94 2011/11/22 23:27:59 naota Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.95 2011/12/23 07:59:07 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+*ibus-1.4.0-r1 (23 Dec 2011) |
| 32 |
+ |
| 33 |
+ 23 Dec 2011; Samuli Suominen <ssuominen@g.o> +ibus-1.4.0-r1.ebuild, |
| 34 |
+ +files/ibus-1.4.0-machine-id-fallback.patch: |
| 35 |
+ Support /etc/machine-id fallback wrt #390463 by "Alphat-PC" |
| 36 |
|
| 37 |
22 Nov 2011; Naohiro Aota <naota@g.o> ibus-1.2.0.20100111.ebuild, |
| 38 |
ibus-1.3.9.ebuild, ibus-1.3.9-r2.ebuild, ibus-1.3.99.20110817.ebuild, |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 app-i18n/ibus/ibus-1.4.0-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.4.0-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.4.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: ibus-1.4.0-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2011 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $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 $ |
| 52 |
|
| 53 |
EAPI="3" |
| 54 |
PYTHON_DEPEND="python? 2:2.5" |
| 55 |
inherit confutils eutils gnome2-utils multilib python autotools |
| 56 |
|
| 57 |
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" |
| 58 |
HOMEPAGE="http://code.google.com/p/ibus/" |
| 59 |
SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz" |
| 60 |
|
| 61 |
LICENSE="LGPL-2.1" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
| 64 |
IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X" |
| 65 |
|
| 66 |
RDEPEND=">=dev-libs/glib-2.26:2 |
| 67 |
dconf? ( >=gnome-base/dconf-0.7.5 ) |
| 68 |
gconf? ( >=gnome-base/gconf-2.12:2 ) |
| 69 |
gnome-base/librsvg:2 |
| 70 |
sys-apps/dbus[X?] |
| 71 |
app-text/iso-codes |
| 72 |
gtk? ( x11-libs/gtk+:2 ) |
| 73 |
gtk3? ( x11-libs/gtk+:3 ) |
| 74 |
X? ( |
| 75 |
x11-libs/libX11 |
| 76 |
x11-libs/gtk+:2 |
| 77 |
) |
| 78 |
introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) |
| 79 |
python? ( |
| 80 |
dev-python/notify-python |
| 81 |
>=dev-python/dbus-python-0.83 |
| 82 |
) |
| 83 |
nls? ( virtual/libintl )" |
| 84 |
# X? ( x11-libs/libX11 ) |
| 85 |
# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) |
| 86 |
# vala? ( dev-lang/vala ) |
| 87 |
DEPEND="${RDEPEND} |
| 88 |
>=dev-lang/perl-5.8.1 |
| 89 |
dev-perl/XML-Parser |
| 90 |
dev-util/pkgconfig |
| 91 |
doc? ( >=dev-util/gtk-doc-1.9 ) |
| 92 |
nls? ( >=sys-devel/gettext-0.16.1 )" |
| 93 |
RDEPEND="${RDEPEND} |
| 94 |
python? ( |
| 95 |
dev-python/pygtk |
| 96 |
dev-python/pyxdg |
| 97 |
)" |
| 98 |
|
| 99 |
RESTRICT="test" |
| 100 |
|
| 101 |
update_gtk_immodules() { |
| 102 |
local GTK2_CONFDIR="/etc/gtk-2.0" |
| 103 |
# bug #366889 |
| 104 |
if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then |
| 105 |
GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)" |
| 106 |
fi |
| 107 |
mkdir -p "${EPREFIX}${GTK2_CONFDIR}" |
| 108 |
|
| 109 |
if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then |
| 110 |
"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules" |
| 111 |
fi |
| 112 |
} |
| 113 |
|
| 114 |
update_gtk3_immodules() { |
| 115 |
if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then |
| 116 |
"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache |
| 117 |
fi |
| 118 |
} |
| 119 |
|
| 120 |
pkg_setup() { |
| 121 |
# bug #342903 |
| 122 |
confutils_require_any X gtk gtk3 |
| 123 |
if use python; then |
| 124 |
python_set_active_version 2 |
| 125 |
python_pkg_setup |
| 126 |
fi |
| 127 |
} |
| 128 |
|
| 129 |
src_prepare() { |
| 130 |
mv py-compile py-compile.orig || die |
| 131 |
ln -s "$(type -P true)" py-compile || die |
| 132 |
echo "ibus/_config.py" >> po/POTFILES.skip || die |
| 133 |
sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die |
| 134 |
|
| 135 |
epatch \ |
| 136 |
"${FILESDIR}"/${P}-doc-typo.patch \ |
| 137 |
"${FILESDIR}"/${P}-machine-id-fallback.patch |
| 138 |
|
| 139 |
eautoreconf |
| 140 |
} |
| 141 |
|
| 142 |
src_configure() { |
| 143 |
econf \ |
| 144 |
$(use_enable dconf) \ |
| 145 |
$(use_enable doc gtk-doc) \ |
| 146 |
$(use_enable doc gtk-doc-html) \ |
| 147 |
$(use_enable introspection) \ |
| 148 |
$(use_enable gconf) \ |
| 149 |
$(use_enable gtk gtk2) \ |
| 150 |
$(use_enable gtk xim) \ |
| 151 |
$(use_enable gtk3) \ |
| 152 |
$(use_enable nls) \ |
| 153 |
$(use_enable python) \ |
| 154 |
$(use_enable vala) \ |
| 155 |
$(use_enable X xim) || die |
| 156 |
} |
| 157 |
|
| 158 |
src_install() { |
| 159 |
emake DESTDIR="${D}" install || die |
| 160 |
|
| 161 |
find "${ED}" -name '*.la' -type f -delete || die |
| 162 |
|
| 163 |
insinto /etc/X11/xinit/xinput.d |
| 164 |
newins xinput-ibus ibus.conf || die |
| 165 |
|
| 166 |
# bug 289547 |
| 167 |
keepdir /usr/share/ibus/{engine,icons} || die |
| 168 |
|
| 169 |
dodoc AUTHORS ChangeLog NEWS README || die |
| 170 |
} |
| 171 |
|
| 172 |
pkg_preinst() { |
| 173 |
use gconf && gnome2_gconf_savelist |
| 174 |
gnome2_icon_savelist |
| 175 |
} |
| 176 |
|
| 177 |
pkg_postinst() { |
| 178 |
use gconf && gnome2_gconf_install |
| 179 |
use gtk && update_gtk_immodules |
| 180 |
use gtk3 && update_gtk3_immodules |
| 181 |
use python && python_mod_optimize /usr/share/${PN} |
| 182 |
gnome2_icon_cache_update |
| 183 |
|
| 184 |
elog "To use ibus, you should:" |
| 185 |
elog "1. Get input engines from sunrise overlay." |
| 186 |
elog " Run \"emerge -s ibus-\" in your favorite terminal" |
| 187 |
elog " for a list of packages we already have." |
| 188 |
elog |
| 189 |
elog "2. Setup ibus:" |
| 190 |
elog |
| 191 |
elog " $ ibus-setup" |
| 192 |
elog |
| 193 |
elog "3. Set the following in your user startup scripts" |
| 194 |
elog " such as .xinitrc, .xsession or .xprofile:" |
| 195 |
elog |
| 196 |
elog " export XMODIFIERS=\"@im=ibus\"" |
| 197 |
elog " export GTK_IM_MODULE=\"ibus\"" |
| 198 |
elog " export QT_IM_MODULE=\"xim\"" |
| 199 |
elog " ibus-daemon -d -x" |
| 200 |
} |
| 201 |
|
| 202 |
pkg_postrm() { |
| 203 |
use gtk && update_gtk_immodules |
| 204 |
use gtk3 && update_gtk3_immodules |
| 205 |
use python && python_mod_cleanup /usr/share/${PN} |
| 206 |
gnome2_icon_cache_update |
| 207 |
} |
Archives