Remove old.

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

5 files changed, 7 insertions, 218 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 2b07c4b4a3b5..c84d13dd544f 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.305 2012/09/03 13:29:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.306 2012/09/03 14:01:38 johu Exp $
+
+  03 Sep 2012; Johannes Huber <johu@gentoo.org>
+  -files/kdebase-4.0.2-pam-optional.patch,
+  -files/kdm-4.7.3-revertcrashlogic.patch, -files/kdm-4.8.2-gold.patch,
+  -files/kdm-4.8.2-grub2.patch:
+  Remove old.
 
   03 Sep 2012; Johannes Huber <johu@gentoo.org> -kdm-4.7.4.ebuild,
   -kdm-4.7.4-r1.ebuild:
@@ -1252,4 +1258,3 @@
   +files/kde.pam, +kdm-3.4.0_beta1.ebuild:
   Adding the split ebuilds to portage. For KDE 3.4, we've created separate
   ebuilds for all the KDE apps.
-
diff --git a/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch
deleted file mode 100644
index 6fb54f05c547..000000000000
--- a/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
-index 3499836..cd1c2bb 100644
---- a/kdebase/workspace/cmake/modules/FindPAM.cmake
-+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
-@@ -5,6 +5,8 @@
- #  PAM_INCLUDE_DIR - the pam include directory
- #  PAM_LIBRARIES - libpam library
- 
-+if (WITH_PAM)
-+
- if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
- 	# Already in cache, be silent
- 	set(PAM_FIND_QUIETLY TRUE)
-@@ -72,3 +74,5 @@ else (PAM_FOUND)
- endif (PAM_FOUND)
- 
- mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
-+
-+endif (WITH_PAM)
-diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
-index ed8ab9e..ce3bcc2 100644
---- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
-+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
-@@ -1,4 +1,4 @@
--find_package(PAM)
-+macro_optional_find_package(PAM)
- 
- set(UNIXAUTH_LIBRARIES)
- set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/kdm/files/kdm-4.7.3-revertcrashlogic.patch b/kde-base/kdm/files/kdm-4.7.3-revertcrashlogic.patch
deleted file mode 100644
index 94e47d572d3a..000000000000
--- a/kde-base/kdm/files/kdm-4.7.3-revertcrashlogic.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff --git a/kdm/backend/greet.h b/kdm/backend/greet.h
-index 2ef7026..41f0791 100644
---- a/kdm/backend/greet.h
-+++ b/kdm/backend/greet.h
-@@ -146,8 +146,6 @@ from the copyright holder.
- #define G_DChoose  3    /* run chooser */
- #endif
- 
--#define G_Interact 4    /* greeter got user input. possible crash is probably not spontaneous. */
--
- #define G_Shutdown      101 /* 5*int, string; async */
- # define SHUT_REBOOT      1     /* how */
- # define SHUT_HALT        2
-diff --git a/kdm/backend/session.c b/kdm/backend/session.c
-index 85ab1d7..1b47e9c 100644
---- a/kdm/backend/session.c
-+++ b/kdm/backend/session.c
-@@ -409,12 +409,16 @@ void
- openGreeter()
- {
-     char *name, **env;
-+    static time_t lastStart;
-     int cmd;
-     Cursor xcursor;
- 
-     gSet(&grttalk);
-     if (grtproc.pid > 0)
-         return;
-+    updateNow();
-+    if (now < lastStart + 10) /* XXX should use some readiness indicator instead */
-+        sessionExit(EX_UNMANAGE_DPY);
-     ASPrintf(&name, "greeter for display %s", td->name);
-     debug("starting %s\n", name);
- 
-@@ -443,6 +447,8 @@ openGreeter()
-         sessionExit(EX_UNMANAGE_DPY);
-     }
-     debug("%s ready\n", name);
-+    updateNow();
-+    lastStart = now;
- }
- 
- int
-@@ -544,7 +550,7 @@ manageSession(void)
- {
-     int ex, cmd;
-     volatile int clientPid = -1;
--    time_t tdiff, startt;
-+    time_t tdiff;
- 
-     debug("manageSession %s\n", td->name);
-     if ((ex = Setjmp(abortSession))) {
-@@ -576,13 +582,10 @@ manageSession(void)
-     updateNow();
-     tdiff = now - td->hstent->lastExit - td->openDelay;
-     if (autoLogon(tdiff)) {
--        if (!verify(conv_auto, False)) {
--            startt = now;
-+        if (!verify(conv_auto, False))
-             goto gcont;
--        }
-     } else {
-       regreet:
--        startt = now;
-         openGreeter();
- #ifdef XDMCP
-         if (((td->displayType & d_location) == dLocal) &&
-@@ -596,10 +599,6 @@ manageSession(void)
-                           G_GreetTimed : G_Greet);
-           gcont:
-             cmd = ctrlGreeterWait(True);
--            if (cmd == G_Interact) {
--                startt = 0;
--                goto gcont;
--            }
- #ifdef XDMCP
-             while (cmd == G_DChoose) {
-               choose:
-@@ -616,9 +615,6 @@ manageSession(void)
-                 logError("Received unknown command %d from greeter\n", cmd);
-                 closeGreeter(True);
-             }
--            updateNow();
--            if (now < startt + 120) /* Greeter crashed spontaneously. Avoid endless loop. */
--                sessionExit(EX_UNMANAGE_DPY);
-             goto regreet;
-         }
-     }
-diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
-index f169248..1bb744c 100644
---- a/kdm/kfrontend/kgapp.cpp
-+++ b/kdm/kfrontend/kgapp.cpp
-@@ -74,7 +74,7 @@ sigAlarm(int)
- 
- GreeterApp::GreeterApp(int &argc, char **argv) :
-     inherited(argc, argv),
--    regrabPtr(false), regrabKbd(false), initalBusy(true), sendInteract(false),
-+    regrabPtr(false), regrabKbd(false), initalBusy(true),
-     dragWidget(0)
- {
-     pingInterval = _isLocal ? 0 : _pingInterval;
-@@ -203,14 +203,6 @@ GreeterApp::x11EventFilter(XEvent * ev)
-             break;
-         }
-         break;
--    default:
--        return false;
--    }
--    if (sendInteract) {
--        sendInteract = false;
--        // We assume that no asynchronous communication is going on
--        // before the first user interaction.
--        gSendInt(G_Interact);
-     }
-     return false;
- }
-@@ -487,7 +479,6 @@ main(int argc ATTR_UNUSED, char **argv)
-             }
-         }
-         QObject::connect(dialog, SIGNAL(ready()), &app, SLOT(markReady()));
--        app.enableSendInteract();
-         debug("entering event loop\n");
-         rslt = dialog->exec();
-         debug("left event loop\n");
-diff --git a/kdm/kfrontend/kgapp.h b/kdm/kfrontend/kgapp.h
-index b7c1b97..0979950 100644
---- a/kdm/kfrontend/kgapp.h
-+++ b/kdm/kfrontend/kgapp.h
-@@ -37,7 +37,6 @@ class GreeterApp : public QApplication {
-   public:
-     GreeterApp(int &argc, char **argv);
-     void markBusy();
--    void enableSendInteract() { sendInteract = true; }
-     virtual bool x11EventFilter(XEvent *);
- 
-   public Q_SLOTS:
-@@ -51,7 +50,7 @@ class GreeterApp : public QApplication {
- 
-   private:
-     int pingInterval, pingTimerId;
--    bool regrabPtr, regrabKbd, initalBusy, sendInteract;
-+    bool regrabPtr, regrabKbd, initalBusy;
-     QPoint mouseStartPos, dialogStartPos;
-     QWidget *dragWidget;
- };
diff --git a/kde-base/kdm/files/kdm-4.8.2-gold.patch b/kde-base/kdm/files/kdm-4.8.2-gold.patch
deleted file mode 100644
index d1caa8d448da..000000000000
--- a/kde-base/kdm/files/kdm-4.8.2-gold.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/kdm/ConfigureChecks.cmake b/kdm/ConfigureChecks.cmake
-index 0f969f73780e0b45edcb894084e0a3aaa8f72d69..cc2e37a7e5f56ba06040f85e0ded4258b6feb958 100644
---- a/kdm/ConfigureChecks.cmake
-+++ b/kdm/ConfigureChecks.cmake
-@@ -170,6 +170,11 @@ if (KDE4_KRB5AUTH)
- Due to a problem with X includes you probably have to run \"ln -s . krb5\"
- in the directory where the krb5.h include resides to make things actually work.")
-         endif (KRB5_INCLUDE_DIR)
-+        find_library(COMERR_LIBRARY com_err)
-+        if (NOT COMERR_LIBRARY)
-+            message(FATAL_ERROR "Kerberos5 support is enabled, but required libcomerr
-+could not be found.")
-+        endif (NOT COMERR_LIBRARY)
-     endif (KRB5_LIBRARIES)
-     mark_as_advanced(KRB5_INCLUDE_DIR KRB5_LIBRARIES)
-     macro_bool_to_01(KRB5AUTH_FOUND K5AUTH)
-diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt
-index e94a3b9c68b0da0b5f2ef794e2e67cc7f4c3db5f..25f383f3148a1369d63cf0150ae8c63bb95d7790 100644
---- a/kdm/backend/CMakeLists.txt
-+++ b/kdm/backend/CMakeLists.txt
-@@ -56,6 +56,7 @@ target_link_libraries( kdm
- 	${S_LIBRARIES}
- 	${KRB4_LIBRARIES}
- 	${KRB5_LIBRARIES}
-+	${COMERR_LIBRARY}
- 	${NSL_LIBRARIES}
- 	${RESOLV_LIBRARIES}
- 	${SOCKET_LIBRARIES}
diff --git a/kde-base/kdm/files/kdm-4.8.2-grub2.patch b/kde-base/kdm/files/kdm-4.8.2-grub2.patch
deleted file mode 100644
index d48bd106f56c..000000000000
--- a/kde-base/kdm/files/kdm-4.8.2-grub2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr kdm-4.8.2_orig/kdm/backend/bootman.c kdm-4.8.2/kdm/backend/bootman.c
---- kdm-4.8.2_orig/kdm/backend/bootman.c	2012-03-30 05:02:31.000000000 +0700
-+++ kdm-4.8.2/kdm/backend/bootman.c	2012-04-26 09:33:58.683462475 +0700
-@@ -224,8 +224,8 @@
- static int
- getGrub2(char ***opts, int *def, int *cur)
- {
--    grubConfig = "/boot/grub/grub.cfg";
--    return getGrub2OrBurg(opts, def, cur, "grub-reboot");
-+    grubConfig = "/boot/grub2/grub.cfg";
-+    return getGrub2OrBurg(opts, def, cur, "grub2-reboot");
- }
- 
- static int