Fix broken symlink - bug #417081

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

4 files changed, 40 insertions, 8 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 237cf427b50e..0a30675180be 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.192 2012/05/03 18:16:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.193 2012/05/22 19:37:07 eras Exp $
+
+  22 May 2012; Eray Aslan <eras@gentoo.org> heimdal-1.5.1-r1.ebuild,
+  heimdal-1.5.2.ebuild:
+  Fix broken symlink - bug #417081
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> heimdal-1.5.1-r1.ebuild,
   heimdal-1.5.2.ebuild:
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index c72582df1111..5e1464a9684c 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX CVE-2011-4862.patch 456 RMD160 e28419dffda573918ff5d6e0da1dc51fd5324629 SHA1 b927c7cb3f8a69fcfac34615c381b118d4c91a53 SHA256 856ef749a795087582849e6e14921d36271c110b6e1039e7e073e8b508031a08
 AUX heimdal-kadmind.confd 151 RMD160 25ae05e118d61a06871d4b7cea4caf3bf8b28cc1 SHA1 4187aa7ec5ddbc79f25d30d65c1f0d6dd2ab0992 SHA256 892f9650d4eb631eb1ea435dc8d3defd3805e6d1f2fa59a698d424c44915d644
 AUX heimdal-kadmind.initd-r1 553 RMD160 aaa2e4a8918254f1f663089ef2f63161cebefb0b SHA1 fdda38fda6ad81e3dfe31aa20b8948a57d940ae5 SHA256 cb598a34926c9152072f77027da0106684245e6c53cb931233de32a2c8011a79
@@ -14,7 +17,24 @@ AUX heimdal_missing-include.patch 255 RMD160 113517789c643163acec3a2f09870a87074
 AUX krb5.conf 424 RMD160 80a0159824b8a44698d97d911c701bb05f2f0688 SHA1 7602cc72576d144429cae5cf568feb25a5906ab7 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e
 DIST heimdal-1.5.1.tar.gz 6800347 RMD160 d66b09bddcd762e91092f862ea084abbcc3670ca SHA1 78421d3f80d3bd1f2eccfa0e5a690e964842b2fb SHA256 bd69940e67ce985589451d868354a959eebf96d8a059f513b23d40e4aa101d5f
 DIST heimdal-1.5.2.tar.gz 6798615 RMD160 1ab2f835309a916dfbba667d3d0d38a57c312fde SHA1 dd0920a181d18236432e4b3e5eab6e468cda4b89 SHA256 22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec
-EBUILD heimdal-1.5.1-r1.ebuild 3742 RMD160 55f4890fe7ba41ddfc3a67dec5d88f2c4f12d080 SHA1 6291490f4b705b2dc77ed231a48e3fb44e126bbd SHA256 26317f99cb3631b6aaa009b691c032cbcc07286740ba83cdc7f98a8d4e808c5c
-EBUILD heimdal-1.5.2.ebuild 3709 RMD160 90d7feade6d80f893eb1a6ea5c6cf5dd03877174 SHA1 f121777bc300a6c5be969593352ad5c48d0e0d9c SHA256 dedfb2eecaf6d4cc91f98c68791070534043b5ec3a525636aa0538353cf361d7
-MISC ChangeLog 31368 RMD160 fd116f9d9b9600dc6e681c507a8e8b46465af181 SHA1 385aae2d799c28ee7bd4be3bc7e47b91f7211cb6 SHA256 b09b36fa1dabe5f2d7141951423ba4c72512fda6ebc88bb5be25bc9b58e25096
+EBUILD heimdal-1.5.1-r1.ebuild 3871 RMD160 ffdd6496050a335fdddd1c74d3372d8b24868026 SHA1 9b72517c8bfdc07cb12136501db2ff5505299cd5 SHA256 81959a8560d6d056f3797603a651c5bd6de8b6e7319bce841e6140cbdbd03bad
+EBUILD heimdal-1.5.2.ebuild 3785 RMD160 6da1879d3a77403b03949a777f5b484975b70e61 SHA1 f140eda4ed110544ab51ad83624cbdb3bcee1a5c SHA256 79c40ff9ccedc266267be3c846ddb682f604d089bb8f65dd48121a0eb506de9b
+MISC ChangeLog 31495 RMD160 ef5722ae3ef5af5c000ee5aee7f0c55e64922ce1 SHA1 ce452ce54a1e1800759d8e63e5ba5fcb668913eb SHA256 48eebcaf826d41d68c791f8d0d7629cc7afaf393f2599c88e1645b68fb17e6af
 MISC metadata.xml 469 RMD160 2dc8ebb842bdde2d766a1d35335d97581686cccc SHA1 f87ee646d52dc65e1c232b5ca15f7cfeef213304 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPu+rpAAoJEHfx8XVYajsfH6UP/RaYdOGz/F4bBxuQgo5qGFHD
