x11-misc/slim: Cleanup

svn path=/sunrise/; revision=2782

5 files changed, 8 insertions, 187 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 0856ee89d..fc9b47afe 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jan 2007; Markus Ullmann <jokey@gentoo.org> -slim-1.2.5-r2.ebuild,
+  -files/slim-fix-warnings.patch:
+  Cleanup
+
   16 Jan 2007; Christian Faulhammer <opfer@gentoo.org> slim-1.2.6.ebuild:
   adjust DESCRIPTION a bit
 
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index a17b63b20..7506d0ef8 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,28 +1,16 @@
-AUX slim-fix-warnings.patch 3022 RMD160 44fc8cd074be520ba3ef282884b33b4a7e25f193 SHA1 594ba1d328a9c6207290108003458b9fc8ea0b6c SHA256 5d79a0738d22b9480913914c8462eb99251efa11c6a5d7aed30b15e741e5fdb8
-MD5 7ff70ebcb464c6648385ba7b1e294c52 files/slim-fix-warnings.patch 3022
-RMD160 44fc8cd074be520ba3ef282884b33b4a7e25f193 files/slim-fix-warnings.patch 3022
-SHA256 5d79a0738d22b9480913914c8462eb99251efa11c6a5d7aed30b15e741e5fdb8 files/slim-fix-warnings.patch 3022
-DIST slim-1.2.5.tar.gz 216437 RMD160 796dc2cf2f903a5d1d7e8aa92106bd9af7990d69 SHA1 f08ef603b362e3441b83d1f89445cc7ea73e7ebb SHA256 eee5c172a3397a2edc279d6a7a46c0075e05c022c4cb4417a14e3714626c9261
 DIST slim-1.2.6.tar.gz 219003 RMD160 81b2d230857dd1b3b2fb6e41b2a81a3ed7207bfd SHA1 df6d4c0a58709d7f8080ee378c1d86991112b93e SHA256 4f0a51c88d0d4f942d3552efcfbfcb245bc558336a1ed3f531dbe65252ad8c5e
-EBUILD slim-1.2.5-r2.ebuild 1756 RMD160 02602aac86dbb99568bed193e76bd42db639ea05 SHA1 803e68dc71626434dae45b5498f1466af9322095 SHA256 323b6240e080b0e429ef0239e231859ff09645095d233d15485aa3eb81ab271b
-MD5 69f8a78fe269893c2009c74403c89439 slim-1.2.5-r2.ebuild 1756
-RMD160 02602aac86dbb99568bed193e76bd42db639ea05 slim-1.2.5-r2.ebuild 1756
-SHA256 323b6240e080b0e429ef0239e231859ff09645095d233d15485aa3eb81ab271b slim-1.2.5-r2.ebuild 1756
 EBUILD slim-1.2.6.ebuild 1866 RMD160 7eddf46ed0800716797f11d94ff524bcfdbcfc84 SHA1 41d4bc49ab0ce9d69831b365a66acaab25381311 SHA256 ed7d7f4505e789395adedfe47ca4c8c7618bd95ba962169a91b08d75267fb996
 MD5 30a68d57e46caaac15f1e109311323a4 slim-1.2.6.ebuild 1866
 RMD160 7eddf46ed0800716797f11d94ff524bcfdbcfc84 slim-1.2.6.ebuild 1866
 SHA256 ed7d7f4505e789395adedfe47ca4c8c7618bd95ba962169a91b08d75267fb996 slim-1.2.6.ebuild 1866
-MISC ChangeLog 1147 RMD160 a612ca48d4ac1eabbc152820074f29608b324f2b SHA1 199752a2dbe7cd4941872e0064233dcd8a2b918a SHA256 54f37ae8ec736421eb97f6ee6f2beb04074a4371b9a6f10052f31b7f86f04d4f
-MD5 bb4281cc4e8d30ca58fd794a25a698cb ChangeLog 1147
-RMD160 a612ca48d4ac1eabbc152820074f29608b324f2b ChangeLog 1147
-SHA256 54f37ae8ec736421eb97f6ee6f2beb04074a4371b9a6f10052f31b7f86f04d4f ChangeLog 1147
+MISC ChangeLog 1264 RMD160 ed46463aae257d83b6bd0488ca588d4744c6572a SHA1 d76abcb0d03797281aa3bc15543272cb2fda4d73 SHA256 988361a68717777ec33c0722887b3ac87cbb480c403ea20d014e993eba9ac98d
+MD5 5d66e77fe38cf20526718e8f09721273 ChangeLog 1264
+RMD160 ed46463aae257d83b6bd0488ca588d4744c6572a ChangeLog 1264
+SHA256 988361a68717777ec33c0722887b3ac87cbb480c403ea20d014e993eba9ac98d ChangeLog 1264
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 e087ddd8c788afb3d12d7de0306d96d0 files/digest-slim-1.2.5-r2 232
-RMD160 16e6b4762e059ecea287807933d8fd48551390b6 files/digest-slim-1.2.5-r2 232
-SHA256 94cbe9129d5e576e8e1e3a54e40356e70cae9d798a01a203f626b8c801d06c0e files/digest-slim-1.2.5-r2 232
 MD5 678a395ce70e5b34a115840f2c3cfd79 files/digest-slim-1.2.6 232
 RMD160 0ee161cad4480a14f79786776b5b613e0b161d72 files/digest-slim-1.2.6 232
 SHA256 e3a6806e9b075b59ee16e27c33cb990a614469bea348d3f12bc5daf71f065cb2 files/digest-slim-1.2.6 232
