New version: 2.8.0.1. Cleaning old ebuilds.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 162 insertions, 146 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 514c43967181..ffc1155c4c7d 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.100 2005/07/12 03:13:49 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.101 2005/07/24 19:45:44 leonardop Exp $
+
+*gdm-2.8.0.1 (24 Jul 2005)
+
+  24 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> gdm-2.8.0.1.ebuild :
+  New release. Added 'static' USE flag. Updated HOMEPAGE. Now gentoo
+  specific files are distributed in an extra tarball. Adjusted references to
+  some binaries installed by GDM, as they are installed in different
+  locations. For more information, see the NEWS file.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> gdm-2.6.0.9-r2.ebuild:
   stable onmips
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 30561938d583..07f919615a77 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,17 +1,17 @@
-MD5 b5c93605fcf054a4095cb57eab2dfcd8 gdm-2.6.0.9-r3.ebuild 3320
+MD5 abb24eb367d068de6cc3a23a864067e0 ChangeLog 13395
 MD5 c4d34959dd6c05056e5852277f76d250 gdm-2.2.5.4-r5.ebuild 4413
-MD5 dc176d15d4147fc47f76ed34c97db7d2 gdm-2.6.0.7.ebuild 3271
 MD5 37330f87e87c8fceb266a57f66bfdb81 gdm-2.6.0.9-r2.ebuild 3561
-MD5 1a74cd540a24742db983592fa6aef416 ChangeLog 13018
+MD5 9bf25f27fc961e4a02a7a12bb033bd45 gdm-2.8.0.1.ebuild 3661
+MD5 b5c93605fcf054a4095cb57eab2dfcd8 gdm-2.6.0.9-r3.ebuild 3320
+MD5 dc176d15d4147fc47f76ed34c97db7d2 gdm-2.6.0.7.ebuild 3271
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 5c125bf4007ea485ca626cab96d4f6a7 gdm-2.6.0.6.ebuild 3243
-MD5 222144a2577237cab4e4cd9b929a1654 files/gdm-2.6.0.9-ipv6_config.patch 649
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
 MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r2 137
 MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r3 137
-MD5 2f7f1a2f8ba0b8808f27f0a1f6abdcee files/digest-gdm-2.6.0.6 137
+MD5 7aa6906b7eaa7f0ae5083c6d4aee316e files/digest-gdm-2.8.0.1 211
 MD5 c343d16819b3e271f74187954492a212 files/digest-gdm-2.6.0.7 137
 MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
