| 1 |
pacho 11/01/27 19:24:01 |
| 2 |
|
| 3 |
Modified: ChangeLog sabayon-2.30.1.ebuild |
| 4 |
Removed: sabayon-2.28.1.ebuild sabayon-2.25.0.ebuild |
| 5 |
Log: |
| 6 |
Let this compile when python3 is main interpreter, bump to eapi3. Remove old. |
| 7 |
|
| 8 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.83 app-admin/sabayon/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sabayon/ChangeLog?rev=1.83&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sabayon/ChangeLog?rev=1.83&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sabayon/ChangeLog?r1=1.82&r2=1.83 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/sabayon/ChangeLog,v |
| 20 |
retrieving revision 1.82 |
| 21 |
retrieving revision 1.83 |
| 22 |
diff -u -r1.82 -r1.83 |
| 23 |
--- ChangeLog 19 Jan 2011 21:19:13 -0000 1.82 |
| 24 |
+++ ChangeLog 27 Jan 2011 19:24:01 -0000 1.83 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for app-admin/sabayon |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/ChangeLog,v 1.82 2011/01/19 21:19:13 hwoarang Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/ChangeLog,v 1.83 2011/01/27 19:24:01 pacho Exp $ |
| 30 |
+ |
| 31 |
+ 27 Jan 2011; Pacho Ramos <pacho@g.o> -sabayon-2.25.0.ebuild, |
| 32 |
+ -sabayon-2.28.1.ebuild, sabayon-2.30.1.ebuild: |
| 33 |
+ Let this compile when python3 is main interpreter, bump to eapi3. Remove old. |
| 34 |
|
| 35 |
19 Jan 2011; Markos Chandras <hwoarang@g.o> sabayon-2.30.1.ebuild: |
| 36 |
Stable on amd64 wrt bug #348987 |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 app-admin/sabayon/sabayon-2.30.1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sabayon/sabayon-2.30.1.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sabayon/sabayon-2.30.1.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sabayon/sabayon-2.30.1.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: sabayon-2.30.1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.30.1.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- sabayon-2.30.1.ebuild 19 Jan 2011 21:19:13 -0000 1.3 |
| 53 |
+++ sabayon-2.30.1.ebuild 27 Jan 2011 19:24:01 -0000 1.4 |
| 54 |
@@ -1,14 +1,15 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.30.1.ebuild,v 1.3 2011/01/19 21:19:13 hwoarang Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.30.1.ebuild,v 1.4 2011/01/27 19:24:01 pacho Exp $ |
| 59 |
|
| 60 |
-EAPI="2" |
| 61 |
+EAPI="3" |
| 62 |
GCONF_DEBUG="no" |
| 63 |
+PYTHON_DEPEND="2:2.4" |
| 64 |
|
| 65 |
inherit gnome2 eutils python multilib |
| 66 |
|
| 67 |
DESCRIPTION="Tool to maintain user profiles in a GNOME desktop" |
| 68 |
-HOMEPAGE="http://www.gnome.org/projects/sabayon/" |
| 69 |
+HOMEPAGE="http://live.gnome.org/Sabayon/" |
| 70 |
|
| 71 |
LICENSE="GPL-2" |
| 72 |
SLOT="0" |
| 73 |
@@ -18,8 +19,7 @@ |
| 74 |
# Unfortunately the configure.ac is wildly insufficient, so dependencies have |
| 75 |
# to be got from the RPM .spec file... |
| 76 |
# But the .spec file got removed :/ |
| 77 |
-COMMON_DEPEND=">=dev-lang/python-2.4 |
| 78 |
- >=x11-libs/gtk+-2.6.0 |
| 79 |
+COMMON_DEPEND=">=x11-libs/gtk+-2.6.0 |
| 80 |
>=dev-python/pygtk-2.16 |
| 81 |
>=dev-python/pygobject-2.15 |
| 82 |
app-admin/pessulus |
| 83 |
@@ -39,9 +39,8 @@ |
| 84 |
>=dev-util/intltool-0.40 |
| 85 |
>=app-text/gnome-doc-utils-0.17.3" |
| 86 |
|
| 87 |
-DOCS="AUTHORS ChangeLog ISSUES NEWS README TODO" |
| 88 |
- |
| 89 |
pkg_setup() { |
| 90 |
+ DOCS="AUTHORS ChangeLog ISSUES NEWS README TODO" |
| 91 |
G2CONF="${G2CONF} |
| 92 |
--disable-static |
| 93 |
--with-distro=gentoo |
| 94 |
@@ -53,6 +52,7 @@ |
| 95 |
enewgroup ${PN}-admin |
| 96 |
enewuser ${PN}-admin -1 -1 "/var/lib/sabayon" "${PN}-admin" |
| 97 |
# Should we delete the user/group on unmerge? |
| 98 |
+ python_set_active_version 2 |
| 99 |
} |
| 100 |
|
| 101 |
src_prepare() { |
| 102 |
@@ -65,6 +65,8 @@ |
| 103 |
# disable pyc compiling |
| 104 |
mv py-compile py-compile.orig |
| 105 |
ln -s $(type -P true) py-compile |
| 106 |
+ |
| 107 |
+ python_convert_shebangs -r 2 . |
| 108 |
} |
| 109 |
|
| 110 |
src_install() { |
| 111 |
@@ -74,7 +76,7 @@ |
| 112 |
|
| 113 |
pkg_postinst() { |
| 114 |
gnome2_pkg_postinst |
| 115 |
- python_mod_optimize $(python_get_sitedir)/sabayon |
| 116 |
+ python_mod_optimize sabayon |
| 117 |
|
| 118 |
# unfortunately /etc/gconf is CONFIG_PROTECT_MASK'd |
| 119 |
elog "To apply Sabayon defaults and mandatory settings to all users, put" |
| 120 |
@@ -87,5 +89,5 @@ |
| 121 |
|
| 122 |
pkg_postrm() { |
| 123 |
gnome2_pkg_postrm |
| 124 |
- python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/sabayon |
| 125 |
+ python_mod_cleanup sabayon |
| 126 |
} |
Archives