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

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

3 files changed, 7 insertions, 70 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/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)"