+BxdhD2APj0fAdVVOWlMqs0HuYFo3qfKYjB/twpVRRgsyc8xJvQ1Wz9OFzwaZ3k5K
+26KDiyWWBFWor8i4QmndqnF8DeNZhmQTvRRmcKH7kMrEzGBFyFrYlXv4rNGKs7qs
+jbdw+1pIlFDWcIWoNcd6MRDW/3muKvUzwr0Pt1nyci7YuBpS0RMUpSPItgc81SXY
+6DNvrSmXVLAjoDPscHf+uLaJ4zEfTkLXTUxKokOAllu5KOwt3XL3UWWw3VYZTmxJ
+pVhG3WBgMpN/ugGJ3zRg2BT/ldaWJ0wQepxpuMQoE9L1Uklr+fofhbL9CAwi+vCE
+FWKPOdThb3AyszfUjmHk4yXdgZBDeyNdBOOaA3838e4H37SF64Kxjqb43BykhD+7
+JWvty2k5fd+bQ1Q+i6pdbXZ98MZ/sSD4jTO4zLU0bt38aws+qIaJjfj0PwAf4ubR
+moL8h68DScGf7xUvTuw6otVGpDWvvjQaOwOrtwFPloBvPgS7+oY+fplEmo+wvO6K
+bBizwzQG/5sgnSgY9lkoQsexkKvb0YTsXYMGESThjVua5VXANLR1yTm2bXKB8yJU
+gRxhSX/YVMVdFcqomVC0f0LTTmpDyy/XmO2fMsvpdjbQ/O85+5YjBdFQ0vWNCVvl
+ZnVibHGdejxrvT4Y/IHM
+=dxBs
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild b/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
index 1e8ff42d51c9..2debaea28831 100644
--- a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.1-r1.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/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.9 2012/05/03 18:16:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.10 2012/05/22 19:37:07 eras Exp $
 
 EAPI=2
 # PYTHON_BDEPEND="2"
@@ -133,6 +133,10 @@ src_install() {
 
 	# default database dir
 	keepdir /var/heimdal
+
+	# Ugly hack for broken symlink - bug #417081
+	rm "${D}"/usr/share/man/man5/qop.5 || die
+	dosym mech.5 /usr/share/man/man5/qop.5
 }
 
 pkg_preinst() {
diff --git a/app-crypt/heimdal/heimdal-1.5.2.ebuild b/app-crypt/heimdal/heimdal-1.5.2.ebuild
index b91bcfd8dea9..b2e96c4c86d5 100644
--- a/app-crypt/heimdal/heimdal-1.5.2.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.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/app-crypt/heimdal/heimdal-1.5.2.ebuild,v 1.2 2012/05/03 18:16:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2.ebuild,v 1.3 2012/05/22 19:37:07 eras Exp $
 
 EAPI=4
 # PYTHON_BDEPEND="2"
@@ -86,11 +86,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
+	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
 
 	dodoc ChangeLog README NEWS TODO
 
@@ -132,6 +132,10 @@ src_install() {
 
 	# default database dir
 	keepdir /var/heimdal
+
+	# Ugly hack for broken symlink - bug #417081
+	rm "${D}"/usr/share/man/man5/qop.5 || die
+	dosym mech.5 /usr/share/man/man5/qop.5
 }
 
 pkg_preinst() {