bugfix & theme fix

6 files changed, 22 insertions, 18 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 501627e7ff62..275abc578591 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.72 2004/08/22 07:46:20 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.73 2004/08/24 13:04:44 foser Exp $
+
+*gdm-2.6.0.4-r1 (24 Aug 2004)
+
+  24 Aug 2004; foser <foser@gentoo.org> gdm-2.6.0.4-r1.ebuild :
+  Fix dodir -> keepdir (#61472) & rev bump to make propagate
+  Update themes pack to -r2 (#59918)
+  now putting the two themes together & slimming it up
 
 *gdm-2.6.0.4 (22 Aug 2004)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 8eed55025da4..6f7efbb67a5d 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,15 +1,15 @@
-MD5 df856cab880416be7f3ec5cbf1490161 gdm-2.6.0.3.ebuild 3381
+MD5 f7a9dfd964e64421f45717e94703e75d gdm-2.6.0.3.ebuild 3385
 MD5 bf4c39edd0c28adfccb8247fe0b068d7 gdm-2.4.4.7-r1.ebuild 3427
 MD5 35366f1ca77e222f08da145690671bc7 gdm-2.2.5.4-r5.ebuild 4427
+MD5 ef9dbe05dbafaf5fefe1757a05d5170a gdm-2.6.0.4-r1.ebuild 3286
 MD5 6dcf2c48a2846433f8abf94aa493f074 gdm-2.4.1.7-r1.ebuild 5284
-MD5 5dc560921b86c635d710d4a9c26db27e gdm-2.6.0.4.ebuild 3380
-MD5 4dca9678c149afc20daf9e73c09b191f ChangeLog 9917
+MD5 f15dda6e23219b5ae1e6eb7fb008b350 ChangeLog 10168
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
 MD5 6392095707ae98912a626cb035796255 files/digest-gdm-2.4.1.7-r1 134
 MD5 25720fd12f8eee788fc5169824a0fe7e files/digest-gdm-2.4.4.7-r1 205
+MD5 5f1a2155fb7d9ac84b228d439df56777 files/digest-gdm-2.6.0.4-r1 137
 MD5 6d2d226ffb2ab29992376b5e2e4abe9f files/digest-gdm-2.6.0.3 205
-MD5 0b62c844bea1344057d5fa674cac3458 files/digest-gdm-2.6.0.4 205
 MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
 MD5 b2d71444a82a418126728e6301dd3389 files/gdm-2.4.1.7-gtk-2.4.patch 5730
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.4 b/gnome-base/gdm/files/digest-gdm-2.6.0.4
deleted file mode 100644
index 68f2450e2b4a..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.6.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a6986217d4db2afd24fcdbf3b9af722 gdm-2.6.0.4.tar.bz2 3217512
-MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
-MD5 e0dcf60fc342ed1862f0fff26da984b2 gentoo-gdm-theme-r1.tar.bz2 54186
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.4-r1 b/gnome-base/gdm/files/digest-gdm-2.6.0.4-r1
new file mode 100644
index 000000000000..8b9418368516
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.6.0.4-r1
@@ -0,0 +1,2 @@
+MD5 3a6986217d4db2afd24fcdbf3b9af722 gdm-2.6.0.4.tar.bz2 3217512
+MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/gdm-2.6.0.3.ebuild b/gnome-base/gdm/gdm-2.6.0.3.ebuild
index deb7b1b876bf..d6c90d0a82f9 100644
--- a/gnome-base/gdm/gdm-2.6.0.3.ebuild
+++ b/gnome-base/gdm/gdm-2.6.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.3.ebuild,v 1.2 2004/08/21 01:37:19 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.3.ebuild,v 1.3 2004/08/24 13:04:44 foser Exp $
 
 inherit gnome2 eutils
 
@@ -67,8 +67,8 @@ src_install() {
 	dosym /usr/bin/gdm /usr/bin/gdm-binary
 
 	# log, etc.
-	dodir /var/log/gdm
-	dodir /var/gdm
+	keepdir /var/log/gdm
+	keepdir /var/gdm
 	chown root:gdm ${D}/var/gdm
 	chmod 1770 ${D}/var/gdm
 
diff --git a/gnome-base/gdm/gdm-2.6.0.4.ebuild b/gnome-base/gdm/gdm-2.6.0.4-r1.ebuild
index 532520770dcf..306dac009989 100644
--- a/gnome-base/gdm/gdm-2.6.0.4.ebuild
+++ b/gnome-base/gdm/gdm-2.6.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.4.ebuild,v 1.1 2004/08/22 07:46:20 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.4-r1.ebuild,v 1.1 2004/08/24 13:04:44 foser Exp $
 
 inherit gnome2 eutils
 
@@ -13,8 +13,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
 IUSE="tcpd xinerama selinux"
 
 SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme.tar.bz2
-	mirror://gentoo/gentoo-gdm-theme-r1.tar.bz2"
+	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2"
 MY_V="`echo ${PV} |cut -b -5`"
 
 RDEPEND=">=sys-libs/pam-0.72
@@ -67,8 +66,8 @@ src_install() {
 	dosym /usr/bin/gdm /usr/bin/gdm-binary
 
 	# log, etc.
-	dodir /var/log/gdm
-	dodir /var/gdm
+	keepdir /var/log/gdm
+	keepdir /var/gdm
 	chown root:gdm ${D}/var/gdm
 	chmod 1770 ${D}/var/gdm
 
@@ -102,8 +101,7 @@ src_install() {
 	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
 
 	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-cow  ${D}/usr/share/gdm/themes
-	mv ${WORKDIR}/gentoo-emergence  ${D}/usr/share/gdm/themes
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
 
 	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO