remove old, fix cflags override (bug 456144)

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

13 files changed, 51 insertions, 690 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 7d36c74c1554..1f412eed3d79 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.104 2013/02/12 20:22:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.105 2013/02/14 15:23:11 axs Exp $
+
+*slim-1.3.5-r2 (14 Feb 2013)
+
+  14 Feb 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/slim-1.3.5-honour-cflags.patch, +slim-1.3.5-r2.ebuild,
+  -files/14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch,
+  -files/15287-fix-pam-authentication-with-pam_unix2.patch,
+  -files/252280-fix-default_user-focus_passwd.patch,
+  -files/261359-fix-SIGTERM-freeze.patch,
+  -files/261713-restart-xserver-if-killed.patch,
+  -files/346037-stop_setting_host_for_pam_ck_connector_so.patch,
+  -files/slim-1.3.2-bsd-install.patch, -files/slim-1.3.2-ck.patch,
+  -files/slim-1.3.2-libpng15.patch, -files/slim-1.3.2-r3-config.diff,
+  -slim-1.3.2-r7.ebuild:
+  remove old, fix cflags override (bug 456144)
 
   12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> slim-1.3.5-r1.ebuild:
   Stable for sparc, wrt bug #455856
diff --git a/x11-misc/slim/files/14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch b/x11-misc/slim/files/14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch
deleted file mode 100644
index c9d8d0a5aed1..000000000000
--- a/x11-misc/slim/files/14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- app.cpp.orig	2009-01-13 11:30:36.000000000 +0900
-+++ app.cpp	2009-01-13 11:32:27.000000000 +0900
-@@ -270,21 +270,22 @@
-         signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
--        OpenLog();
--        
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-             daemonmode = true;
-         }
- 
-         // Daemonize
-         if (daemonmode) {
--            if (daemon(0, 1) == -1) {
-+            if (daemon(0, 0) == -1) {
-                 cerr << APPNAME << ": " << strerror(errno) << endl;
-                 exit(ERR_EXIT);
-             }
--            UpdatePid();
-         }
- 
-+        OpenLog();
-+        
-+        if (daemonmode) UpdatePid();
-+
-         CreateServerAuth();
-         StartServer();
-         alarm(2);
diff --git a/x11-misc/slim/files/15287-fix-pam-authentication-with-pam_unix2.patch b/x11-misc/slim/files/15287-fix-pam-authentication-with-pam_unix2.patch
deleted file mode 100644
index 2163d20a5e32..000000000000
--- a/x11-misc/slim/files/15287-fix-pam-authentication-with-pam_unix2.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp
-*** slim-1.3.1-orig/app.cpp	2008-09-26 02:54:15.000000000 +0200
---- slim-1.3.1/app.cpp	2009-02-17 19:50:06.000000000 +0100
-***************
-*** 41,48 ****
-      Panel* panel = *static_cast<Panel**>(appdata_ptr);
-      int result = PAM_SUCCESS;
-      for (int i=0; i<num_msg; i++){
-!         resp[i]->resp=0;
-!         resp[i]->resp_retcode=0;
-          switch(msg[i]->msg_style){
-              case PAM_PROMPT_ECHO_ON:
-                  // We assume PAM is asking for the username
---- 41,48 ----
-      Panel* panel = *static_cast<Panel**>(appdata_ptr);
-      int result = PAM_SUCCESS;
-      for (int i=0; i<num_msg; i++){
-!         (*resp)[i].resp=0;
-!         (*resp)[i].resp_retcode=0;
-          switch(msg[i]->msg_style){
-              case PAM_PROMPT_ECHO_ON:
-                  // We assume PAM is asking for the username
-***************
-*** 51,63 ****
-                      case Panel::Suspend:
-                      case Panel::Halt:
-                      case Panel::Reboot:
-!                         resp[i]->resp=strdup("root");
-                          break;
-  
-                      case Panel::Console:
-                      case Panel::Exit:
-                      case Panel::Login:
-!                         resp[i]->resp=strdup(panel->GetName().c_str());
-                          break;
-                  }
-                  break;
---- 51,63 ----
-                      case Panel::Suspend:
-                      case Panel::Halt:
-                      case Panel::Reboot:
-!                         (*resp)[i].resp=strdup("root");
-                          break;
-  
-                      case Panel::Console:
-                      case Panel::Exit:
-                      case Panel::Login:
-!                         (*resp)[i].resp=strdup(panel->GetName().c_str());
-                          break;
-                  }
-                  break;
-***************
-*** 73,79 ****
-  
-                      default:
-                          panel->EventHandler(Panel::Get_Passwd);
-!                         resp[i]->resp=strdup(panel->GetPasswd().c_str());
-                          break;
-                  }
-                  break;
---- 73,79 ----
-  
-                      default:
-                          panel->EventHandler(Panel::Get_Passwd);
-!                         (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
-                          break;
-                  }
-                  break;
-***************
-*** 89,97 ****
-      }
-      if (result!=PAM_SUCCESS){
-          for (int i=0; i<num_msg; i++){
-!             if (resp[i]->resp==0) continue;
-!             free(resp[i]->resp);
-!             resp[i]->resp=0;
-          };
-          free(*resp);
-          *resp=0;
---- 89,97 ----
-      }
-      if (result!=PAM_SUCCESS){
-          for (int i=0; i<num_msg; i++){
-!             if ((*resp)[i].resp==0) continue;
-!             free((*resp)[i].resp);
-!             (*resp)[i].resp=0;
-          };
-          free(*resp);
-          *resp=0;
diff --git a/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch b/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch
deleted file mode 100644
index 6ffbafe08057..000000000000
--- a/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /var/tmp/portage/x11-misc/slim-1.3.2-r5/work/slim-1.3.2/panel.cpp	2011-09-07 12:36:06.000000000 -0400
-+++ /tmp/panel.cpp	2011-09-07 12:35:19.000000000 -0400
-@@ -644,6 +644,7 @@
- 
- void Panel::SetName(const string& name){
-     NameBuffer=name;
-+    action = Login;
-     return;
- };
- const string& Panel::GetName(void) const{
diff --git a/x11-misc/slim/files/261359-fix-SIGTERM-freeze.patch b/x11-misc/slim/files/261359-fix-SIGTERM-freeze.patch
deleted file mode 100644
index b3d1ab10b2d8..000000000000
--- a/x11-misc/slim/files/261359-fix-SIGTERM-freeze.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=261359
-http://developer.berlios.de/bugs/?func=detailbug&bug_id=15326&group_id=2663
-
-diff --git a/panel.cpp b/panel.cpp
-index 032574d..075c008 100644
---- a/panel.cpp
-+++ b/panel.cpp
-@@ -10,6 +10,7 @@
- */
- 
- #include <sstream>
-+#include <poll.h>
- #include "panel.h"
- 
- using namespace std;
-@@ -288,16 +289,24 @@ void Panel::EventHandler(const Panel::FieldType& curfield) {
-     field=curfield;
-     bool loop = true;
-     OnExpose();
-+
-+    struct pollfd x11_pfd = {0};
-+    x11_pfd.fd = ConnectionNumber(Dpy);
-+    x11_pfd.events = POLLIN;
-     while(loop) {
--        XNextEvent(Dpy, &event);
--        switch(event.type) {
--            case Expose:
--                OnExpose();
--                break;
-+        if(XPending(Dpy) || poll(&x11_pfd, 1, -1) > 0) {
-+            while(XPending(Dpy)) {
-+                XNextEvent(Dpy, &event);
-+                switch(event.type) {
-+                    case Expose:
-+                        OnExpose();
-+                        break;
- 
--            case KeyPress:
--                loop=OnKeyPress(event);
--                break;
-+                    case KeyPress:
-+                        loop=OnKeyPress(event);
-+                        break;
-+                }
-+            }
-         }
-     }
- 
diff --git a/x11-misc/slim/files/261713-restart-xserver-if-killed.patch b/x11-misc/slim/files/261713-restart-xserver-if-killed.patch
deleted file mode 100644
index 2ea774b81eac..000000000000
--- a/x11-misc/slim/files/261713-restart-xserver-if-killed.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: trunk/app.h
-===================================================================
---- trunk/app.h	(revision 151)
-+++ trunk/app.h	(working copy)
-@@ -34,6 +34,7 @@
-     ~App();
-     void Run();
-     int GetServerPID();
-+    void RestartServer();
-     void StopServer();
- 
-     // Lock functions
-@@ -48,7 +49,6 @@
-     void Console();
-     void Exit();
-     void KillAllClients(Bool top);
--    void RestartServer();
-     void ReadConfig();
-     void OpenLog();
-     void CloseLog();
-Index: trunk/app.cpp
-===================================================================
---- trunk/app.cpp	(revision 151)
-+++ trunk/app.cpp	(working copy)
-@@ -100,6 +100,11 @@
- 
- extern App* LoginApp;
- 
-+int xioerror(Display *disp) {
-+	LoginApp->RestartServer();
-+    return 0;
-+}
-+
- void CatchSignal(int sig) {
-     cerr << APPNAME << ": unexpected signal " << sig << endl;
-     LoginApp->StopServer();
-@@ -107,19 +112,6 @@
-     exit(ERR_EXIT);
- }
- 
--
--void AlarmSignal(int sig) {
--    int pid = LoginApp->GetServerPID();
--    if(waitpid(pid, NULL, WNOHANG) == pid) {
--        LoginApp->StopServer();
--        LoginApp->RemoveLock();
--        exit(OK_EXIT);
--    }
--    signal(sig, AlarmSignal);
--    alarm(2);
--}
--
--
- void User1Signal(int sig) {
-     signal(sig, User1Signal);
- }
-@@ -257,7 +249,6 @@
-         signal(SIGHUP, CatchSignal);
-         signal(SIGPIPE, CatchSignal);
-         signal(SIGUSR1, User1Signal);
--        signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
-         OpenLog();
-@@ -277,7 +268,6 @@
- 
-         CreateServerAuth();
-         StartServer();
--        alarm(2);
- #endif
- 
-     }
-@@ -575,6 +565,8 @@
-     int status;
-     while (wpid != pid) {
-         wpid = wait(&status);
-+		if (wpid == ServerPID)
-+			xioerror(Dpy);	// Server died, simulate IO error
-     }
-     if (WIFEXITED(status) && WEXITSTATUS(status)) {
-         LoginPanel->Message("Failed to execute login command");
-@@ -620,9 +612,6 @@
- 
- 
- void App::Reboot() {
--    // Stop alarm clock
--    alarm(0);
--
- #ifdef USE_PAM
-     try{
-         pam.end();
-@@ -645,9 +634,6 @@
- 
- 
- void App::Halt() {
--    // Stop alarm clock
--    alarm(0);
--
- #ifdef USE_PAM
-     try{
-         pam.end();
-@@ -733,6 +719,7 @@
- 
-     StopServer(); 
-     RemoveLock();
-+	while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens
-     Run();
- } 
- 
-@@ -803,6 +790,7 @@
- 
-     for(cycles = 0; cycles < ncycles; cycles++) {
-         if((Dpy = XOpenDisplay(DisplayName))) {
-+            XSetIOErrorHandler(xioerror);
-             return 1;
-         } else {
-             if(!ServerTimeout(1, "X server to begin accepting connections"))
-@@ -885,9 +873,6 @@
-             ServerPID = -1;
-             break;
-         }
--        alarm(15);
--        pause();
--        alarm(0);
- 
-         // Wait for server to start up
-         if(WaitForServer() == 0) {
-@@ -920,15 +905,12 @@
- 
- 
- void App::StopServer() {
--    // Stop alars clock and ignore signals
--    alarm(0);
-     signal(SIGQUIT, SIG_IGN);
-     signal(SIGINT, SIG_IGN);
-     signal(SIGHUP, SIG_IGN);
-     signal(SIGPIPE, SIG_IGN);
-     signal(SIGTERM, SIG_DFL);
-     signal(SIGKILL, SIG_DFL);
--    signal(SIGALRM, SIG_DFL);
- 
-     // Catch X error
-     XSetIOErrorHandler(IgnoreXIO);
diff --git a/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch b/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch
deleted file mode 100644
index 6d9c395f6bc4..000000000000
--- a/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/346037
-
---- app.cpp
-+++ app.cpp
-@@ -236,7 +236,6 @@
-         pam.start("slim");
-         pam.set_item(PAM::Authenticator::TTY, DisplayName);
-         pam.set_item(PAM::Authenticator::Requestor, "root");
--        pam.set_item(PAM::Authenticator::Host, "localhost");
- 
-     }
-     catch(PAM::Exception& e){
diff --git a/x11-misc/slim/files/slim-1.3.2-bsd-install.patch b/x11-misc/slim/files/slim-1.3.2-bsd-install.patch
deleted file mode 100644
index 4fd85b05c595..000000000000
--- a/x11-misc/slim/files/slim-1.3.2-bsd-install.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b743389..f7c1b33 100644
---- a/Makefile
-+++ b/Makefile
-@@ -42,10 +42,13 @@ slim: $(OBJECTS)
- 	$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
- 
- install: slim install-theme
--	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
--	install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim	
-+	install -d $(DESTDIR)$(MANDIR)/man1
-+	install -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
- 	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
--		install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
-+		(install -d $(DESTDIR)$(CFGDIR); \
-+		 install -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf)
- 
- clean:
- 	@rm -f slim *.o
-@@ -61,9 +64,10 @@ dist:
- 
- 
- install-theme:
--	install -D -m 644 themes/default/slim.theme \
-+	install -d $(DESTDIR)$(PREFIX)/share/slim/themes/default
-+	install -m 644 themes/default/slim.theme \
- 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme
--	install -D -m 644 themes/default/panel.png \
-+	install -m 644 themes/default/panel.png \
- 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png
--	install -D -m 644 themes/default/background.jpg \
-+	install -m 644 themes/default/background.jpg \
- 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg
diff --git a/x11-misc/slim/files/slim-1.3.2-ck.patch b/x11-misc/slim/files/slim-1.3.2-ck.patch
deleted file mode 100644
index e46538f8ca2a..000000000000
--- a/x11-misc/slim/files/slim-1.3.2-ck.patch
+++ /dev/null
@@ -1,185 +0,0 @@
---- a/slim-1.3.2/app.cpp
-+++ b/slim-1.3.2/app.cpp
-@@ -536,6 +536,60 @@
-     string xauthority = pw->pw_dir;
-     xauthority.append("/.Xauthority");
-     
-+#ifdef USE_CONSOLEKIT
-+  cerr << APPNAME << ": consolekit support enabled" << endl;
-+    int ret;
-+    DBusError error;
-+    char  *remote_host_name = "";
-+    dbus_bool_t is_local;
-+    char *display_device = "";
-+    //char devtmp[16];
-+
-+    // if (!use_consolekit) return 1;
-+    cerr << APPNAME << ": initializing a consolekit session" << endl;
-+
-+    is_local = TRUE; //is_local = Dpy->displayType.location == Local;
-+    //if (Dpy->peerlen > 0 && Dpy->peer)
-+    //remote_host_name = Dpy->peer;
-+    /* how can we get the corresponding tty at best...? */
-+//    if (Dpy->windowPath) {
-+//   display_device = strchr(Dpy->windowPath, ':');
-+//   if (display_device && display_device[1])
-+//       display_device++;
-+//   else
-+//       display_device = Dpy->windowPath;
-+//   snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
-+//   display_device = devtmp;
-+display_device = dpy_tty; //    }
-+
-+    ckconnector = ck_connector_new();
-+    if (!ckconnector) {
-+      cerr << APPNAME << ": ck_connector not initialized" << endl;
-+   //return 0;
-+    }
-+
-+    dbus_error_init(&error);
-+    ret = ck_connector_open_session_with_parameters(
-+       ckconnector, &error,
-+       "unix-user", &pw->pw_uid,
-+       "x11-display", &DisplayName,
-+       "x11-display-device", &display_device,
-+       "remote-host-name", &remote_host_name,
-+       "is-local", &is_local,
-+       NULL);
-+    if (!ret) {
-+   if (dbus_error_is_set(&error)) {
-+       cerr << APPNAME << ": Dbus error: " << error.message << endl;
-+       dbus_error_free(&error);
-+   } else {
-+       cerr << APPNAME << ": ConsoleKit error" << endl;
-+   }
-+   cerr << APPNAME << ": console-kit-daemon not running?" << endl;
-+   ck_connector_unref(ckconnector);
-+   ckconnector = NULL;
-+    }  
-+#endif
-+
- #ifdef USE_PAM
-     // Setup the PAM environment
-     try{
-@@ -548,6 +602,10 @@
-         pam.setenv("DISPLAY", DisplayName);
-         pam.setenv("MAIL", maildir.c_str());
-         pam.setenv("XAUTHORITY", xauthority.c_str());
-+#ifdef USE_CONSOLEKIT
-+        pam.setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(ckconnector));
-+    cerr << APPNAME << ": ck_connector has XDG_SESSION_COOKIE of " << ck_connector_get_cookie(ckconnector) << endl;
-+#endif
-     }
-     catch(PAM::Exception& e){
-         cerr << APPNAME << ": " << e << endl;
-@@ -564,7 +622,11 @@
-         char** child_env = pam.getenvlist();
-         pam.end();
- #else
-+#if USE_CONSOLEKIT
-+        const int Num_Of_Variables = 11; // Number of env. variables + 1
-+#else
-         const int Num_Of_Variables = 10; // Number of env. variables + 1
-+#endif
-         char** child_env = static_cast<char**>(malloc(sizeof(char*)*Num_Of_Variables));
-         int n = 0;
-         if(term) child_env[n++]=StrConcat("TERM=", term);
-@@ -576,6 +638,10 @@
-         child_env[n++]=StrConcat("DISPLAY=", DisplayName);
-         child_env[n++]=StrConcat("MAIL=", maildir.c_str());
-         child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
-+#if USE_CONSOLEKIT
-+	        child_env[n++]=StrConcat("XDG_SESSION_COOKIE=", ck_connector_get_cookie(ckconnector));
-+    cerr << APPNAME << ": ck_connector has XDG_SESSION_COOKIE of " << ck_connector_get_cookie(ckconnector) << endl;
-+#endif
-         child_env[n++]=0;
- #endif
- 
-@@ -617,6 +683,28 @@
-         }
-     }
- 
-+#ifdef USE_CONSOLEKIT
-+  
-+    //DBusError error;
-+
-+   // if (!ckconnector)
-+   //return;
-+
-+    //dbus_error_init(&error);
-+    if (!ck_connector_close_session(ckconnector, &error)) {
-+   if (dbus_error_is_set(&error)) {
-+       cerr << APPNAME << ": Dbus error: " << error.message << endl;
-+       dbus_error_free(&error);
-+   } else {
-+       cerr << APPNAME << ": ConsoleKit close error" << endl;
-+   }
-+   cerr << APPNAME << ": console-kit-daemon not running?" << endl;
-+    }
-+    ck_connector_unref(ckconnector);
-+    ckconnector = NULL;
-+  //}
-+#endif
-+
- #ifdef USE_PAM
-     try{
-         pam.close_session();
-@@ -881,12 +969,18 @@
-             bool ok = false;
-             Cfg::string2int(server[i]+2, &ok);
-             if (ok) {
-+#ifdef USE_CONSOLEKIT
-+		sprintf(dpy_tty,"/dev/tty%d",atoi(server[i]+2));
-+#endif
-                 hasVtSet = true;
-             }
-         }
-     }
- 
-     if (!hasVtSet && daemonmode) {
-+#ifdef USE_CONSOLEKIT
-+	sprintf(dpy_tty,"/dev/tty7");
-+#endif
-         server[argc++] = (char*)"vt07";
-     }
-     server[argc] = NULL;
---- a/slim-1.3.2/app.h
-+++ b/slim-1.3.2/app.h
-@@ -27,6 +27,10 @@
- #ifdef USE_PAM
- #include "PAM.h"
- #endif
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
- 
- class App {
- public:
-@@ -81,6 +85,12 @@
- #ifdef USE_PAM
- 	PAM::Authenticator pam;
- #endif
-+#ifdef USE_CONSOLEKIT
-+	CkConnector *ckconnector;
-+	int use_consolekit;
-+	char dpy_tty[16];
-+#endif
-+
- 
-     // Options
-     char* DispName;
---- a/slim-1.3.2/Makefile
-+++ b/slim-1.3.2/Makefile
-@@ -13,6 +13,11 @@
- LDFLAGS+= -lpam
- CUSTOM+= -DUSE_PAM
- endif
-+ifdef USE_CONSOLEKIT
-+LDFLAGS+= `pkg-config --libs ck-connector`
-+CFLAGS+= `pkg-config --cflags ck-connector`
-+CUSTOM+= -DUSE_CONSOLEKIT
-+endif
- PREFIX=/usr
- CFGDIR=/etc
- MANDIR=/usr/share/man
diff --git a/x11-misc/slim/files/slim-1.3.2-libpng15.patch b/x11-misc/slim/files/slim-1.3.2-libpng15.patch
deleted file mode 100644
index 720608567d81..000000000000
--- a/x11-misc/slim/files/slim-1.3.2-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- png.c
-+++ png.c
-@@ -57,7 +57,7 @@
-         return(0);
-     }
-   
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
-         fclose(infile);
diff --git a/x11-misc/slim/files/slim-1.3.2-r3-config.diff b/x11-misc/slim/files/slim-1.3.2-r3-config.diff
deleted file mode 100644
index 3cdcee3f1837..000000000000
--- a/x11-misc/slim/files/slim-1.3.2-r3-config.diff
+++ /dev/null
@@ -1,74 +0,0 @@
---- slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
-+++ slim.conf	2010-08-25 11:58:58.000000000 -0400
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path        /bin:/usr/bin:/usr/local/bin
- default_xserver     /usr/bin/X
--#xserver_arguments   -dpi 75
-+xserver_arguments   -nolisten tcp -br -deferglyphs 16
- 
- # Commands for halt, login, etc.
- halt_cmd            /sbin/shutdown -h now
-@@ -18,7 +18,7 @@
- 
- 
- # Activate numlock when slim starts. Valid values: on|off
--# numlock             on
-+numlock             on
- 
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,7 +33,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd           exec /bin/sh - ~/.xinitrc %session
--login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
- 
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -41,20 +42,27 @@
- #
- # sessionstart_cmd	some command
- # sessionstop_cmd	some command
-+sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
- 
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon	yes
-+daemon	yes
- 
--# Available sessions (first one is the default).
--# The current chosen session name is replaced in the login_cmd
-+# Available sessions:
-+# The current chosen session name replaces %session in the login_cmd
- # above, so your login command can handle different sessions.
-+# If no session is chosen (via F1), %session will be an empty string.
- # see the xinitrc.sample file shipped with slim sources
--sessions            xfce4,icewm,wmaker,blackbox
-+#sessions            xfce4,icewm,wmaker,blackbox
-+# Alternatively, read available sessions from a directory:
-+sessiondir           /etc/X11/Sessions
- 
--# Executed when pressing F11 (requires imagemagick)
-+# Executed when pressing F11 (requires media-gfx/imagemagick for import)
-+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
- screenshot_cmd      import -window root /slim.png
-+#screenshot_cmd      scrot /root/slim.png
- 
- # welcome message. Available variables: %host, %domain
- welcome_msg         Welcome to %host
-@@ -83,8 +88,8 @@
- # randomly choose from
- current_theme       default
- 
--# Lock file
--lockfile            /var/run/slim.lock
-+# Lock file, /etc/init.d/xdm expects slim.pid
-+lockfile            /var/run/slim.pid
- 
- # Log file
- logfile             /var/log/slim.log
diff --git a/x11-misc/slim/files/slim-1.3.5-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.5-honour-cflags.patch
new file mode 100644
index 000000000000..e628c30bf596
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.5-honour-cflags.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt	2013-02-08 08:28:40.000000000 -0500
++++ CMakeLists.txt.new	2013-02-08 08:29:48.000000000 -0500
+@@ -41,10 +41,6 @@
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
+ 
+-# Flags
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2" )
+-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2" )
+-
+ # source 
+ set(slim_srcs
+ 	main.cpp
diff --git a/x11-misc/slim/slim-1.3.2-r7.ebuild b/x11-misc/slim/slim-1.3.5-r2.ebuild
index 3d40f9ea166b..a61b3e12a1bf 100644
--- a/x11-misc/slim/slim-1.3.2-r7.ebuild
+++ b/x11-misc/slim/slim-1.3.5-r2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r7.ebuild,v 1.7 2012/11/04 01:02:57 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5-r2.ebuild,v 1.1 2013/02/14 15:23:11 axs Exp $
 
-EAPI=4
+EAPI=5
 
-inherit toolchain-funcs pam eutils versionator
+CMAKE_MIN_VERSION="2.8.8"
+inherit cmake-utils pam eutils systemd versionator
 
 DESCRIPTION="Simple Login Manager"
 HOMEPAGE="http://slim.berlios.de"
@@ -12,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="branding pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
@@ -20,7 +21,7 @@ RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXft
-	>=media-libs/libpng-1.4:0
+	media-libs/libpng:0=
 	virtual/jpeg
 	x11-apps/sessreg
 	consolekit? ( sys-auth/consolekit
@@ -32,68 +33,36 @@ DEPEND="${RDEPEND}
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 src_prepare() {
-
-	# respect C[XX]FLAGS, fix crosscompile,
-	# fix linking order for --as-needed"
-	sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \
-		-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \
-		-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
-		-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
-		-e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \
-		-e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
-		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
-		Makefile || die "sed failed in Makefile"
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${PN}-1.3.2-r3-config.diff
+	epatch "${FILESDIR}"/${PN}-1.3.4-config.diff
+	epatch "${FILESDIR}"/${P}-arm.patch
+	epatch "${FILESDIR}"/${P}-systemd-service.patch
+	epatch "${FILESDIR}"/${P}-honour-cflags.patch
 
 	if use elibc_FreeBSD; then
-		sed -i -e "s/CUSTOM=-DHAVE_SHADOW/CUSTOM=-DNEEDS_BASENAME/" Makefile \
-			|| die "sed failed in Makefile"
-		epatch "${FILESDIR}"/${PN}-1.3.2-bsd-install.patch
+		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
+			|| die
 	fi
 
 	if use branding; then
 		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
 	fi
-
-	# Gentoo bug 297655
-	epatch "${FILESDIR}"/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch
-	# Upstream bug #15287
-	epatch "${FILESDIR}"/15287-fix-pam-authentication-with-pam_unix2.patch
-	# Gentoo Bug 261713
-	epatch "${FILESDIR}"/261713-restart-xserver-if-killed.patch
-	# Gentoo bug 261359, upstream 15326
-	epatch "${FILESDIR}"/261359-fix-SIGTERM-freeze.patch
-	# Gentoo bug 346037
-	epatch "${FILESDIR}"/346037-stop_setting_host_for_pam_ck_connector_so.patch
-	# Gentoo bug 378505
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	# Gentoo bug 252280
-	epatch "${FILESDIR}"/252280-fix-default_user-focus_passwd.patch
-	# Native consolekit support
-	epatch "${FILESDIR}"/${P}-ck.patch
 }
 
-src_compile() {
-	if use consolekit && use pam ; then
-		emake USE_PAM=1 USE_CONSOLEKIT=1
-	elif use pam ; then
-		emake USE_PAM=1
-	else
-		emake
-	fi
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use pam USE_PAM)
+		$(cmake-utils_use consolekit USE_CONSOLEKIT)
+	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
+	cmake-utils_src_install
+
 	if use pam ; then
-		if use consolekit ; then
-			emake USE_PAM=1 USE_CONSOLEKIT=1 DESTDIR="${D}" install
-		else
-			emake USE_PAM=1 DESTDIR="${D}" install
-		fi
 		pamd_mimic system-local-login slim auth account session
-	else
-		emake DESTDIR="${D}" install
 	fi
 
 	insinto /usr/share/slim