Let this compile when python3 is main interpreter, bump to eapi3. Remove old.

(Portage version: 2.1.9.35/cvs/Linux x86_64)

4 files changed, 16 insertions, 176 deletions

diff --git a/app-admin/sabayon/ChangeLog b/app-admin/sabayon/ChangeLog
index ba3fae676672..361a64e880da 100644
--- a/app-admin/sabayon/ChangeLog
+++ b/app-admin/sabayon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sabayon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/ChangeLog,v 1.82 2011/01/19 21:19:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/ChangeLog,v 1.83 2011/01/27 19:24:01 pacho Exp $
+
+  27 Jan 2011; Pacho Ramos <pacho@gentoo.org> -sabayon-2.25.0.ebuild,
+  -sabayon-2.28.1.ebuild, sabayon-2.30.1.ebuild:
+  Let this compile when python3 is main interpreter, bump to eapi3. Remove old.
 
   19 Jan 2011; Markos Chandras <hwoarang@gentoo.org> sabayon-2.30.1.ebuild:
   Stable on amd64 wrt bug #348987
diff --git a/app-admin/sabayon/sabayon-2.25.0.ebuild b/app-admin/sabayon/sabayon-2.25.0.ebuild
deleted file mode 100644
index 5d4b9ed37b47..000000000000
--- a/app-admin/sabayon/sabayon-2.25.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.25.0.ebuild,v 1.8 2010/07/20 01:56:33 jer Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils python multilib
-
-DESCRIPTION="Tool to maintain user profiles in a GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/sabayon/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-# Unfortunately the configure.ac is wildly insufficient, so dependencies have
-# to be got from the RPM .spec file...
-COMMON_DEPEND=">=dev-lang/python-2.4
-	>=x11-libs/gtk+-2.6.0
-	>=dev-python/pygtk-2.5.3
-	>=dev-python/pygobject-2.15
-	x11-libs/pango
-	dev-python/python-ldap
-	x11-base/xorg-server[-minimal]"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyxdg
-	dev-libs/libxml2[python]
-	>=gnome-base/gconf-2.8.1
-	>=dev-python/gconf-python-2.6
-	x11-libs/gksu"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40"
-
-DOCS="AUTHORS ChangeLog ISSUES NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-distro=gentoo
-		--with-prototype-user=${PN}-admin
-		--enable-console-helper=no"
-
-	einfo "Adding user '${PN}-admin' as the prototype user"
-	# I think /var/lib/sabayon is the correct directory to use here.
-	enewgroup ${PN}-admin
-	enewuser ${PN}-admin -1 -1 "/var/lib/sabayon" "${PN}-admin"
-	# Should we delete the user/group on unmerge?
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Switch gnomesu to gksu; bug #197865
-	sed -i 's/Exec=/Exec=gksu /' admin-tool/sabayon.desktop || die "gksu sed failed"
-	sed -i 's/Exec=/Exec=gksu /' admin-tool/sabayon.desktop.in || die "gksu sed failed"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize $(python_get_sitedir)/sabayon
-
-	# unfortunately /etc/gconf is CONFIG_PROTECT_MASK'd
-	elog "To apply Sabayon defaults and mandatory settings to all users, put"
-	elog '    include "$(HOME)/.gconf.path.mandatory"'
-	elog "in /etc/gconf/2/local-mandatory.path and put"
-	elog '    include "$(HOME)/.gconf.path.defaults"'
-	elog "in /etc/gconf/2/local-defaults.path."
-	elog "You can safely create these files if they do not already exist."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/sabayon
-}
diff --git a/app-admin/sabayon/sabayon-2.28.1.ebuild b/app-admin/sabayon/sabayon-2.28.1.ebuild
deleted file mode 100644
index 6ae4a09bb4a9..000000000000
--- a/app-admin/sabayon/sabayon-2.28.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.28.1.ebuild,v 1.5 2010/08/14 17:41:13 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils python multilib
-
-DESCRIPTION="Tool to maintain user profiles in a GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/sabayon/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-# Unfortunately the configure.ac is wildly insufficient, so dependencies have
-# to be got from the RPM .spec file...
-# But the .spec file got removed :/
-COMMON_DEPEND=">=dev-lang/python-2.4
-	>=x11-libs/gtk+-2.6.0
-	>=dev-python/pygtk-2.5.3
-	>=dev-python/pygobject-2.15
-	x11-libs/pango
-	dev-python/python-ldap
-	x11-base/xorg-server[kdrive]"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyxdg
-	dev-libs/libxml2[python]
-	>=gnome-base/gconf-2.8.1
-	>=dev-python/libbonobo-python-2.6
-	>=dev-python/gconf-python-2.6
-	x11-libs/gksu"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40"
-
-DOCS="AUTHORS ChangeLog ISSUES NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-distro=gentoo
-		--with-prototype-user=${PN}-admin
-		--enable-console-helper=no"
-
-	einfo "Adding user '${PN}-admin' as the prototype user"
-	# I think /var/lib/sabayon is the correct directory to use here.
-	enewgroup ${PN}-admin
-	enewuser ${PN}-admin -1 -1 "/var/lib/sabayon" "${PN}-admin"
-	# Should we delete the user/group on unmerge?
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Switch gnomesu to gksu; bug #197865
-	sed -i 's/Exec=/Exec=gksu /' admin-tool/sabayon.desktop || die "gksu sed failed"
-	sed -i 's/Exec=/Exec=gksu /' admin-tool/sabayon.desktop.in || die "gksu sed failed"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize $(python_get_sitedir)/sabayon
-
-	# unfortunately /etc/gconf is CONFIG_PROTECT_MASK'd
-	elog "To apply Sabayon defaults and mandatory settings to all users, put"
-	elog '    include "$(HOME)/.gconf.path.mandatory"'
-	elog "in /etc/gconf/2/local-mandatory.path and put"
-	elog '    include "$(HOME)/.gconf.path.defaults"'
-	elog "in /etc/gconf/2/local-defaults.path."
-	elog "You can safely create these files if they do not already exist."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/sabayon
-}
diff --git a/app-admin/sabayon/sabayon-2.30.1.ebuild b/app-admin/sabayon/sabayon-2.30.1.ebuild
index c0a5bc8326b4..02ac199b2ad8 100644
--- a/app-admin/sabayon/sabayon-2.30.1.ebuild
+++ b/app-admin/sabayon/sabayon-2.30.1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.30.1.ebuild,v 1.3 2011/01/19 21:19:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.30.1.ebuild,v 1.4 2011/01/27 19:24:01 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.4"
 
 inherit gnome2 eutils python multilib
 
 DESCRIPTION="Tool to maintain user profiles in a GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/sabayon/"
