New version for GNOME 2.26. Migrated to GIO, updated translations.

(Portage version: 2.2_rc31/cvs/Linux x86_64)

4 files changed, 29 insertions, 149 deletions

diff --git a/app-admin/sabayon/ChangeLog b/app-admin/sabayon/ChangeLog
index 564371c38d25..f35bd9214272 100644
--- a/app-admin/sabayon/ChangeLog
+++ b/app-admin/sabayon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/sabayon
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/ChangeLog,v 1.58 2008/11/21 03:36:00 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/ChangeLog,v 1.59 2009/05/02 19:04:00 eva Exp $
+
+*sabayon-2.25.0 (02 May 2009)
+
+  02 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/sabayon-2.20.1-python24-compat.patch, -sabayon-2.20.1-r1.ebuild,
+  -sabayon-2.22.0.ebuild, +sabayon-2.25.0.ebuild:
+  New version for GNOME 2.26. Migrated to GIO, updated translations.
 
   21 Nov 2008; Jeroen Roovers <jer@gentoo.org> sabayon-2.22.1.ebuild:
   Stable for HPPA (bug #246051).
diff --git a/app-admin/sabayon/files/sabayon-2.20.1-python24-compat.patch b/app-admin/sabayon/files/sabayon-2.20.1-python24-compat.patch
deleted file mode 100644
index b7bc353ab8a6..000000000000
--- a/app-admin/sabayon/files/sabayon-2.20.1-python24-compat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: trunk/lib/util.py
-===================================================================
---- trunk/lib/util.py	(révision 903)
-+++ trunk/lib/util.py	(révision 904)
-@@ -115,7 +115,11 @@
-     able to use _(), gettext(), and ngettext() to mark strings for
-     translation."""
-     locale.setlocale (locale.LC_ALL, "")
--    gettext.install (PACKAGE, LOCALEDIR, names=("gettext", "ngettext"))
-+    gettext.install (PACKAGE, LOCALEDIR)
-+    # Python 2.4 compatibility
-+    import __builtin__
-+    __builtin__.__dict__['gettext'] = __builtin__.__dict__['_']
-+    __builtin__.__dict__['ngettext'] = gettext.ngettext
- 
- def random_string (len):
-     """Returns a string with random binary data of the specified length"""
diff --git a/app-admin/sabayon/sabayon-2.20.1-r1.ebuild b/app-admin/sabayon/sabayon-2.20.1-r1.ebuild
deleted file mode 100644
index 32a46ec4655d..000000000000
--- a/app-admin/sabayon/sabayon-2.20.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.20.1-r1.ebuild,v 1.8 2008/06/17 13:23:00 remi Exp $
-
-inherit gnome2 eutils python multilib pam
-
-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 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-# Unfortunately the configure.ac is wildly insufficient, so dependencies have
-# to be got from the RPM .spec file...
-DEPEND="dev-lang/python
-	>=x11-libs/gtk+-2.6.0
-	>=dev-python/pygtk-2.5.3
-	x11-libs/pango
-	dev-python/python-ldap
-	x11-base/xorg-server"
-
-RDEPEND="${DEPEND}
-	virtual/pam
-	dev-python/pyxdg
-	dev-libs/libxml2
-	>=gnome-base/gconf-2.8.1
-	>=dev-python/gnome-python-2.6.0
-	x11-libs/gksu"
-
-DOCS="AUTHORS ChangeLog ISSUES NEWS README TODO"
-
-pkg_setup() {
-	if built_with_use x11-base/xorg-server minimal; then
-		eerror "${PN} needs Xnest, which the minimal USE flag disables."
-		eerror "Please re-emerge x11-base/xorg-xserver with USE=-minimal"
-		die "need x11-base/xorg-xserver built without minimal USE flag"
-	fi
-	if ! built_with_use dev-libs/libxml2 python; then
-		eerror "${PN} needs the python bindings to libxml2."
-		eerror "Please re-emerge dev-libs/libxml2 with USE=python"
-		die "need dev-libs/libxml2 built with python USE flag"
-	fi
-	# dang: I don't think this should happen...  Python is a system dep
-	if ! python_mod_exists gamin; then
-		# app-admin/gamin (0.1.7, at least) lacks "python" USE flag even though
-		# it builds python bindings. That's not good, hackers. That's not good.
-		eerror "${PN} needs the python bindings to gamin. Please re-emerge"
-		eerror "app-admin/gamin, and ensure the python bindings are built."
-		die "need python bindings to app-admin/gamin"
-	fi
-
-	G2CONF="--with-distro=gentoo \
-		--with-prototype-user=${PN}-admin \
-		--enable-console-helper=no \
-		--with-pam-prefix=$(getpam_mod_dir)"
-
-	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_unpack() {
-	gnome2_src_unpack
-
-	# Switch gnomesu to gksu; bug #197865
-	sed -i -e 's/gnomesu/gksu/' admin-tool/sabayon.desktop || die "gksu sed failed"
-	sed -i -e 's/gnomesu/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
-
-	# Add python-2.4 compatibility back (#201276)
-	epatch "${FILESDIR}/${P}-python24-compat.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/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_version
-	python_mod_cleanup
-}
diff --git a/app-admin/sabayon/sabayon-2.22.0.ebuild b/app-admin/sabayon/sabayon-2.25.0.ebuild
index 6af0b4117595..a3dddfc0db69 100644
--- a/app-admin/sabayon/sabayon-2.22.0.ebuild
+++ b/app-admin/sabayon/sabayon-2.25.0.ebuild
@@ -1,53 +1,48 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.22.0.ebuild,v 1.11 2008/11/13 19:40:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/sabayon-2.25.0.ebuild,v 1.1 2009/05/02 19:04:00 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
 
 inherit gnome2 eutils python multilib
-#pam
 
 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 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 # Unfortunately the configure.ac is wildly insufficient, so dependencies have
 # to be got from the RPM .spec file...
-DEPEND="dev-lang/python
+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"
+	x11-base/xorg-server[-minimal]"
 
-#	virtual/pam
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	dev-python/pyxdg
-	dev-libs/libxml2
+	dev-libs/libxml2[python]
 	>=gnome-base/gconf-2.8.1
-	>=dev-python/gnome-python-2.6.0
+	>=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() {
-	if built_with_use x11-base/xorg-server minimal; then
-		eerror "${PN} needs Xnest, which the minimal USE flag disables."
-		eerror "Please re-emerge x11-base/xorg-xserver with USE=-minimal"
-		die "need x11-base/xorg-xserver built without minimal USE flag"
-	fi
-	if ! built_with_use dev-libs/libxml2 python; then
-		eerror "${PN} needs the python bindings to libxml2."
-		eerror "Please re-emerge dev-libs/libxml2 with USE=python"
-		die "need dev-libs/libxml2 built with python USE flag"
-	fi
 	G2CONF="${G2CONF}
+		--disable-static
 		--with-distro=gentoo
 		--with-prototype-user=${PN}-admin
 		--enable-console-helper=no"
-		#--with-pam-prefix=$(getpam_mod_dir)"
 
 	einfo "Adding user '${PN}-admin' as the prototype user"
 	# I think /var/lib/sabayon is the correct directory to use here.
@@ -56,8 +51,8 @@ pkg_setup() {
 	# Should we delete the user/group on unmerge?
 }
 
-src_unpack() {
-	gnome2_src_unpack
+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"
@@ -70,9 +65,7 @@ src_unpack() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/sabayon
+	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"
@@ -85,7 +78,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/sabayon
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/sabayon
 }