+MD5 222144a2577237cab4e4cd9b929a1654 files/gdm-2.6.0.9-ipv6_config.patch 649
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
 MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.6.0/Xsession 6198
 MD5 a3f4b5a7ab813f106578125638e3b2f0 files/2.6.0/custom.desktop 301
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.6 b/gnome-base/gdm/files/digest-gdm-2.6.0.6
deleted file mode 100644
index 1d5f42b2383a..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.6.0.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8dca7cb1f28d81f60f6e07b3c24288c5 gdm-2.6.0.6.tar.bz2 3216098
-MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/files/digest-gdm-2.8.0.1 b/gnome-base/gdm/files/digest-gdm-2.8.0.1
new file mode 100644
index 000000000000..64aeadf5d2f9
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.8.0.1
@@ -0,0 +1,3 @@
+MD5 b3925c68b828fbb63994eba577c4b4fd gdm-2.8.0.1.tar.bz2 3522871
+MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
+MD5 8e956971bb537fcc757411204eed12c4 gdm-2.8-gentoo-files-r1.tar.bz2 3110
diff --git a/gnome-base/gdm/gdm-2.6.0.6.ebuild b/gnome-base/gdm/gdm-2.6.0.6.ebuild
deleted file mode 100644
index cea2bd5b02c9..000000000000
--- a/gnome-base/gdm/gdm-2.6.0.6.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.6.ebuild,v 1.9 2005/04/02 04:18:05 geoman Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME2 Display Manager"
-HOMEPAGE="http://www.jirka.org/gdm.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips ~ppc64"
-IUSE="tcpd xinerama selinux"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2"
-MY_V="${PV%.*}"
-
-RDEPEND=">=sys-libs/pam-0.72
-	>=x11-libs/pango-1.4.1
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/librsvg-2
-	>=media-libs/libart_lgpl-2.3.11
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.11
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-G2CONF="${G2CONF} \
-	--sysconfdir=/etc/X11 \
-	--localstatedir=/var \
-	--with-pam-prefix=/etc \
-	--with-xdmcp \
-	`use_with tcpd tcp-wrappers` \
-	`use_with xinerama` \
-	`use_with selinux`"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# remove unneeded linker directive for selinux (#41022)
-	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
-
-}
-
-src_install() {
-
-	gnome2_src_install \
-		PAM_PREFIX=${D}/etc \
-		sysconfdir=${D}/etc/X11 \
-		localstatedir=${D}/var
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f ${D}/usr/bin/gdm
-	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
-	dosym /usr/bin/gdm /usr/bin/gdm-binary
-
-	# 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 ${FILESDIR}/${MY_V}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${FILESDIR}/${MY_V}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -f ${D}/etc/pam.d/gdm
-
-	# pam startup
-	dodir /etc/pam.d
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm
-	doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm-autologin
-
-	# pam security
-	dodir /etc/security/console.apps
-	insinto /etc/security/console.apps
-	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf
-	# use Gentoo theme
-	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
-
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	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
-
-	einfo "To make GDM start at boot, edit /etc/rc.conf"
-	einfo "and then execute 'rc-update add xdm default'."
-
-}
-
-pkg_postrm() {
-
-	gnome2_pkg_postrm
-
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-
-}
diff --git a/gnome-base/gdm/gdm-2.8.0.1.ebuild b/gnome-base/gdm/gdm-2.8.0.1.ebuild
new file mode 100644
index 000000000000..be60811b7d9b
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.8.0.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.1.ebuild,v 1.1 2005/07/24 19:45:44 leonardop Exp $
+
+inherit eutils pam versionator gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://yippi.hypermall.com/gdm/index.shtml"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+IUSE="ipv6 pam selinux static tcpd xinerama"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-$(get_version_component_range 1-2)-gentoo-files-r1"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2
+	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
+
+RDEPEND="pam? ( virtual/pam )
+	!pam? ( sys-apps/shadow )
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.3
+	>=x11-libs/pango-1.3
+	>=gnome-base/libglade-1.99.2
+	>=gnome-base/libgnome-1.96
+	>=gnome-base/libgnomeui-1.96
+	>=gnome-base/libgnomecanvas-1.109
+	>=gnome-base/librsvg-1.1.1
+	>=dev-libs/libxml2-2.4.12
+	>=media-libs/libart_lgpl-2.3.11
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.28
+	>=app-text/scrollkeeper-0.1.4"
+
+DOCS="AUTHORS ChangeLog NEWS README* TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# remove unneeded linker directive for selinux (#41022)
+	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
+
+	einfo "Running autoconf"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf="--sysconfdir=/etc/X11 --localstatedir=/var \
+	--with-pam-prefix=/etc --with-xdmcp $(use_enable ipv6) \
+	$(use_with tcpd tcp-wrappers) $(use_with xinerama) $(use_with selinux) \
+	$(use_enable static)"
+
+	if use pam; then
+		myconf="${myconf} --with-pam-prefix=/etc \
+		--enable-authentication-scheme=pam"
+	else
+		myconf="${myconf} --enable-console-helper=no \
+		--enable-authentication-scheme=shadow"
+	fi
+
+	G2CONF="${G2CONF} ${myconf}"
+
+	gnome2_src_compile
+}
+
+src_install() {
+	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
+	local pam_prefix=""
+
+	use pam && pam_prefix="PAM_PREFIX=${D}/etc"
+
+	gnome2_src_install ${pam_prefix} sysconfdir=${D}/etc/X11 \
+		localstatedir=${D}/var
+
+	# 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 -f ${D}/etc/pam.d/gdm
+
+	dopamd ${gentoodir}/pam.d/*
+	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
+		/etc/X11/gdm/gdm.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	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
+
+	einfo "To make GDM start at boot, edit /etc/rc.conf"
+	einfo "and then execute 'rc-update add xdm default'."
+
+}
+
+pkg_postrm() {
+
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+
+}