Do not install two doc directories, bug #263280. Clean up old revision.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 19 insertions, 73 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 6b91736f8c78..eab8654c541a 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.235 2009/05/14 05:39:31 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.236 2009/05/23 14:54:11 eva Exp $
+
+  23 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-session-2.22.3.ebuild, gnome-session-2.26.1.ebuild:
+  Do not install two doc directories, bug #263280. Clean up old revision.
 
   14 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
   gnome-session-2.26.1.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 6129ca8a0a5c..c7ba4c5c4600 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Gnome 2457 RMD160 71b084bf46db8f1551b21b843e5ee12015bc836e SHA1 7b6f633d6000554977f69869aae2b817166f59a2 SHA256 347b9e364607b25637205c3984a3662518395ca2e200578e6b976a6c73ad63a7
 AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc94534491f6c0a0c772265268386c SHA1 c17b429a1d0b1d7f043ae1d6c88ab4f7894c983d SHA256 cbbd369938ac60baa255ef58d642014d1318169631bfbd3cb042efcd560187f5
 AUX gnome-session-2.19.2-no-asserts.patch 865 RMD160 c69115c8a6e0821d361c6354c6c05e9cbcdbcbdb SHA1 b3aa320808ac63eef91e5dcac17c3ebe94a0f684 SHA256 84dfd878da8933aed9b9a2d1feed47a7fdf254db542b29b5c6dcc81e8d42f122
@@ -10,8 +13,14 @@ DIST gnome-session-2.24.3.tar.bz2 792300 RMD160 2cd9fb8435f452873ca8bd34fd51276d
 DIST gnome-session-2.26.1-gentoo-patches.tar.bz2 6060 RMD160 acbb15102d5e2c6a17e9cd69450085bf233caf69 SHA1 aceab28c15bfe9cb18c93cc2d4fd0a7213374f1a SHA256 9189f35565a6e0b2b6a218e3eee47db0c40cff091172ab25220df9a9ee5020a8
 DIST gnome-session-2.26.1.tar.bz2 835266 RMD160 d4eb6a0fc639a257645b2e4138055d9e1bd9f9a6 SHA1 3c8dc68f197c6b5a7d30e3ce04e65954bfe12070 SHA256 35e304ec42ed69a2b98377fd7cfac19fa00ca53bb5d6307094ebf077c00dbc32
 EBUILD gnome-session-2.22.3-r1.ebuild 2115 RMD160 6c9fbb9072b38fb9e162048f6c30706d03fe5f27 SHA1 a21447d9e69e27761089f98f272910e7ce16a2ed SHA256 da10117a817ea92d8be4371fb263d7ed2839c794f5274a6f03d2d45f353e0abe
-EBUILD gnome-session-2.22.3.ebuild 1873 RMD160 1ddd0c4904bc3e298eb10928e938b13559289ed1 SHA1 2996093608be172e0eacbeeb6a6a649d3bd6e460 SHA256 ab49e8b6ecc73a4186d1ced5ef9b0689feb9ad0a0194990da738b5eedd08ff2d
 EBUILD gnome-session-2.24.3.ebuild 1948 RMD160 5897beb4dae8fc6f363fdf1c87c0b12b75b6634e SHA1 63c1d8ab8e21d94b465ada3c5db54225aac66f31 SHA256 51bb5a07493cff28b99a0affd796d53ea3561ea697b456b213ca935e9eea7c41
-EBUILD gnome-session-2.26.1.ebuild 2063 RMD160 5fe857aaac2d5ef123126d492379c5ce12dd8980 SHA1 9eb1610d0e2017cdd6566d7a2b0d3bb09f6f0750 SHA256 a1199954622af768f84e8fb4f6bc2692bd9c1577b16daf45c514dc0da8d75a7f
-MISC ChangeLog 32394 RMD160 152aa7c29e8e5d144ba632807972d98bf512b818 SHA1 3b9bfd5b4a289a22a1af01359889e821ce540600 SHA256 0734418dcf1e2c27b6e1463b3bec35d010cbffc785802feb72d6d6499e1fe88c
+EBUILD gnome-session-2.26.1.ebuild 2090 RMD160 8144f7128c3344f91128e6c555670bd130b10ee3 SHA1 72e0cb1fa784fc6e38600c34c8c1d0e050356a6d SHA256 b01208a63898c9810c92381dc79b693b026e822399ef4033c456c0fc5b19e554
+MISC ChangeLog 32579 RMD160 bb0204f89f7a39ab66ef94425f1a6b7aa44d7012 SHA1 bd2ca3e5e9cefd19a3d026cea5f75f85fb2d4e7b SHA256 d936c995165c3de16df8856049c647b5ff35b47503d0215ce227a1079271da7b
 MISC metadata.xml 269 RMD160 6bbdafdb02cf28eb4f772d7e330519eb07ab4dcb SHA1 18a2628db0509bf3ccd54f626f3bdd4b7c3a7a43 SHA256 a735ba6a51fe0c18552eda7327e431b231fd7b590a82ba9f1cc32b0c1a38e50e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoYDhgACgkQ1fmVwcYIWAYfwwCg0YRYmYN6P+Wn1svi64tgwCcR
+fYAAoIaYJLvHuvtNPM7+SId81Ix2IA7g
+=o/1e
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/gnome-session-2.22.3.ebuild b/gnome-base/gnome-session/gnome-session-2.22.3.ebuild
deleted file mode 100644
index 4c520899f03d..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.22.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 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.22.3.ebuild,v 1.8 2009/02/28 11:39:24 eva Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-		 branding? ( mirror://gentoo/gentoo-splash.png )"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="branding ipv6 tcpd"
-
-RDEPEND=">=dev-libs/glib-2.13
-		 >=gnome-base/libgnomeui-2.2
-		 >=x11-libs/gtk+-2.11.1
-		 >=dev-libs/dbus-glib-0.71
-		 >=gnome-base/gnome-keyring-2.21.92
-		 gnome-base/gnome-settings-daemon
-		 >=x11-libs/libnotify-0.2.1
-		 x11-libs/libXau
-		 x11-apps/xdpyinfo
-		 >=gnome-base/gconf-2
-		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-		  x11-apps/xrdb
-		>=sys-devel/gettext-0.10.40
-		>=dev-util/pkgconfig-0.17
-		>=dev-util/intltool-0.35
-		!gnome-base/gnome-core
-		!<gnome-base/gdm-2.20.4"
-
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable tcpd tcp-wrappers)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Patch for Gentoo Branding (bug #42687)
-	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
-
-	# Get rid of random asserts in tons of programs due to development versions
-	epatch "${FILESDIR}/${PN}-2.19.2-no-asserts.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	# Our own splash for world domination
-	if use branding ; then
-		insinto /usr/share/pixmaps/splash/
-		doins "${DISTDIR}/gentoo-splash.png"
-	fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.26.1.ebuild b/gnome-base/gnome-session/gnome-session-2.26.1.ebuild
index c3da6de10b91..1ede7bc3cf7f 100644
--- a/gnome-base/gnome-session/gnome-session-2.26.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.26.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.26.1.ebuild,v 1.2 2009/05/14 05:39:31 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.26.1.ebuild,v 1.3 2009/05/23 14:54:11 eva Exp $
 
 EAPI="2"
 
@@ -47,6 +47,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 pkg_setup() {
 	# TODO: convert libnotify to a configure option
 	G2CONF="${G2CONF}
+		--docdir=/usr/share/doc/${PF}
 		$(use_enable doc docbook-docs)
 		$(use_enable ipv6)
 		$(use_enable policykit polkit)"