+HOMEPAGE="http://live.gnome.org/Sabayon/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,8 +19,7 @@ IUSE=""
 # Unfortunately the configure.ac is wildly insufficient, so dependencies have
 # to be got from the RPM .spec file...
 # But the .spec file got removed :/
-COMMON_DEPEND=">=dev-lang/python-2.4
-	>=x11-libs/gtk+-2.6.0
+COMMON_DEPEND=">=x11-libs/gtk+-2.6.0
 	>=dev-python/pygtk-2.16
 	>=dev-python/pygobject-2.15
 	app-admin/pessulus
@@ -39,9 +39,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	>=app-text/gnome-doc-utils-0.17.3"
 
-DOCS="AUTHORS ChangeLog ISSUES NEWS README TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog ISSUES NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-static
 		--with-distro=gentoo
@@ -53,6 +52,7 @@ pkg_setup() {
 	enewgroup ${PN}-admin
 	enewuser ${PN}-admin -1 -1 "/var/lib/sabayon" "${PN}-admin"
 	# Should we delete the user/group on unmerge?
+	python_set_active_version 2
 }
 
 src_prepare() {
@@ -65,6 +65,8 @@ src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	python_convert_shebangs -r 2 .
 }
 
 src_install() {
@@ -74,7 +76,7 @@ src_install() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_mod_optimize $(python_get_sitedir)/sabayon
+	python_mod_optimize sabayon
 
 	# unfortunately /etc/gconf is CONFIG_PROTECT_MASK'd
 	elog "To apply Sabayon defaults and mandatory settings to all users, put"
@@ -87,5 +89,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/sabayon
+	python_mod_cleanup sabayon
 }