Add patch to build with gold linker and kerberos use flag by Michael (kensington) <gentoo@scribeofthenile.com>. Fixes bug #410879.

(Portage version: 2.2.0_alpha100/cvs/Linux i686)

4 files changed, 38 insertions, 3 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 6c2e8be4d03f..3e2d9b81b05b 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.286 2012/04/04 23:59:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.287 2012/04/12 08:02:03 johu Exp $
+
+  12 Apr 2012; Johannes Huber <johu@gentoo.org> +files/kdm-4.8.2-gold.patch,
+  kdm-4.8.1.ebuild, kdm-4.8.2.ebuild:
+  Add patch to build with gold linker and kerberos use flag by Michael
+  (kensington) <gentoo@scribeofthenile.com>. Fixes bug #410879.
 
 *kdm-4.8.2 (04 Apr 2012)
 
diff --git a/kde-base/kdm/files/kdm-4.8.2-gold.patch b/kde-base/kdm/files/kdm-4.8.2-gold.patch
new file mode 100644
index 000000000000..d1caa8d448da
--- /dev/null
+++ b/kde-base/kdm/files/kdm-4.8.2-gold.patch
@@ -0,0 +1,28 @@
+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/kdm-4.8.1.ebuild b/kde-base/kdm/kdm-4.8.1.ebuild
index b94bff98d4ba..ab137c413c81 100644
--- a/kde-base/kdm/kdm-4.8.1.ebuild
+++ b/kde-base/kdm/kdm-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.8.1.ebuild,v 1.3 2012/04/04 18:04:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.8.1.ebuild,v 1.4 2012/04/12 08:02:03 johu Exp $
 
 EAPI=4
 
@@ -40,6 +40,7 @@ KMEXTRA="
 PATCHES=(
 	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
 	"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
+	"${FILESDIR}/${PN}-4.8.2-gold.patch"
 )
 
 pkg_setup() {
diff --git a/kde-base/kdm/kdm-4.8.2.ebuild b/kde-base/kdm/kdm-4.8.2.ebuild
index 8dfb53dc217f..414425a68020 100644
--- a/kde-base/kdm/kdm-4.8.2.ebuild
+++ b/kde-base/kdm/kdm-4.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.8.2.ebuild,v 1.1 2012/04/04 23:59:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.8.2.ebuild,v 1.2 2012/04/12 08:02:03 johu Exp $
 
 EAPI=4
 
@@ -40,6 +40,7 @@ KMEXTRA="
 PATCHES=(
 	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
 	"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
+	"${FILESDIR}/${PN}-4.8.2-gold.patch"
 )
 
 pkg_setup() {