Empty py-compile script instead of symlinking it to /path/to/true for compability with recent automake. And well, mostly rewrite the ebuild

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

3 files changed, 32 insertions, 25 deletions

diff --git a/app-i18n/ibus-hangul/ChangeLog b/app-i18n/ibus-hangul/ChangeLog
index 810df9c93011..96bb657d723e 100644
--- a/app-i18n/ibus-hangul/ChangeLog
+++ b/app-i18n/ibus-hangul/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/ibus-hangul
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ChangeLog,v 1.20 2012/03/21 15:58:43 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ChangeLog,v 1.21 2012/03/21 17:04:39 ssuominen Exp $
+
+  21 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> ibus-hangul-1.4.0.ebuild:
+  Empty py-compile script instead of symlinking it to /path/to/true for
+  compability with recent automake.
 
   21 Mar 2012; Thomas Kahle <tomka@gentoo.org> ibus-hangul-1.4.0.ebuild:
   marked x86 per bug 407691
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 525fb041f425..23985ea764fc 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ibus-hangul-ibus-1.4.patch 5861 RMD160 47122d2cea73c7527006646aae675b7453ea0e1f SHA1 ebeba3463897b2994fc9999e79f9cda5066a6d7e SHA256 d2e6ac38bb173925ac259098f2db9a25c66109a1943794105ba141a3dd76a7e3
 DIST ibus-hangul-1.3.1.tar.gz 431214 RMD160 996172fb00854ae2000b3197707269ebd8d6808e SHA1 e1fb0e0560d8987c3106992693638a298bd2ea1c SHA256 1e5530c1d7add8970f3a98a76a0a2feda06a08d65af56fbba5329a6645915afc
 DIST ibus-hangul-1.4.0.tar.gz 439462 RMD160 07ac966ba9f878ead7e17d31a653bd5514098305 SHA1 421d7164a27eeedfea49d54b61e2a5edd4f7d3a7 SHA256 a955ec0c9ea90ecd8e8d0fd2de1596a5ba1186463862c387d74a418d1707ca0a
 EBUILD ibus-hangul-1.3.1-r1.ebuild 1027 RMD160 20c8df106b33e92d06e2b7d8113000d3957e6b11 SHA1 f7864e9c756f3a34055d9f6bf86d55c3282e9da1 SHA256 80b825df8ee7e8c1f7857fb4a50d25efbe5be3e1a7ff024f1c45c76a5386f1dd
-EBUILD ibus-hangul-1.4.0.ebuild 1195 RMD160 d43a82188fea6136559fc4d6a241ac013e43ff7e SHA1 a298e458f29fbb848c159fa7bfc9894608d0a719 SHA256 eb9d9baadb3474c41a4e1ac7690d1577642c72cae11db43c8a39b8f9bceb19d4
-MISC ChangeLog 3791 RMD160 255ea707c58c0f3ee6cab01254c9fd8efcaaf9f9 SHA1 f4699ece0890b2e94ab879cd49247cee256931e6 SHA256 05d69f8ba90cf3fb47fa006bfd1a84701d048ad6dbeba1d77ac079fc75c17866
+EBUILD ibus-hangul-1.4.0.ebuild 1066 RMD160 6e663207d224a884cd40db8f3cad89ee4afc2533 SHA1 55cc34d4eb126712ccd08c07b7294d3d1127ce92 SHA256 269fcc5430c81a6e2d6d4bfec4266878f4963409c37e06159a6ad5c7906a50d0
+MISC ChangeLog 3984 RMD160 35161f82266f26fd2f14e8c3158189db70a35cf6 SHA1 1820cad35473fdc37a48032d5c0b3b7b25b4efc4 SHA256 dfd5d4bd78383f5b6e779751e5d094c4ec4f08477fc4b5f7a780f0c9872393dd
 MISC metadata.xml 289 RMD160 b04f57fc9299b32b0a9f82fc920ecaf25fcd14c2 SHA1 38d9f652aae84d8e7b51e6005c314787f8e051c5 SHA256 2d3584ad2ac1f8e9cd6fdd12f9c8874f2d80283aad221b287808a36deaae5e35
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9p+rgACgkQodBTJSDyo64rUgD/f6jctiLat8U9WN3c53G+Jlnu
-XP2bcszTzkJ4VqCHAG0A/22uJelvCNvW9WKyUgu0TWLZC93xvZ8G0Yz6ZpKMwVLH
-=jnd5
+iQEcBAEBAgAGBQJPagonAAoJEEdUh39IaPFN3a4H/R/XG5ePj7SkcNlHKp03ZLOO
+geTaWX1/I7l3/tdz6PX8kzmAODih2g2VujFeTTCBNZxohZxmAdIPIn9cylQ5Q3hY
+nGtXuticCu9eBajz+spteDXeG2RfoT9DTar0jfNlkBZAyWuB7A87X0Dc8Q9CQZwK
+cr2qWBhSnUIObMroJPFpEGwcBt3vH/ps8GLyY5t78g0Qqlq+lnXUkSmlubzVBCYy
+/X1+SZKRD14nAoW1eiw07UEwrpRH+LJr5MZcNzHwNtm3F8uMItVOFHtSBzup7a3B
+xoCygUNyaz7/6oz6NNspYP8Ud8MgBchd3El+lID/zOt4zLIpIOocPbRwkFlllNw=
+=zS13
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild
index d48dbedf42bf..4d4654bef9af 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild,v 1.3 2012/03/21 15:58:43 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild,v 1.4 2012/03/21 17:04:39 ssuominen Exp $
+
+EAPI=4
 
-EAPI="3"
 PYTHON_DEPEND="2:2.5"
 
-inherit eutils python
+inherit python
 
 DESCRIPTION="The Hangul engine for IBus input platform"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -16,14 +17,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND=">=app-i18n/ibus-1.3.99
-	dev-python/pygobject
-	dev-python/pygtk
+RDEPEND=">=app-i18n/ibus-1.4
+	=dev-python/pygobject-2*
+	=dev-python/pygtk-2*
 	>=app-i18n/libhangul-0.1
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.17 )"
+	nls? (
+		dev-util/intltool
+		>=sys-devel/gettext-0.17
+		)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -31,19 +37,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-	sed -i -e "s:python:$(PYTHON -2):" setup/ibus-setup-hangul.in || die
+	>py-compile
+	python_convert_shebangs 2 setup/ibus-setup-hangul.in
 }
 
 src_configure() {
-	econf $(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
+	econf $(use_enable nls)
 }
 
 pkg_postinst() {