Fix deprecation warnings.

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

4 files changed, 32 insertions, 21 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 6cf49e3f769a..090fce4c2209 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,10 @@
 # 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.82 2011/03/30 11:08:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.83 2011/04/16 22:04:35 arfrever Exp $
+
+  16 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  ibus-1.2.0.20100111.ebuild, ibus-1.3.9.ebuild:
+  Fix deprecation warnings.
 
   30 Mar 2011; Christoph Mende <angelos@gentoo.org> ibus-1.2.0.20100111.ebuild,
   ibus-1.3.9.ebuild, ibus-1.3.9-r1.ebuild, ibus-1.3.99.20101118-r1.ebuild,
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 898cbec4aebb..de244a5ca387 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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.20101118.tar.gz 1320315 RMD160 4f5b437a123811fc5e30eabcf39459e02ddfc3c9 SHA1 0d21016e51f7ec3b0fd2871dff64d31b2dc53ec4 SHA256 3cb4b4f36fae19271ae9d4fa50d19392f7f8ee28736b28a0b69edfa37b0ba173
 DIST ibus-1.3.99.20110228.tar.gz 1348307 RMD160 06226d2a417fe8127736e83eb6cebf3b63e4043a SHA1 50b862bd93268da3d70572bb1bf07fbec4138d26 SHA256 9f2e8dd5be08ddd75b36e87ec3f354a8009b9e16a43908d5601e6a92e7907354
-EBUILD ibus-1.2.0.20100111.ebuild 2608 RMD160 d956db19ea149fa10471124b28e9028c672a712a SHA1 77a5a21d459f3d94babe6bc6c01758d986f6e23c SHA256 ae34089c9c628521e43def25b4a5a051bd9432b319633c3ef82ba1296516998e
+EBUILD ibus-1.2.0.20100111.ebuild 2559 RMD160 efd0b291781b1b82bca04f9f1eac8104ca151e0c SHA1 6a449de6e9668b6129ae764a04305d39ec4a170e SHA256 d078fe38c54256397eab0599d6d61f3d27f92ca7b1e3b5cda02f412e5f1f6212
 EBUILD ibus-1.3.9-r1.ebuild 3460 RMD160 69922cc18dd8dcebfd8eb094edc45c8fb50aae11 SHA1 d595d669d41ca0c1e466f6bdb3b0dcdcbfd24680 SHA256 2bb06a8c1589b2d9bed5dd0ec61c0c740e998d8dcc7a596692f7fdd4a9fd0960
-EBUILD ibus-1.3.9.ebuild 3231 RMD160 a69445c917a2fc043ac7cc13b2e0686b94201b3c SHA1 5e3786d1a9738ec4d9d9232f3f40571a61b5e386 SHA256 333d5f6ebaf764fe294bfe3dce4cdf0ba7ae7da053b8f87e433d21104740cdd7
+EBUILD ibus-1.3.9.ebuild 3216 RMD160 c08d017ad35bbc8b7d79f6d9a5ead6fe79b4cb34 SHA1 5fbdcedd821d3730ed612cf7c6990f1b49e71607 SHA256 004c162a13d046890604a05715ad054644e600bc88c0b410de1409275958ce03
 EBUILD ibus-1.3.99.20101118-r1.ebuild 3470 RMD160 a70176277aade91437320028fbcfc00c9a7efb29 SHA1 9acb4140e25a6321e76bb98eeff14438ae450a22 SHA256 c280ac672dafb658faa1367c175bb008acdc074bdbced065a716f4604acf1c7a
 EBUILD ibus-1.3.99.20110228.ebuild 3467 RMD160 50e70b40558c60461d1fa313469af806098fd661 SHA1 d388c85c3546228088a7f5dfcc69a8ec486ad3d2 SHA256 4d787244dd4cab47929a775e77cb4e29e2bb0d699badd323a9cd0acde533ad2e
-MISC ChangeLog 13407 RMD160 8a1ae4d5083d40108c50da807742f25bb2f1c43e SHA1 4a592e09d00817e9807bb08c1bc47c00528506ae SHA256 2d1bd534ee7c0ff18daf756d0b09bbf16e890742973c66ad4f3586c13cfda39e
+MISC ChangeLog 13559 RMD160 6653d047ba65d4cfcc554a1193109785fb1d4cff SHA1 aafde54b1655db83f489e1ef7a62cff3972aaddd SHA256 8499eb34081aa78869fc8a712c312759925b7230b8b74ee4a1666b86cee330b2
 MISC metadata.xml 671 RMD160 a430d2733dbeb0c98d42b3a432cfadafb5f8c87a SHA1 bfc77eafdea87e34b5ae48e6a6652508c4a70204 SHA256 4184635ca1b44311db6031a7f00c5679582289862be1a550a4faf4dd9d5e6e59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2TDxYACgkQmWq1bYTyC0M02wD/QEYRfy/KBxFzzsGvLsruA3Gz
-6xKm2FDEVj3VAPN+BZwA/3s7cP40Zik5iLjd2xmVekpWq+qiZeW5zFyRdKZxxC1S
-=S4dS
+iQIcBAEBAgAGBQJNqhJ6AAoJENgZr6v6gHY0Vj4P/1FDRNbhYhKPdAdwJLWKbqep
+q1QySI/kwJ84npfCQHkz38Dl4+fsnODykpdRU+6SxmmLAjXDeJTO36DKxgrm8zVR
+p6H5ao2bY1/0xxdwaoX6MxISrBrFW1ZMBfYYcXyCo9OfDf7pTOe0nVgsr3749cbb
+w3rwGLPzJWo9esAgVcC0JvWLdddfX7PEmYb1n2pWrG6VMmzkIDm98tmUsqNyuiz7
+j1kONv8kogG2/LAZd4Jk+gFggGElSTCNeZwrBiNvf97EQ90z6JDlw4zSbopWk4LE
+vm/Sq1TrPKYLRFz2MtRB1FXY8cfXFsStVxasBqqq6LXQUwdjbpv+WInIGVhnkHLn
+FJuULw8WTZkZvaS31j+zsNPmfs+OAPehfddz3gsL82WCB+VkQCVcs39wt6Bet4IZ
+y6TlD3xq2J3hRPRFcTIIiZ4AjbGHoHqql4vjEZwDiWacazSNCpAo/6fqld042cgM
+Okx08MBkxJzgCuPD5oEEyiFubUQvqM+lNHMQXZo2NrCk1Qtpf+WUyRethH8EF+OC
+VpBQL/C46h8iOXqO11iwdfZNnWrUTyuo+4AmWfkPqcg8rbP/m564+c/cJDqxxcwZ
+mg3mizG/W0TP+jp1e0RPFr7OSvBSmFjzkUeFWVn64KuKb1DAtEYoRxNAAi8vAQDx
+FeTyBzrAD+OF8KPqYkJ4
+=/MV9
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.2.0.20100111.ebuild b/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
index 7f2a0a73f749..8eb173fd55b2 100644
--- a/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
+++ b/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
@@ -1,9 +1,9 @@
 # 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.2.0.20100111.ebuild,v 1.9 2011/03/30 11:08:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.10 2011/04/16 22:04:35 arfrever Exp $
 
-EAPI="1"
-inherit confutils eutils gnome2-utils multilib python
+EAPI="3"
+inherit confutils eutils gnome2-utils python
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -44,19 +44,16 @@ pkg_setup() {
 	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+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
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable doc gtk-doc) \
-		$(use_enable nls) || die
-	emake || die
+		$(use_enable nls)
 }
 
 src_install() {
diff --git a/app-i18n/ibus/ibus-1.3.9.ebuild b/app-i18n/ibus/ibus-1.3.9.ebuild
index 1ad373ff2608..5fabe07d513d 100644
--- a/app-i18n/ibus/ibus-1.3.9.ebuild
+++ b/app-i18n/ibus/ibus-1.3.9.ebuild
@@ -1,10 +1,10 @@
 # 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.3.9.ebuild,v 1.8 2011/03/30 11:08:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9.ebuild,v 1.9 2011/04/16 22:04:35 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
-inherit confutils eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils python
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -84,7 +84,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable vala) \
-		$(use_enable X xim) || die
+		$(use_enable X xim)
 		#$(use_enable gtk gtk3) \
 }