Remove redundant version and fix quoting in an old version

Package-Manager: portage-2.1.4.4

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 7ddfbba428faaf446db9735b3cf233074dd3c260..dce24ffb2fa60b4dd2d65361af5979550733dad9 100644 (file)
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Gnome 2464 RMD160 07fe125890d825fdf95fe532aeec07c2718cf64e SHA1 9d64837491953dd8c38142e50e0cd36d015db583 SHA256 a1214ba383eb6dbd32b34eb89c7e00df08f9284b7a2b8a82f291cb29e865ba02
 AUX gnome-session-2.17.90-no-asserts.patch 851 RMD160 828f9db04813d4d56b3fac7519eb0aa0b06faf8b SHA1 ca1ee37a4ddab9e66ad0edafabc9ceb584309859 SHA256 3827ae4759285376ca593a3844c1a8037e76064c0891b5b94f6cc57dd9452196
 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
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
 DIST gnome-session-2.18.3.tar.bz2 716092 RMD160 109ad8c913bc4cd67412a0a6521d25af50385e87 SHA1 35170535d20ffdaf02af445104394decc20a52c1 SHA256 87f8dd9b89953e6bfaad98d1b50fd48517334588d0da9d038218751943dfc10a
-DIST gnome-session-2.20.1.tar.bz2 759126 RMD160 528ee1f64973cefa0d86afdf574ad6ca69c3e72b SHA1 d1dedcafe8685cfd8763e04ae3d5d696eb353797 SHA256 134d102f7f6dc889158c262488b98c843616fa8aef23ce3aaa923366076a6a29
 DIST gnome-session-2.20.3.tar.bz2 751906 RMD160 0e70455a1b776babc86ff472b6f7fd86a7c305e2 SHA1 cb76fbd436f43c51eed81d8fb3f7b3478e40d3e4 SHA256 eff4f7a1eb15a9a92317de9c07f9530ce1110c9ac84fc777f97a59316b9f2ee1
-EBUILD gnome-session-2.18.3.ebuild 1884 RMD160 d298c53bb37b87f50bdf4b30ec0182ba17ea7745 SHA1 996734500a3edc9bba04778cfa024065dd63801e SHA256 c5d19c509e8b060ecb681e563c8225aa6579b20332ccf59c209820fccd41a214
-EBUILD gnome-session-2.20.1.ebuild 1852 RMD160 8e03a27694a463f1a25e68e7c0a127291732d327 SHA1 8e153a47e6091cd885bf14e38d74bfc23b6f8248 SHA256 481721e1317470062378546e260a7c4f494d2b69cc42249c91bde016f7a70f7d
+EBUILD gnome-session-2.18.3.ebuild 1886 RMD160 4f09f63dd27e5bbbc3019b849164c12bd78f93c3 SHA1 8eecabbe26fb629d0f77f7515a8f0dd75e9c9d97 SHA256 4c40c51e15bcd4af6236e855829a25bef25b6b95a8c820db2d24fa69bd35de48
 EBUILD gnome-session-2.20.3.ebuild 1852 RMD160 9d0a8f0496c73e13e5eb7c0687dacf1eb5a0473c SHA1 7f20579dd77215848769f034a9588efcafbedee7 SHA256 c12b4eed592636b1ec749a1158f11e07a0a0b3b30162a33f2cdfc2d614fad43d
 MISC ChangeLog 28049 RMD160 c5033cac935be1ff974926c193a391f65119cc2f SHA1 8c22ee8c0d601fd63340632587a47635a0402136 SHA256 2ed306fedb27aa59458e0f37c26649611b70debaee6bbe2a4000c3a4398528c3
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfKkFAACgkQkeYb6olFHJccoACg3DsqWThjobiLfvXwz2qnuz5v
+V9UAn0jZ2neVY9+EKki9F3TlocpGAWHj
+=rCQC
+-----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-session/gnome-session-2.18.3.ebuild b/gnome-base/gnome-session/gnome-session-2.18.3.ebuild
index 0332edc870a2bce4dd00544fde816c4cadcd9272..61b1824713ff091ad48dfdd3a84f5e368094b314 100644 (file)
--- a/gnome-base/gnome-session/gnome-session-2.18.3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.18.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18.3.ebuild,v 1.10 2008/01/31 23:53:00 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.18.3.ebuild,v 1.11 2008/03/02 11:33:31 leio Exp $
 
 inherit eutils gnome2
 
@@ -62,6 +62,6 @@ src_install() {
        # Our own splash for world domination
        if use branding ; then
                insinto /usr/share/pixmaps/splash/
-               doins ${DISTDIR}/gentoo-splash.png
+               doins "${DISTDIR}"/gentoo-splash.png
        fi
 }

diff --git a/gnome-base/gnome-session/gnome-session-2.20.1.ebuild b/gnome-base/gnome-session/gnome-session-2.20.1.ebuild
deleted file mode 100644 (file)
index 3ba0585..0000000
--- a/gnome-base/gnome-session/gnome-session-2.20.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 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.20.1.ebuild,v 1.7 2007/11/29 06:09:08 jer 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 esd ipv6 tcpd"
-
-RDEPEND=">=dev-libs/glib-2.13
-                >=x11-libs/gtk+-2.11.1
-                x11-libs/libXau
-                x11-apps/xdpyinfo
-                >=gnome-base/libgnomeui-2.2
-                >=gnome-base/control-center-2.15.4
-                >=x11-libs/libnotify-0.2.1
-                >=gnome-base/gconf-2
-                >=gnome-base/gnome-keyring-0.5.1
-                >=dev-libs/dbus-glib-0.71
-                esd? ( >=media-sound/esound-0.2.26 )
-                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/gnome-core overwrite /usr/bin/gnome-session
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-       # TODO: convert libnotify to a configure option
-       G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd) $(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
-}