diff --git a/x11-misc/slim/files/digest-slim-1.2.5-r2 b/x11-misc/slim/files/digest-slim-1.2.5-r2
deleted file mode 100644
index 6689f6993..000000000
--- a/x11-misc/slim/files/digest-slim-1.2.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 faa644d874abba2f02bdce7d90539f57 slim-1.2.5.tar.gz 216437
-RMD160 796dc2cf2f903a5d1d7e8aa92106bd9af7990d69 slim-1.2.5.tar.gz 216437
-SHA256 eee5c172a3397a2edc279d6a7a46c0075e05c022c4cb4417a14e3714626c9261 slim-1.2.5.tar.gz 216437
diff --git a/x11-misc/slim/files/slim-fix-warnings.patch b/x11-misc/slim/files/slim-fix-warnings.patch
deleted file mode 100644
index d4dd5ad01..000000000
--- a/x11-misc/slim/files/slim-fix-warnings.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- slim-1.2.5/cfg.cpp.orig	2006-08-18 14:18:12.000000000 +0900
-+++ slim-1.2.5/cfg.cpp	2006-08-18 14:20:34.000000000 +0900
-@@ -154,7 +154,7 @@
-     }
-     int pos = 0;
-     string line = s;
--    string::size_type len = line.length();
-+    int len = line.length();
-     while ( pos < len && isspace( line[pos] ) ) {
-         ++pos;
-     }
-@@ -240,7 +240,7 @@
-     if (sessions.size() <= 1)
-         return current;
- 
--    for (int i=0; i<sessions.size()-1; i++) {
-+    for (int i=0; i<(int)sessions.size()-1; i++) {
-         if (current == sessions[i]) {
-             return sessions[i+1];
-         }
---- slim-1.2.5/image.cpp.orig	2006-08-18 13:39:03.000000000 +0900
-+++ slim-1.2.5/image.cpp	2006-08-18 13:39:29.000000000 +0900
-@@ -391,7 +391,7 @@
- void Image::Center(const int w, const int h, const char *hex) {
- 
-     unsigned long packed_rgb;
--    sscanf(hex, "%x", &packed_rgb);  
-+    sscanf(hex, "%lx", &packed_rgb);  
- 
-     unsigned long r = packed_rgb>>16;
-     unsigned long g = packed_rgb>>8 & 0xff;
-@@ -471,7 +471,7 @@
- void Image::Plain(const int w, const int h, const char *hex) {
- 
-     unsigned long packed_rgb;
--    sscanf(hex, "%x", &packed_rgb);  
-+    sscanf(hex, "%lx", &packed_rgb);  
- 
-     unsigned long r = packed_rgb>>16;
-     unsigned long g = packed_rgb>>8 & 0xff;
---- slim-1.2.5/panel.cpp.orig	2006-08-18 13:49:18.000000000 +0900
-+++ slim-1.2.5/panel.cpp	2006-08-18 13:55:55.000000000 +0900
-@@ -239,7 +239,7 @@
- 
- void Panel::Cursor(int visible) {
-     char* text;
--    int xx, yy, x2,y2, cheight;
-+    int xx, yy, y2, cheight;
-     char* txth = "Wj"; // used to get cursor height
- 
-     switch(In->GetField()) {
-@@ -254,6 +254,12 @@
-             xx = input_name_x;
-             yy = input_name_y;
-             break;
-+
-+		default: /* Origin & NULL string as default values. */
-+			text = (char *)NULL;
-+			xx = (int)0;
-+			yy = (int)0;
-+			break;
-     }
- 
- 
-@@ -347,7 +353,7 @@
-     del = In->Key(buffer, keysym, singleInputMode);
-     Action = In->GetAction();
- 
--    XGlyphInfo extents, delextents;
-+    XGlyphInfo extents;
-     XftDraw *draw = XftDrawCreate(Dpy, Win,
-                                   DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr));
- 
-@@ -397,6 +403,12 @@
-             xx = input_name_x;
-             yy = input_name_y;
-             break;
-+
-+		default: /* Origin & NULL string as default values. */
-+			text = (char *)NULL;
-+			xx = (int)0;
-+			yy = (int)0;
-+			break;
-     }
- 
-     char* txth = "Wj"; // get proper maximum height ?
-@@ -431,7 +443,6 @@
- // Draw welcome and "enter username" message
- void Panel::ShowText(){
-     string cfgX, cfgY;
--    int n=-1;
-     XGlyphInfo extents;
- 
-     bool singleInputMode =
---- slim-1.2.5/switchuser.cpp.orig	2006-08-18 20:24:00.000000000 +0900
-+++ slim-1.2.5/switchuser.cpp	2006-08-18 20:25:12.000000000 +0900
-@@ -14,8 +14,8 @@
- using namespace std;
- 
- SwitchUser::SwitchUser(struct passwd *pw, Cfg *c, const string& display)
--    : Pw(pw),
--      cfg(c),
-+    : cfg(c),
-+      Pw(pw),
-       displayName(display)
- {
- }
-
diff --git a/x11-misc/slim/slim-1.2.5-r2.ebuild b/x11-misc/slim/slim-1.2.5-r2.ebuild
deleted file mode 100644
index e748fc154..000000000
--- a/x11-misc/slim/slim-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SLiM - Simple Login Manager"
-HOMEPAGE="http://slim.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="x11-proto/xproto
-	x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	media-libs/libpng
-	media-libs/jpeg"
-RDEPEND="${DEPEND}
-	media-fonts/corefonts"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-fix-warnings.patch
-
-	sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX):" \
-		-e "s:^CC=.*:CC=$(tc-getCC):" \
-		-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
-		-e "s:/usr/X11R6:/usr:" \
-		Makefile || die 'sed failed in Makefile'
-
-	# Remove all X11R6 references from slim.conf
-	# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop
-	# Set the default logfile to /dev/null to avoid cluttering up the harddisk
-	# as slim puts a lot of garbage in its logfile
-	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \
-		-e 's/# daemon/daemon/' \
-		-e 's#/var/log/slim.log#/dev/null#g' \
-		slim.conf || die "sed slim.conf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc xinitrc.sample README TODO THEMES
-}
-
-pkg_postinst() {
-	elog "The configuration file is located at /etc/slim.conf."
-	elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
-	elog "in /etc/rc.conf and run \"rc-update add xdm default\" "
-	elog
-	elog "${PN} uses .xinitrc in the user's home directory and /etc/slim.conf"
-	elog "for session management. For further information, see README and"
-	elog "xinitrc.sample in /usr/share/doc/${PF}"
-}