Fix dependencies wrt #352927. Fix python.eclass handling wrt #322249.

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

3 files changed, 32 insertions, 17 deletions

diff --git a/media-gfx/gnome-specimen/ChangeLog b/media-gfx/gnome-specimen/ChangeLog
index 6d3b1448a0b4..ca64b9306a2d 100644
--- a/media-gfx/gnome-specimen/ChangeLog
+++ b/media-gfx/gnome-specimen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gnome-specimen
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-specimen/ChangeLog,v 1.5 2010/05/31 15:06:58 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-specimen/ChangeLog,v 1.6 2011/01/30 07:54:17 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-specimen-0.4.ebuild:
+  Fix dependencies wrt #352927. Fix python.eclass handling wrt #322249.
 
   31 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gnome-specimen-0.4.ebuild:
diff --git a/media-gfx/gnome-specimen/Manifest b/media-gfx/gnome-specimen/Manifest
index 39a4596e6cf2..ef79df223cda 100644
--- a/media-gfx/gnome-specimen/Manifest
+++ b/media-gfx/gnome-specimen/Manifest
@@ -1,6 +1,6 @@
 DIST gnome-specimen-0.3.1.tar.gz 213400 RMD160 4bc8e6f336e6241a28792b6941835edf28c01597 SHA1 374c2063b75319b1654fdabdc4e9923f94891f53 SHA256 24798dff4b4dee9c5c3b5f494b49ec805d259ef62eb46f0f7919705591b27a35
 DIST gnome-specimen-0.4.tar.gz 220574 RMD160 4a799bcc59f3cc1b039780759918035c8c70d87b SHA1 7e9980c3063b823de74456a4bf17079198b74455 SHA256 353ef10e647e5d06354dd827a4152a8cb45bf56b2f1c72e449a41e5175880424
 EBUILD gnome-specimen-0.3.1.ebuild 720 RMD160 625d5991315945e6cd612a4af90ee6b949ceba18 SHA1 f42a8e0a30c5dc54ebd5618377f3c91ea381a623 SHA256 384b719b9a38d0b9eecc807d01c70c2e3a0ca62cd5271f0ab8a684a4029ba07d
-EBUILD gnome-specimen-0.4.ebuild 1015 RMD160 e4ed8711deb7db0776ccf925027ff89b5d0afa41 SHA1 cea9830a79e4e679472980133ba8139cc295b9c0 SHA256 66b03ab323ccf01c0d9ed8d850c959054871c4963c64c3660f2b31054b8d3ddd
-MISC ChangeLog 897 RMD160 32efcd3dc2b2e42a01db089ef4ff6bd4545e5291 SHA1 cb02ec844d07f7b5d0361673cf05d2de5bdb9465 SHA256 f9517ad52ddcf30359dd9e453f1ba5db5728dbbb3b2ad9b7efdd2d12fcd35421
+EBUILD gnome-specimen-0.4.ebuild 1101 RMD160 7c790c6978113688d5aa1e577c565e55ebfeba11 SHA1 dc5f94498c852ebcbcd45b6694bd6989d153495d SHA256 02181162236e24a5f8f527813a9ac8962c3fb3d945d4366804be76132e80d1f2
+MISC ChangeLog 1054 RMD160 e0e611ba0d15d1004ca52edd9bc097fb3f9d0dc0 SHA1 5073cc599924ce44f7e3bc8d9462234714fb9029 SHA256 6562f489b00c0152bb02510b60cc898000c1dcf302c0c7d4eacf30d0ede4a624
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
diff --git a/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild b/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild
index 734d3edb2419..b27f13a65834 100644
--- a/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild
+++ b/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild,v 1.2 2010/05/31 15:06:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild,v 1.3 2011/01/30 07:54:17 ssuominen Exp $
+
+EAPI=3
 
 GCONF_DEBUG=no
+PYTHON_DEPEND="2:2.6"
 
-inherit gnome2 multilib python
+inherit gnome2 python
 
 DESCRIPTION="Font preview application"
 HOMEPAGE="http://uwstopia.nl"
@@ -15,30 +18,38 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2
-	dev-python/gnome-python"
+RDEPEND="dev-python/gconf-python
+	dev-python/libgnome-python
+	dev-python/pygtk
+	dev-python/pygobject"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	dev-util/intltool
+	dev-util/pkgconfig
 	sys-devel/gettext"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ln -nfs $(type -P true) py-compile || die "ln failed."
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	rm -f py-compile
+	ln -s $(type -P true) py-compile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	python_convert_shebangs 2 "${D}"/usr/bin/${PN}
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/specimen
+	python_mod_optimize specimen
 	gnome2_pkg_postinst
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/specimen
+	python_mod_cleanup specimen
 	gnome2_pkg_postrm
 }