Clean up old revisions.
authorGilles Dartiguelongue <eva@gentoo.org>
Wed, 24 Feb 2010 22:39:47 +0000 (22:39 +0000)
committerGilles Dartiguelongue <eva@gentoo.org>
Wed, 24 Feb 2010 22:39:47 +0000 (22:39 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

gnome-base/gdm/ChangeLog
gnome-base/gdm/files/gdm-2.20.3-logging.patch [deleted file]
gnome-base/gdm/gdm-2.20.3.ebuild [deleted file]
gnome-base/gdm/gdm-2.20.9-r1.ebuild [deleted file]
gnome-base/gdm/gdm-2.28.1-r1.ebuild [deleted file]
gnome-base/libgnomekbd/ChangeLog
gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild [deleted file]
gnome-base/libgnomekbd/libgnomekbd-2.28.0.ebuild [deleted file]

index 3f0df8c03d51c5a164bd38692a88e9363aeaeee6..090915d2e0a05b4fa4f57e8e1d14cde2246ae232 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.314 2010/01/21 18:27:33 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.315 2010/02/24 22:37:03 eva Exp $
+
+  24 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org> -gdm-2.20.3.ebuild,
+  -files/gdm-2.20.3-logging.patch, -gdm-2.20.9-r1.ebuild,
+  -gdm-2.28.1-r1.ebuild:
+  Clean up old revisions.
 
 *gdm-2.20.10-r3 (21 Jan 2010)
 
diff --git a/gnome-base/gdm/files/gdm-2.20.3-logging.patch b/gnome-base/gdm/files/gdm-2.20.3-logging.patch
deleted file mode 100644 (file)
index b1f5d87..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- gdm-2.20.3/daemon/verify-crypt.c.orig      2008-01-07 19:39:37.000000000 +0000
-+++ gdm-2.20.3/daemon/verify-crypt.c   2008-01-09 13:39:50.000000000 +0000
-@@ -43,6 +43,7 @@
- #include "gdm-common.h"
- #include "gdm-daemon-config.h"
- #include "gdm-socket-protocol.h"
-+#include "gdm-log.h"
- 
- static char *selected_user = NULL;
- 
---- gdm-2.20.3/daemon/verify-shadow.c.orig     2008-01-07 19:39:37.000000000 +0000
-+++ gdm-2.20.3/daemon/verify-shadow.c  2008-01-09 13:39:43.000000000 +0000
-@@ -44,6 +44,7 @@
- #include "gdm-common.h"
- #include "gdm-daemon-config.h"
- #include "gdm-socket-protocol.h"
-+#include "gdm-log.h"
- 
- static char *selected_user = NULL;
- 
diff --git a/gnome-base/gdm/gdm-2.20.3.ebuild b/gnome-base/gdm/gdm-2.20.3.ebuild
deleted file mode 100644 (file)
index c0ee79b..0000000
+++ /dev/null
@@ -1,201 +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/gdm/gdm-2.20.3.ebuild,v 1.11 2009/05/01 10:28:07 eva Exp $
-
-inherit autotools eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~mips"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-SRC_URI="${SRC_URI}
-                mirror://gentoo/${GDM_EXTRA}.tar.bz2
-                branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="dev-libs/dbus-glib
-                >=dev-libs/glib-2.12
-                >=x11-libs/gtk+-2.6
-                >=x11-libs/pango-1.3
-                >=gnome-base/libglade-2
-                >=gnome-base/libgnomecanvas-2
-                >=gnome-base/librsvg-1.1.1
-                >=dev-libs/libxml2-2.4.12
-                >=media-libs/libart_lgpl-2.3.11
-                x11-libs/gksu
-                x11-libs/libXi
-                x11-libs/libXau
-                x11-libs/libX11
-                x11-libs/libXext
-                x11-apps/sessreg
-                x11-libs/libXdmcp
-                xinerama? ( x11-libs/libXinerama )
-                sys-auth/consolekit
-                accessibility? ( x11-libs/libXevie )
-                afs? ( net-fs/openafs sys-libs/lwp )
-                dmx? ( x11-libs/libdmx )
-                pam? ( virtual/pam )
-                !pam? ( elibc_glibc? ( sys-apps/shadow ) )
-                remote? ( gnome-extra/zenity )
-                selinux? ( sys-libs/libselinux )
-                tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-               dmx? ( x11-proto/dmxproto )
-               sys-devel/gettext
-               x11-proto/inputproto
-               >=dev-util/intltool-0.35
-               >=dev-util/pkgconfig-0.19
-               >=app-text/scrollkeeper-0.1.4
-               >=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-       G2CONF="--with-prefetch=yes               \
-                       --sysconfdir=/etc/X11             \
-                       --localstatedir=/var              \
-                       --with-xdmcp=yes                  \
-                       --with-pam-prefix=/etc            \
-                       --with-console-kit=yes            \
-                       $(use_enable accessibility xevie) \
-                       $(use_enable ipv6)                \
-                       $(use_enable remote secureremote) \
-                       $(use_with selinux)               \
-                       $(use_with tcpd tcp-wrappers)     \
-                       $(use_with xinerama)"
-
-       if use dmx ; then
-               G2CONF="${G2CONF} --with-dmx=yes"
-       else
-               G2CONF="${G2CONF} --with-dmx=no"
-       fi
-
-       if use pam; then
-               G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-       else
-               G2CONF="${G2CONF} --enable-console-helper=no"
-               if use elibc_glibc ; then
-                       G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-               else
-                       G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-               fi
-       fi
-
-       enewgroup gdm
-       enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_unpack() {
-       gnome2_src_unpack
-
-       # remove unneeded linker directive for selinux (#41022)
-       epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
-
-       # Add gksu to gdmsetup menu entry
-       epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
-
-       # Fix compile errors
-       epatch "${FILESDIR}/${PN}-2.20.3-logging.patch"
-}
-
-src_install() {
-       gnome2_src_install
-
-       local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-       # gdm-binary should be gdm to work with our init (#5598)
-       rm -f "${D}/usr/sbin/gdm"
-       dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-       # our x11's scripts point to /usr/bin/gdm
-       dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-       # log, etc.
-       keepdir /var/log/gdm
-       keepdir /var/gdm
-
-       chown root:gdm "${D}/var/gdm"
-       chmod 1770 "${D}/var/gdm"
-
-       # use our own session script
-       rm -f "${D}/etc/X11/gdm/Xsession"
-       exeinto /etc/X11/gdm
-       doexe "${gentoodir}/Xsession"
-
-       # add a custom xsession .desktop by default (#44537)
-       exeinto /etc/X11/dm/Sessions
-       doexe "${gentoodir}/custom.desktop"
-
-       # We replace the pam stuff by our own
-       rm -rf "${D}/etc/pam.d"
-
-       if use pam ; then
-               dopamd "${gentoodir}"/pam.d/*
-               dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-       fi
-
-       # use graphical greeter local
-       dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-               /usr/share/gdm/defaults.conf
-
-       # list available users
-       dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-       dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-       # Fix old X11R6 paths
-       dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-       # Move Gentoo theme in
-       if use branding ; then
-               mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
-       fi
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-
-       elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-       elog "and then execute 'rc-update add xdm default'."
-
-       elog "GDM has changed the location of its configuration file.  Please"
-       elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-       elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-       elog "See README.install for more information about the change."
-
-       if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-               elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-               elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-               mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-       fi
-
-       # Soft restart, assumes Gentoo defaults for file locations
-       # Do restart after gdm.conf move above
-       FIFOFILE=/var/gdm/.gdmfifo
-       PIDFILE=/var/run/gdm.pid
-
-       if [ -w ${FIFOFILE} ] ; then
-               if [ -f ${PIDFILE} ] ; then
-                       if kill -0 `cat ${PIDFILE}`; then
-                               (echo;echo SOFT_RESTART) >> ${FIFOFILE}
-                       fi
-               fi
-       fi
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-
-       if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
-               elog "To remove GDM from startup please execute"
-               elog "'rc-update del xdm default'"
-       fi
-}
diff --git a/gnome-base/gdm/gdm-2.20.9-r1.ebuild b/gnome-base/gdm/gdm-2.20.9-r1.ebuild
deleted file mode 100644 (file)
index fecb73f..0000000
+++ /dev/null
@@ -1,230 +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/gdm/gdm-2.20.9-r1.ebuild,v 1.9 2009/12/17 22:21:33 eva Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="hppa sh"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-                mirror://gentoo/${GDM_EXTRA}.tar.bz2
-                branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="dev-libs/dbus-glib
-       >=dev-libs/glib-2.12
-       >=x11-libs/gtk+-2.6
-       >=x11-libs/pango-1.3
-       >=gnome-base/libglade-2
-       >=gnome-base/libgnomecanvas-2
-       >=gnome-base/librsvg-1.1.1
-       >=dev-libs/libxml2-2.4.12
-       >=media-libs/libart_lgpl-2.3.11
-       x11-libs/gksu
-       x11-libs/libXi
-       x11-libs/libXau
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-apps/sessreg
-       x11-libs/libXdmcp
-       xinerama? ( x11-libs/libXinerama )
-       sys-auth/consolekit
-       accessibility? ( x11-libs/libXevie )
-       afs? ( net-fs/openafs sys-libs/lwp )
-       dmx? ( x11-libs/libdmx )
-       gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
-       pam? (
-               virtual/pam
-               >=sys-auth/pambase-20080318 )
-       !pam? ( elibc_glibc? ( sys-apps/shadow ) )
-       remote? ( gnome-extra/zenity )
-       selinux? ( sys-libs/libselinux )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-       dmx? ( x11-proto/dmxproto )
-       xinerama? ( x11-proto/xineramaproto )
-       sys-devel/gettext
-       x11-proto/inputproto
-       >=dev-util/intltool-0.35
-       >=dev-util/pkgconfig-0.19
-       >=app-text/scrollkeeper-0.1.4
-       >=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-       G2CONF="${G2CONF}
-               --with-prefetch
-               --sysconfdir=/etc/X11
-               --localstatedir=/var
-               --with-xdmcp=yes
-               --with-pam-prefix=/etc
-               --with-console-kit=yes
-               SOUND_PROGRAM=/usr/bin/gdmplay
-               $(use_enable accessibility xevie)
-               $(use_enable ipv6)
-               $(use_enable remote secureremote)
-               $(use_with selinux)
-               $(use_with tcpd tcp-wrappers)
-               $(use_with xinerama)"
-
-       if use dmx ; then
-               G2CONF="${G2CONF} --with-dmx=yes"
-       else
-               G2CONF="${G2CONF} --with-dmx=no"
-       fi
-
-       if use gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
-               eerror "You need to build gnome-base/gnome-keyring with USE=\"pam\""
-               eerror "for USE=\"gnome-keyring\" to have any effect on this package."
-       fi
-
-       if use pam; then
-               G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-
-               if use gnome-keyring && ! built_with_use sys-auth/pambase gnome-keyring; then
-                       eerror "You need USE=\"gnome\" in sys-auth/pambase for proper keyring"
-                       eerror "unlocking at login time. It will not work properly otherwise."
-               fi
-       else
-               G2CONF="${G2CONF} --enable-console-helper=no"
-               if use elibc_glibc ; then
-                       G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-               else
-                       G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-               fi
-       fi
-
-       enewgroup gdm
-       enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_unpack() {
-       gnome2_src_unpack
-
-       # remove unneeded linker directive for selinux (#41022)
-       epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
-
-       # Add gksu to gdmsetup menu entry
-       epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
-
-       # Fix parallel install, bug #217037
-       epatch "${FILESDIR}/${P}-parallel-make.patch"
-}
-
-src_install() {
-       gnome2_src_install
-
-       local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-       # gdm-binary should be gdm to work with our init (#5598)
-       rm -f "${D}/usr/sbin/gdm"
-       dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-       # our x11's scripts point to /usr/bin/gdm
-       dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-       # log, etc.
-       keepdir /var/log/gdm
-       keepdir /var/gdm
-
-       fowners root:gdm /var/gdm
-       fperms 1770 /var/gdm
-
-       # use our own session script
-       rm -f "${D}/etc/X11/gdm/Xsession"
-       exeinto /etc/X11/gdm
-       doexe "${gentoodir}/Xsession"
-
-       # add a custom xsession .desktop by default (#44537)
-       exeinto /etc/X11/dm/Sessions
-       doexe "${gentoodir}/custom.desktop"
-
-       # add a custom sound playing script (#248253)
-       dobin "${gentoodir}/gdmplay"
-
-       # avoid file collision, bug #213118
-       rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-       # We replace the pam stuff by our own
-       rm -rf "${D}/etc/pam.d"
-
-       if use pam ; then
-               use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-               dopamd "${gentoodir}"/pam.d/*
-               dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-       fi
-
-       # use graphical greeter local
-       dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-               /usr/share/gdm/defaults.conf
-
-       # list available users
-       dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-       dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-       # Fix old X11R6 paths
-       dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-       # Move Gentoo theme in
-       if use branding ; then
-               mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
-       fi
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-
-       elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-       elog "and then execute 'rc-update add xdm default'."
-
-       elog "GDM has changed the location of its configuration file.  Please"
-       elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-       elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-       elog "See README.install for more information about the change."
-
-       if use gnome-keyring; then
-               elog "For autologin to unlock your keyring, you need to set an empty"
-               elog "password on your keyring. Use app-crypt/seahorse for that."
-       fi
-
-       if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-               elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-               elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-               mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-       fi
-
-       # Soft restart, assumes Gentoo defaults for file locations
-       # Do restart after gdm.conf move above
-       FIFOFILE=/var/gdm/.gdmfifo
-       PIDFILE=/var/run/gdm.pid
-
-       if [ -w ${FIFOFILE} ] ; then
-               if [ -f ${PIDFILE} ] ; then
-                       if kill -0 `cat ${PIDFILE}`; then
-                               (echo;echo SOFT_RESTART) >> ${FIFOFILE}
-                       fi
-               fi
-       fi
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-
-       if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
-               elog "To remove GDM from startup please execute"
-               elog "'rc-update del xdm default'"
-       fi
-}
diff --git a/gnome-base/gdm/gdm-2.28.1-r1.ebuild b/gnome-base/gdm/gdm-2.28.1-r1.ebuild
deleted file mode 100644 (file)
index 44a0f3a..0000000
+++ /dev/null
@@ -1,198 +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/gdm/gdm-2.28.1-r1.ebuild,v 1.1 2009/10/29 22:01:08 eva Exp $
-
-EAPI="2"
-
-inherit eutils pam gnome2 autotools
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility +consolekit debug ipv6 gnome-keyring selinux tcpd test xinerama +xklavier $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-       mirror://gentoo/${PN}-2.26-gentoo-patches.tar.bz2
-       mirror://gentoo/${GDM_EXTRA}.tar.bz2"
-
-# FIXME: gdm has a strange behaviour on reboot (from runlevel), especially when xdm tries to stop it (its blocks).
-RDEPEND=">=sys-apps/devicekit-power-008
-       >=dev-libs/dbus-glib-0.74
-       >=dev-libs/glib-2.15.4
-       >=x11-libs/gtk+-2.10.0
-       >=x11-libs/pango-1.3
-       >=media-libs/libcanberra-0.4[gtk]
-       >=gnome-base/libglade-2
-       >=gnome-base/gconf-2.6.1
-       >=gnome-base/gnome-panel-2
-       xklavier? ( >=x11-libs/libxklavier-4 )
-       x11-libs/libXft
-       app-text/iso-codes
-
-       x11-libs/libXi
-       x11-libs/libXau
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-apps/sessreg
-       x11-libs/libXdmcp
-       virtual/pam
-       consolekit? (
-               sys-auth/consolekit
-               >=sys-apps/hal-0.5.12_rc1-r1[consolekit] )
-
-       accessibility? ( x11-libs/libXevie )
-       gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-       selinux? ( sys-libs/libselinux )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       xinerama? ( x11-libs/libXinerama )
-
-       !gnome-extra/fast-user-switch-applet"
-DEPEND="${RDEPEND}
-       test? ( >=dev-libs/check-0.9.4 )
-       xinerama? ( x11-proto/xineramaproto )
-       sys-devel/gettext
-       x11-proto/inputproto
-       >=dev-util/intltool-0.40
-       >=dev-util/pkgconfig-0.19
-       >=app-text/scrollkeeper-0.1.4
-       >=app-text/gnome-doc-utils-0.3.2"
-PDEPEND=">=sys-auth/pambase-20090430[consolekit=,gnome-keyring=]"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-       # PAM is the only auth scheme supported
-       # even though configure lists shadow and crypt
-       # they don't have any corresponding code
-       G2CONF="${G2CONF}
-               --disable-schemas-install
-               --localstatedir=/var
-               --with-xdmcp=yes
-               --enable-authentication-scheme=pam
-               --with-pam-prefix=/etc
-               SOUND_PROGRAM=/usr/bin/gdmplay
-               $(use_with accessibility xevie)
-               $(use_enable debug)
-               $(use_enable ipv6)
-               $(use_enable xklavier libxklavier)
-               $(use_with consolekit console-kit)
-               $(use_with selinux)
-               $(use_with tcpd tcp-wrappers)
-               $(use_with xinerama)"
-
-       enewgroup gdm
-       enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_prepare() {
-       gnome2_src_prepare
-
-       # remove unneeded linker directive for selinux (#41022)
-       epatch "${WORKDIR}/${PN}-2.26.1-selinux-remove-attr.patch"
-
-       # Make it daemonize so that the boot process can continue (#236701)
-       epatch "${WORKDIR}/${PN}-2.26.1-fix-daemonize-regression.patch"
-
-       # Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339)
-       epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch"
-
-       # Make custom session work, bug #.
-       epatch "${WORKDIR}/${PN}-2.26.1-custom-session.patch"
-
-       # ssh-agent handling must be done at xinitrc.d
-       epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch"
-
-       # Fix libxklavier automagic support
-       epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch"
-
-       intltoolize --force --copy --automake || die "intltoolize failed"
-       eautoreconf
-}
-
-src_install() {
-       gnome2_src_install
-
-       local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-       # gdm-binary should be gdm to work with our init (#5598)
-       rm -f "${D}/usr/sbin/gdm"
-       dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-       # our x11's scripts point to /usr/bin/gdm
-       dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-       # log, etc.
-       keepdir /var/log/gdm
-       keepdir /var/gdm
-
-       fowners root:gdm /var/gdm
-       fperms 1770 /var/gdm
-
-       # add a custom xsession .desktop by default (#44537)
-       exeinto /etc/X11/dm/Sessions
-       doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed"
-
-       # add xinitrc.d scripts
-       exeinto /etc/X11/xinit/xinitrc.d
-       doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed"
-       doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed"
-
-       # install XDG_DATA_DIRS gdm changes
-       echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-       doenvd 99xdg-gdm || die "doenvd failed"
-
-       # add a custom sound playing script (#248253)
-       dobin "${gentoodir}/gdmplay"
-
-       # avoid file collision, bug #213118
-       rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-       # We replace the pam stuff by our own
-       rm -rf "${D}/etc/pam.d"
-
-       use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-       dopamd "${gentoodir}"/pam.d/*
-       dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-
-       ewarn
-       ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
-       ewarn "visit us on #gentoo-desktop if you have problems."
-       ewarn
-
-       elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-       elog "and then execute 'rc-update add xdm default'."
-       elog "If you already have GDM running, you will need to restart it."
-
-       if use gnome-keyring; then
-               elog "For autologin to unlock your keyring, you need to set an empty"
-               elog "password on your keyring. Use app-crypt/seahorse for that."
-       fi
-
-       if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-               elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-               elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-               mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-       fi
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-
-       if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
-               elog "To remove GDM from startup please execute"
-               elog "'rc-update del xdm default'"
-       fi
-}
index 76fef3d7136612420c5321b30f172068b34535fa..58065f4cf462c0bfab3342842f297e93c5d5e27f 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.67 2010/01/17 23:59:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.68 2010/02/24 22:39:47 eva Exp $
+
+  24 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgnomekbd-2.24.0.ebuild, -libgnomekbd-2.28.0.ebuild:
+  Clean up old revisions.
 
   17 Jan 2010; Jeroen Roovers <jer@gentoo.org> libgnomekbd-2.26.0.ebuild:
   Stable for HPPA (bug #281427).
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild
deleted file mode 100644 (file)
index 71ef75b..0000000
+++ /dev/null
@@ -1,59 +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/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.13 2009/07/12 21:08:12 eva Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-       >=sys-apps/dbus-0.92
-       >=dev-libs/dbus-glib-0.34
-       >=gnome-base/gconf-2.14
-       >=x11-libs/gtk+-2.13
-       >=gnome-base/libglade-2.6
-       >=x11-libs/libxklavier-3.2"
-DEPEND="${RDEPEND}
-       >=dev-util/intltool-0.35
-       >=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# This collides with
-# /etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas from
-# <=control-center-2.17...
-
-pkg_setup() {
-       # Only user interaction required graphical tests at the time of 2.22.0 - not useful for us
-       G2CONF="${G2CONF} --disable-tests"
-}
-
-src_prepare() {
-       # Fix linking to system's library, bug #265428
-       epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch"
-
-       # Fix silly upstream CFLAGS, bug #277291
-       sed "s/-Werror//g" -i capplet/Makefile.am capplet/Makefile.in \
-               test/Makefile.am test/Makefile.in \
-               configure.in configure || die "removing -Werror failed"
-
-       # Make it libtool-1 compatible
-       rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-       intltoolize --force --copy --automake || die "intltoolize failed"
-       eautoreconf
-}
-
-src_compile() {
-       # FreeBSD doesn't like -j
-       use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1"
-       gnome2_src_compile
-}
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.28.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.28.0.ebuild
deleted file mode 100644 (file)
index 31868a8..0000000
+++ /dev/null
@@ -1,59 +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/libgnomekbd/libgnomekbd-2.28.0.ebuild,v 1.1 2009/10/29 21:33:28 eva Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-       >=sys-apps/dbus-0.92
-       >=dev-libs/dbus-glib-0.34
-       >=gnome-base/gconf-2.14
-       >=x11-libs/gtk+-2.13
-       >=x11-libs/libxklavier-4.0"
-DEPEND="${RDEPEND}
-       >=dev-util/intltool-0.35
-       >=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-       # Only user interaction required graphical tests at the time of 2.22.0 - not useful for us
-       G2CONF="${G2CONF} --disable-tests --disable-static"
-}
-
-src_prepare() {
-       gnome2_src_prepare
-
-       # Fix intltoolize broken file, see upstream #577133
-       sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-               || die "sed expression failed"
-}
-
-src_compile() {
-       # FreeBSD doesn't like -j, upstream? bug #????
-       use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1"
-       gnome2_src_compile
-}
-
-pkg_preinst() {
-       gnome2_pkg_preinst
-       preserve_old_lib /usr/$(get_libdir)/libgnomekbd.so.3
-       preserve_old_lib /usr/$(get_libdir)/libgnomekbdui.so.3
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       preserve_old_lib_notify /usr/$(get_libdir)/libgnomekbd.so.3
-       preserve_old_lib_notify /usr/$(get_libdir)/libgnomekbdui.so.3
-}