gnome-base/gnome-session: restore cinnamon support, enable optional systemd support

5 files changed, 24 insertions, 22 deletions

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 1c2d4e3f..79cc7d18 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,7 +1,7 @@
-AUX 10-user-dirs-update-gnome 264 RMD160 92eba5fafd59d6cf051138acd247127b7afcc32b SHA1 8a75d6f0cc0a2ab05ee0542cf0ed921c761c9fca SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931
-AUX 15-xdg-data-gnome 227 RMD160 b42bf6342d18a00fe38b49264ef8a43c8ce87af9 SHA1 a365c288d94015e55c36bd25623b516ed27db352 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd
+AUX 10-user-dirs-update-gnome-r1 299 RMD160 c76707fdce421431884beeabd60d5f0ce7716d26 SHA1 6adf982b43d2eeaa86622ecfd6b5f70eb772a9c2 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5
+AUX 15-xdg-data-gnome-r1 262 RMD160 6305f879183ecafae77d4cfd7bf035d44d801924 SHA1 99c5eb8187a608ab0b8cffe68eedb10e73dc1968 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24
 AUX Gnome 2391 RMD160 dee0875327352ae70f71b73257deb8ccc5bbc3ba SHA1 9d6f5c7c4f7aee36ea64b30c57b9cb9818664c42 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3
 AUX defaults.list 14505 RMD160 1e15a5166728493f21987b530fafcae735a47a3c SHA1 927a883d98b7dbbed75f4480c284e0b0431ab000 SHA256 efe30d8f5be448661870fec6a5e49ae98ecfb73f06ee4ab0926990cb15223354
 DIST gnome-session-3.3.92.tar.xz 711516 RMD160 b273cc5653aa65b1ce5ddd064a8fd7b8f5bfa0fe SHA1 aae18611aa33833047da7b67eee0fe0b741f4b38 SHA256 d7bc5a4d54981040bdd62cfec9ccef4ff266e24ba10d0015fb6591094039051f
-EBUILD gnome-session-3.3.92.ebuild 3072 RMD160 1e377ea9368624e7caef15410a608f7493d2a081 SHA1 d8f16da60d197c8838b3e9761eacf312179817a6 SHA256 82f3564107e568ec3be6d0bb1c5370d63450e0b1c896ad04b2a437c0a9a63d57
-EBUILD gnome-session-9999.ebuild 3072 RMD160 1e377ea9368624e7caef15410a608f7493d2a081 SHA1 d8f16da60d197c8838b3e9761eacf312179817a6 SHA256 82f3564107e568ec3be6d0bb1c5370d63450e0b1c896ad04b2a437c0a9a63d57
+EBUILD gnome-session-3.3.92-r1.ebuild 3059 RMD160 38ddb5a7b87abfb6f842cc4f4e526d3f2ea86e8a SHA1 683bfde0c8fc59755f91fc05130c8a2cb360bbab SHA256 e73bd5910ae660c0aee55bc003b8ffb21cad60eaba2bda1e21fcc8b558a9a24a
+EBUILD gnome-session-9999.ebuild 3059 RMD160 38ddb5a7b87abfb6f842cc4f4e526d3f2ea86e8a SHA1 683bfde0c8fc59755f91fc05130c8a2cb360bbab SHA256 e73bd5910ae660c0aee55bc003b8ffb21cad60eaba2bda1e21fcc8b558a9a24a
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
index f909d44d..61fd08c5 100644
--- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome
+++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
@@ -3,7 +3,7 @@
 # Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
 # That file is read by glib to get XDG_PICTURES_DIR, etc
 
-if [ "$DESKTOP_SESSION" = "gnome" ]; then
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
 	if type xdg-user-dirs-update &>/dev/null; then
 		xdg-user-dirs-update
 	fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
index e62f3e1c..5eaa6985 100644
--- a/gnome-base/gnome-session/files/15-xdg-data-gnome
+++ b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ "$DESKTOP_SESSION" = "gnome" ]; then
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
 	if [ -z "$XDG_DATA_DIRS" ]; then
 		export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
 	else
diff --git a/gnome-base/gnome-session/gnome-session-3.3.92.ebuild b/gnome-base/gnome-session/gnome-session-3.3.92-r1.ebuild
index 0da5e6b8..6881c968 100644
--- a/gnome-base/gnome-session/gnome-session-3.3.92.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.3.92-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1.ebuild,v 1.4 2011/01/03 11:41:21 pacho Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="doc ipv6 elibc_FreeBSD"
+IUSE="doc elibc_FreeBSD ipv6 systemd"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -55,7 +55,8 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-settings-daemon
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=x11-themes/gnome-themes-standard-2.91.92
-	sys-apps/dbus[X]"
+	sys-apps/dbus[X]
+	systemd? ( >=sys-apps/systemd-31 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=sys-devel/gettext-0.10.40
@@ -73,10 +74,10 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-deprecation-flags
 		--disable-schemas-compile
-		--disable-systemd
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable doc docbook-docs)
-		$(use_enable ipv6)"
+		$(use_enable ipv6)
+		$(use_enable systemd)"
 	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
@@ -93,10 +94,10 @@ src_install() {
 
 	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/15-xdg-data-gnome"
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
 
 	# This should be done here as discussed in bug #270852
-	doexe "${FILESDIR}/10-user-dirs-update-gnome"
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
 }
 
 pkg_postinst() {
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 0da5e6b8..6881c968 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1.ebuild,v 1.4 2011/01/03 11:41:21 pacho Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="doc ipv6 elibc_FreeBSD"
+IUSE="doc elibc_FreeBSD ipv6 systemd"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -55,7 +55,8 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-settings-daemon
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=x11-themes/gnome-themes-standard-2.91.92
-	sys-apps/dbus[X]"
+	sys-apps/dbus[X]
+	systemd? ( >=sys-apps/systemd-31 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=sys-devel/gettext-0.10.40
@@ -73,10 +74,10 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-deprecation-flags
 		--disable-schemas-compile
-		--disable-systemd
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable doc docbook-docs)
-		$(use_enable ipv6)"
+		$(use_enable ipv6)
+		$(use_enable systemd)"
 	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
@@ -93,10 +94,10 @@ src_install() {
 
 	dodir /etc/X11/xinit/xinitrc.d/
 	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/15-xdg-data-gnome"
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
 
 	# This should be done here as discussed in bug #270852
-	doexe "${FILESDIR}/10-user-dirs-update-gnome"
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
 }
 
 pkg_postinst() {