Version bump.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 120 insertions, 9 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 4bb29d404078..f61a2558172f 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.311 2012/05/13 23:36:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.312 2012/05/24 05:18:25 tetromino Exp $
+
+*gnome-session-3.4.2.1 (24 May 2012)
+
+  24 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-session-3.4.2.1.ebuild:
+  Version bump.
 
 *gnome-session-3.4.1 (13 May 2012)
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 9b224b7d80d1..318e407f4790 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -17,19 +17,21 @@ AUX gnome-session-3.2.1-kernel-boot-line.patch 3611 RMD160 3b3b07935ea4428c17dc8
 DIST gnome-session-2.32.1.tar.bz2 774842 RMD160 c579bf197b38c8df7df14c751c056be86695a287 SHA1 7d4c7652247606a972a2f1e50a6a6339809a5b9e SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
 DIST gnome-session-3.2.1.tar.xz 700852 RMD160 ce31f04f2ced486f0bca59e7e64cf1194f401eff SHA1 a330cb69c3a1126ed57d36a58004987275e8982a SHA256 a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3
 DIST gnome-session-3.4.1.tar.xz 710692 RMD160 77fc346d49ebfc2960313a03a61d3a7ddf12e987 SHA1 9351762ce92f65fb31f6b17d03104aac5c7b3553 SHA256 0ad29c2c3158b9e0109d3463e587fe09f312b810a9db51775750b9af8ce457aa
+DIST gnome-session-3.4.2.1.tar.xz 725144 RMD160 9f983e55ef65eb7ecbe80280b2524d81ff7d5363 SHA1 18870d115e60f9e2e1e097b934138cc2c749c4bd SHA256 2fbcf10d4ad8648197fefde2052abd8bf16b827781a974f59ac118e7dd0db433
 EBUILD gnome-session-2.32.1-r3.ebuild 2879 RMD160 e5b904dfdc5ab71a4985195249fc8378929279b3 SHA1 75c2be2b5777296e6769f82761be282ac127432a SHA256 7265df3617ac5ef61b7c87967c650156d20184f210ab82c83c3f321f1a8c6976
 EBUILD gnome-session-3.2.1-r1.ebuild 3169 RMD160 0dccee533b8460abad30ffb6f349ba19d6719c80 SHA1 2b3a651a8d15ea8d9e3990dc08eca9b77f589c34 SHA256 91cd9a0d46da5332efae96ff346e0117892c4bfa0c8371de9c1c6055ff1abd02
 EBUILD gnome-session-3.4.1.ebuild 3062 RMD160 ca17f5eff2a2c8d3ffd5e3ec7cb875ad610c396d SHA1 66281390c53b1fe52eaac71e15ffba03a8070cb6 SHA256 13dfbed680d75c324746e3da3c6c98935575e6dc9d3d41cba9f7e2933d44c7fa
-MISC ChangeLog 45839 RMD160 f46647abb45fb02031af660dca45d12ad8489c38 SHA1 64055e09e31030725352c1042b374aef0e9567bf SHA256 cf7bc7c425e141dccda9a560545c1d97a6e373ccc87adeb00de6875301e34887
+EBUILD gnome-session-3.4.2.1.ebuild 3064 RMD160 7e0887ce12021240a89a60540be2240e85a315fb SHA1 7c22cdc9cab3a85be2ae9738ad8848255c199ed8 SHA256 c4abe9f9cd9505f24cae85cda70825042730b2637d8e270388b2233888ad2554
+MISC ChangeLog 45986 RMD160 aaabb8820c2d14872b597746f44265dc5905c2c4 SHA1 c09f42949fbb0d02aa7a14b8db028ef3f0bda347 SHA256 2c422b0de9a7da9b87ab250de0f49c05aeb9254bec46f2039004725737250562
 MISC metadata.xml 297 RMD160 e0cac70c248fbefb0d5b99c3d81a5a9106bdf471 SHA1 057a77a3c19d17e331a647fd9abb81759b124baa SHA256 ac9d892e216a4337464b515b61b9fb3830f342e90c10764e6e06ba1dd5a56977
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsEVnAAoJEJ0WA1zPCt1hDL0IAKdatrzjNbKPDM+U//9SCg0e
-v3xlwqXaDpVU5hGuF+/Y/qJF53W+pkZb6FeNA3vTHgEqzIz11jZTzog+a+UNZwTt
-FBpX7R/wm0qe0BZ9LI5X+VxCD99SI/GdOlfCQX+FLSZnQC1LLQJP67fRwpX5eUbQ
-xGiaF2SgAKFoucAWEDQ+xKRpdjs81pCGBM1VampLbYxwHQ5ZxWPV8sUMLCrqUddv
-oPkK+RBqWTyqQx/YFms+t4SwJIZiPN8Pjnzh2ZwqdLty264eKyxVj+281vMvSi/y
-yrDEYjoUdGoNAlcVxi8a7ySW8fyLVBiURjVloNTEp8OQaLfW/C/cX7kStnWA8kU=
-=hWpy
+iQEcBAEBAgAGBQJPvcSmAAoJEJ0WA1zPCt1hvKEH/2OF3lUiMwkU2ZDMVKRbmN/5
+hmurbxWICEh220nz7Tsd6GE2YwXhC1LiGhCWFRfIHBo6sejDE+q0KDEYXJxo1nrw
+K8kOH3K7BJ2IO76hjF43XtDcADChFgq2J5fwI3tsrwIAR0S+OszaNYHLaR3Sjdzj
+umSzOmpatLRsSNPhdfB0Safz57Fb4LEHZuE7KoNcUILn0N10uJy7mK+Biki5JfHI
+J6FcxKqvVpumQFcXEZHFrxf0E50J3HgVCpaShW2yjlziJwgiYaO0vw+ti99e0+sB
+DqaGsQ6EZr9LTuAfaboO7YGhn9P1s1y7tSOKeSvLGjqPgij1C2ZZyLylRYomcZE=
+=/71V
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-3.4.2.1.ebuild b/gnome-base/gnome-session/gnome-session-3.4.2.1.ebuild
new file mode 100644
index 000000000000..fb9a129e80dd
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.4.2.1.ebuild
@@ -0,0 +1,103 @@
+# 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-3.4.2.1.ebuild,v 1.1 2012/05/24 05:18:25 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+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_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# gdk-pixbuf used in the inhibit dialog
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.90.7:3
+	>=dev-libs/json-glib-0.10
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2:2
+	>=sys-power/upower-0.9.0
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	x11-apps/xdpyinfo"
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
+# gnome-themes-standard is needed for the failwhale dialog themeing
+# sys-apps/dbus[X] is needed for session management
+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]
+	systemd? ( >=sys-apps/systemd-38 )
+	!systemd? ( sys-auth/consolekit )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )"
+# gnome-common needed for eautoreconf
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-deprecation-flags
+		--disable-schemas-compile
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)
+		$(use_enable systemd)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	dodir /usr/share/gnome/applications/
+	insinto /usr/share/gnome/applications/
+	doins "${FILESDIR}/defaults.list"
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+}