1 |
ssuominen 11/01/30 07:54:17 |
2 |
|
3 |
Modified: ChangeLog gnome-specimen-0.4.ebuild |
4 |
Log: |
5 |
Fix dependencies wrt #352927. Fix python.eclass handling wrt #322249. |
6 |
|
7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 media-gfx/gnome-specimen/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gnome-specimen/ChangeLog?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gnome-specimen/ChangeLog?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gnome-specimen/ChangeLog?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gnome-specimen/ChangeLog,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- ChangeLog 31 May 2010 15:06:58 -0000 1.5 |
23 |
+++ ChangeLog 30 Jan 2011 07:54:17 -0000 1.6 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-gfx/gnome-specimen |
26 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-specimen/ChangeLog,v 1.5 2010/05/31 15:06:58 arfrever Exp $ |
28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-specimen/ChangeLog,v 1.6 2011/01/30 07:54:17 ssuominen Exp $ |
30 |
+ |
31 |
+ 30 Jan 2011; Samuli Suominen <ssuominen@g.o> |
32 |
+ gnome-specimen-0.4.ebuild: |
33 |
+ Fix dependencies wrt #352927. Fix python.eclass handling wrt #322249. |
34 |
|
35 |
31 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
36 |
gnome-specimen-0.4.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.3 media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild?rev=1.3&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild?rev=1.3&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild?r1=1.2&r2=1.3 |
45 |
|
46 |
Index: gnome-specimen-0.4.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gnome-specimen/gnome-specimen-0.4.ebuild,v |
49 |
retrieving revision 1.2 |
50 |
retrieving revision 1.3 |
51 |
diff -u -r1.2 -r1.3 |
52 |
--- gnome-specimen-0.4.ebuild 31 May 2010 15:06:58 -0000 1.2 |
53 |
+++ gnome-specimen-0.4.ebuild 30 Jan 2011 07:54:17 -0000 1.3 |
54 |
@@ -1,10 +1,13 @@ |
55 |
-# Copyright 1999-2010 Gentoo Foundation |
56 |
+# Copyright 1999-2011 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $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 $ |
59 |
+# $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 $ |
60 |
+ |
61 |
+EAPI=3 |
62 |
|
63 |
GCONF_DEBUG=no |
64 |
+PYTHON_DEPEND="2:2.6" |
65 |
|
66 |
-inherit gnome2 multilib python |
67 |
+inherit gnome2 python |
68 |
|
69 |
DESCRIPTION="Font preview application" |
70 |
HOMEPAGE="http://uwstopia.nl" |
71 |
@@ -15,30 +18,38 @@ |
72 |
KEYWORDS="~amd64 ~x86" |
73 |
IUSE="" |
74 |
|
75 |
-RDEPEND=">=gnome-base/gconf-2 |
76 |
- dev-python/gnome-python" |
77 |
+RDEPEND="dev-python/gconf-python |
78 |
+ dev-python/libgnome-python |
79 |
+ dev-python/pygtk |
80 |
+ dev-python/pygobject" |
81 |
DEPEND="${RDEPEND} |
82 |
- dev-util/pkgconfig |
83 |
dev-util/intltool |
84 |
+ dev-util/pkgconfig |
85 |
sys-devel/gettext" |
86 |
|
87 |
-src_unpack() { |
88 |
- unpack ${A} |
89 |
- cd "${S}" |
90 |
- ln -nfs $(type -P true) py-compile || die "ln failed." |
91 |
+pkg_setup() { |
92 |
+ python_set_active_version 2 |
93 |
+ python_pkg_setup |
94 |
+} |
95 |
+ |
96 |
+src_prepare() { |
97 |
+ rm -f py-compile |
98 |
+ ln -s $(type -P true) py-compile |
99 |
} |
100 |
|
101 |
src_install() { |
102 |
- emake DESTDIR="${D}" install || die "emake install failed." |
103 |
+ emake DESTDIR="${D}" install || die |
104 |
dodoc AUTHORS ChangeLog NEWS README TODO |
105 |
+ |
106 |
+ python_convert_shebangs 2 "${D}"/usr/bin/${PN} |
107 |
} |
108 |
|
109 |
pkg_postinst() { |
110 |
- python_mod_optimize $(python_get_sitedir)/specimen |
111 |
+ python_mod_optimize specimen |
112 |
gnome2_pkg_postinst |
113 |
} |
114 |
|
115 |
pkg_postrm() { |
116 |
- python_mod_cleanup $(python_get_sitedir)/specimen |
117 |
+ python_mod_cleanup specimen |
118 |
gnome2_pkg_postrm |
119 |
} |