New version for GNOME-2.22. Gentoo support updated, various bug fixes.

Package-Manager: portage-2.1.4.4

3 files changed, 114 insertions, 6 deletions

diff --git a/app-admin/sabayon/ChangeLog b/app-admin/sabayon/ChangeLog
index 4f4763b24bd0..b27d92272321 100644
--- a/app-admin/sabayon/ChangeLog
+++ b/app-admin/sabayon/ChangeLog
@@ -1,6 +1,12 @@
 # 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.40 2008/02/03 11:43:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sabayon/ChangeLog,v 1.41 2008/03/26 22:06:11 eva Exp $
+
+*sabayon-2.22.0 (26 Mar 2008)
+
+  26 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +sabayon-2.22.0.ebuild:
+  New version for GNOME-2.22. Gentoo support updated, various bug fixes.
 
   03 Feb 2008; Raúl Porcel <armin76@gentoo.org> sabayon-2.20.1-r1.ebuild:
   alpha/ia64/sparc stable wrt #208366
diff --git a/app-admin/sabayon/Manifest b/app-admin/sabayon/Manifest
index 43f1fdd881b4..0dacebdf2344 100644
--- a/app-admin/sabayon/Manifest
+++ b/app-admin/sabayon/Manifest
@@ -3,13 +3,15 @@ Hash: SHA1
 
 AUX sabayon-2.20.1-python24-compat.patch 718 RMD160 993683108bea834958ed90f5b1dee0c432766e1a SHA1 89f20593afefb630762d25e94915b23f05f6b5c1 SHA256 9eb73aa640fd6207f852e469e9c7dabe57d9ae260219da3b637caee589609105
 DIST sabayon-2.20.1.tar.bz2 658273 RMD160 bca7cf3c6b60071b37671639c8d8ae30c95afa9b SHA1 2937960a732c086019c3fdea6a02b901dbca0b7a SHA256 1ad849dcedb2a9a79f4c2994115a748f429ba0dc8d540f31da1333f26ab25c83
+DIST sabayon-2.22.0.tar.bz2 672518 RMD160 e7ba43e1ab4911a4fbe8dc4d8890496d11dcb7e5 SHA1 3bad732c3bee4d75644cbbab0e767e1851537e57 SHA256 adf34e2d69a067668bb8a5c3066b28192db4ea0e000b98a54209f9fb3a069fcb
 EBUILD sabayon-2.20.1-r1.ebuild 3321 RMD160 7e477d059c9b620808f4a8c1c405e548789cea7f SHA1 a912e6e87b41e58001826b755600f1f91296f241 SHA256 fe5e8aab8154139f9116806113f99cf514814a52a82e4d038c2b1ee85a67ce41
-MISC ChangeLog 4879 RMD160 1612f8016bab5707d9af3b723d45017f466b65c0 SHA1 13f17ec5dbd07c93338b8f8345a042ad4c21939d SHA256 6974180aaa4e46228bf9da65c23d1c16d37752d35c870f8043985b186f409690
+EBUILD sabayon-2.22.0.ebuild 3298 RMD160 bf1450eb03c4ddc83733bc01dc0b79f80ca76c20 SHA1 4a569cf273adbaa61df204826292f9a5bd230044 SHA256 6b5adfefa8d153f214448706737e3b6874714e1091e9a954ad2f8a5b7632f4e2
+MISC ChangeLog 5060 RMD160 bdf266252bb9db6a105d1ef619dc98ba193667e9 SHA1 7316d49a0f19ef103e64027f5082862274d0e337 SHA256 415f71c6e1a297024564d538ba0c282247bf2940b4d481c04d32a38e731f266d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfUAPkACgkQkeYb6olFHJeNMQCgh/RQMT2WChFZ0qM++TOkMuMM
-BpEAoPc64d62l2XELwq7KRJbq3LuUChy
-=FGjL
+iD8DBQFH6sjc1fmVwcYIWAYRAmTgAJ0XQuVO41SOgmJ7TeipKBmBiRi/hwCgt7io
+wTSoLI6eV0Rc2ISRoX3/qBE=
+=wY/v
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sabayon/sabayon-2.22.0.ebuild b/app-admin/sabayon/sabayon-2.22.0.ebuild
new file mode 100644
index 000000000000..49b9dde84deb
--- /dev/null
+++ b/app-admin/sabayon/sabayon-2.22.0.ebuild
@@ -0,0 +1,100 @@
+# 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.22.0.ebuild,v 1.1 2008/03/26 22:06:11 eva 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
+	app-admin/gamin
+	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="${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 '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_version
+	python_mod_optimize "${ROOT}"/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 /usr/$(get_libdir)/python${PYVER}/site-packages/sabayon
+}