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

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

5 files changed, 49 insertions, 13 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/Manifest b/kde-base/kdm/Manifest
index 7da864dc6ce2..ab348fc26ecc 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -4,24 +4,25 @@ Hash: SHA512
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684
 AUX kdm-4.7.3-revertcrashlogic.patch 4452 RMD160 27f96bf067fc2f45919b9114f74f998c236a2e5b SHA1 108c6acb5dd9fb042a5f4e9c4e3c5d9916fd7f94 SHA256 74f339d17e61c8431726b1c3975423b4cf19ea569990db35e83bf23d1a4b6d1f
+AUX kdm-4.8.2-gold.patch 1229 RMD160 8bbdb5f0c3aa9566a161797422d94bd5de365f81 SHA1 34ae4734415df7dc0511ec1047684d7dc76707fb SHA256 27cbd95f7f6a5281c8af54392cc442a022c03bc553fbd4f2c94d6db8314bf023
 AUX kdm-logrotate 111 RMD160 dfdebb05a456a2a6a83faa86e47ff847618634dd SHA1 af020c65a8a27f49b178bb1cb42e9786cf6a578b SHA256 516523c6db0b85d33f0a90d284e707ed4d2ba426b154872af2e8e9389e4ef089
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kde-workspace-4.8.1.tar.xz 33575180 RMD160 e10ff44ca7281bb89b87441d10c68aa2234db9c0 SHA1 675df4befd736e770e3029af8d38800c9018e888 SHA256 d8d15fb8ea47f4424ba97f252a79fb486794848dbe58417d2137ab466deff4b3
 DIST kde-workspace-4.8.2.tar.xz 34081864 RMD160 3afa0b2bb7b037cadee947382b009a76c8fad843 SHA1 3cd36ed633def0db74ad872a0d6385bf06662121 SHA256 ad3bb23ee86cca96be608a856420f45ac636dc89405c9c6cd32d2b85e4b09928
 EBUILD kdm-4.7.4-r1.ebuild 4335 RMD160 45587843f7234cf138f4e46edcc1f8800d94a050 SHA1 04315397419449be942466b8ae0b111f55f2b946 SHA256 1fa4dd50ccbeb1e9ccf2539ec0e05103a015568b0d10ca33c25cdfe8901d22b7
 EBUILD kdm-4.7.4.ebuild 4379 RMD160 9564ca6c929911f8dadea0140f1b990a6910eace SHA1 d1100959df3ee92a8ed633ca2b3202c1ee6de7fa SHA256 3ef143f353a2b53359babbe419c2d0559084a4a5015a3ad0dc0b8d3ff82549bb
-EBUILD kdm-4.8.1.ebuild 4342 RMD160 1a24ac712c5d543e8c227fb5aa008fd54204e9ad SHA1 aff3b0e5e0c0e4ad4a8fc7bbcb0878bc0d942cd0 SHA256 05e11f3294ea9adca30a4cdd9c10829f399af07caa1946563be930110beeb9c4
-EBUILD kdm-4.8.2.ebuild 4344 RMD160 110350618f1a8f5af2234bf7be42d6fa4df0704f SHA1 af82524e3c97b1e27b166ee0e9be27adabe55970 SHA256 c07c05c2b28865eef824d23ccbc985e6ccd37878129ecbfcd23a71d6b1b99f56
-MISC ChangeLog 37799 RMD160 bdaa8a4084dbe07845ece27220e197f90f0ef697 SHA1 08397d42ad533e24510f0286d54555031629b14e SHA256 46a94eaa7fae2dbfb73ba824a9818017d78b2361064618abfc81c7c3c1f39782
+EBUILD kdm-4.8.1.ebuild 4381 RMD160 86ef3fe9373eb7accef6ca3c4623c897925f57af SHA1 b41fc33a571ffc96b7e7cc9ca96b0c8df507ca96 SHA256 3bc18ad545e9e73752155f623b4eb0f5f949b44af81652cd95a96970c4ffe71a
+EBUILD kdm-4.8.2.ebuild 4382 RMD160 d0c7f2058188b375e79636f7e9aad944d7c9cd20 SHA1 ef608d2a7aefa055b0beb5e03d32225e5010875e SHA256 24f60874a8c3e0fb81e1e6a2f4e5f187313f3cdf5ed97ae6f508ff8b361c3af2
+MISC ChangeLog 38050 RMD160 47b81f494c3f769b9458a02eaf6c3db2c8599f9c SHA1 54b5d10a3e3f92d9e035c48e4231f6e89504cbdf SHA256 6ec56ccecea381154454c15b862acc75964ae0fa3bc35fe2cfdc72ebe585a3e1
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfOJWAAoJEO+t9ga+3I3aQiIH+QF6CTwa9LTZG9MxjzW8HYoe
-lGzRzEYKnumh/MebEVN5DBzXJqxevKZ+yzl6wDEgeg+GjAZBi5mYQtx2GnNiwmHo
-boTrhiw99IzcTJM97HwK1IdC/0eRGdQIEgXAaFKSmwcvnDF0m1kgNOok5K7V1gdW
-6+ecORWon9mL7U5TfgJmofciHuBOWW+thGV4Z6mnAtOFA9WL91CwF/7EoE08GJGS
-/m160mOqxOprDOW6ORNUsO6P0lGiMCHvcKptQoGniA+II/oWNU6a0gHQCQF1uP3s
-0pNoy5OEQsGmZ3lGlfd0ieIktGIuEjHVK0Y22LcILmRbvZG6jArM2qqRfAdShY4=
-=QLeL
+iQEcBAEBCgAGBQJPhowkAAoJEO+t9ga+3I3awNsH/jJhOHuUYR8tvoE/zOeLRSdu
+e+ehxTk4BhGXf05CftlC+Gfzuw5t8rQyDxRdjDMf8MGAVvBKESux+qujdxAQm4mm
+43cJWtf25KPzVhIzhE/1GHeUE4HHIsRJip9PWqN3+Y9m3nbdDF8dlBgX9ptMANuq
+t7dJ5Pmm50vs187DA/PIi0nOD7OzETcJJ5jZeSgzXHC6K7WaYDddYCVEC06G6CsW
+eZnajBvXYz06Vf4omq5zVCnMqeEElCt7ymG43ENKFRFGMwt6FwlSnAeWoNy+SQ/C
+cKkwg+oSdnV9+givTEnDp26+aglqcyy2G2kwEMSUp0VD4xhtWU+Jn7Z0XdoiBhE=
+=KZl5
 -----END PGP SIGNATURE-----
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() {