Added revised as-needed patch (bug #130464, thanks to James Cassidy for the initial patch), authorized by seemant on irc

Package-Manager: portage-2.1.3.7

4 files changed, 45 insertions, 10 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 5842012b8360..5f21afb07bdf 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.117 2007/05/23 01:34:43 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.118 2007/09/07 11:33:43 dev-zero Exp $
+
+  07 Sep 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/heimdal-0.7.2-as_needed.patch, heimdal-0.7.2-r3.ebuild:
+  Added revised as-needed patch (bug #130464, thanks to James Cassidy for the
+  initial patch)
 
   23 May 2007; Doug Goldstein <cardoe@gentoo.org> heimdal-0.7.2-r3.ebuild:
   heimdal LDAP bits use deprecated functions so we need to define
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index c69194edd238..4e492b883c7a 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,13 +1,17 @@
+AUX heimdal-0.7.2-as_needed.patch 853 RMD160 5c03f5008e395e87c48f89fe91828e0d034de7db SHA1 0b4dda9830d36185055b66976436545e3daa926b SHA256 640969f1ebe65bae204d45b076dbd488f62a4fd5cf6d96bdc5373423e71f39e3
+MD5 ed7847071b3c41ee6c693650aa63df27 files/heimdal-0.7.2-as_needed.patch 853
+RMD160 5c03f5008e395e87c48f89fe91828e0d034de7db files/heimdal-0.7.2-as_needed.patch 853
+SHA256 640969f1ebe65bae204d45b076dbd488f62a4fd5cf6d96bdc5373423e71f39e3 files/heimdal-0.7.2-as_needed.patch 853
 DIST heimdal-0.7.2-gentoo-patches-0.2.tar.bz2 7500 RMD160 87240de8914b05c552ceb7d2f92e7de68dad21b7 SHA1 f4b33a9816e973bee0fb99b3791e57e019161111 SHA256 cfbec87dcbab67941de5897370fc9e0b3a085292f53cbeb20b8e9d2667109c05
 DIST heimdal-0.7.2.tar.gz 4525734 RMD160 0f028a9d5a6a66e8efc0397e4d8c8adc2183b409 SHA1 a902e6ad7c31d940b588dc0235b348936f0d719d SHA256 28661862ac8cbbd62ddddbda7db760b622b903c88c06f2fbdbf7b97be47eac60
-EBUILD heimdal-0.7.2-r3.ebuild 3499 RMD160 fc1d7cc12ca8fdcb75552bf7bbaf193aaee0d191 SHA1 74005052325d88759e491af52347c65da232c800 SHA256 3a2a3e1098c8c6e5c4ec5d9e18bf9959dce846ae9cd5e4468a440f6cdae876de
-MD5 8c9f8044dc30a20451b5cd48d3eed924 heimdal-0.7.2-r3.ebuild 3499
-RMD160 fc1d7cc12ca8fdcb75552bf7bbaf193aaee0d191 heimdal-0.7.2-r3.ebuild 3499
-SHA256 3a2a3e1098c8c6e5c4ec5d9e18bf9959dce846ae9cd5e4468a440f6cdae876de heimdal-0.7.2-r3.ebuild 3499
-MISC ChangeLog 18911 RMD160 3501e90116321c34bce7dc730b593477fbf9d1df SHA1 0e56e78752af553e3084668d5c01de7839158db7 SHA256 90cb17a931aeeab4d280a55a8eeeb417d1da0097bbb94932f84940b93a5cf0fa
-MD5 752e5a59f7715789783f4b75430aea82 ChangeLog 18911
-RMD160 3501e90116321c34bce7dc730b593477fbf9d1df ChangeLog 18911
-SHA256 90cb17a931aeeab4d280a55a8eeeb417d1da0097bbb94932f84940b93a5cf0fa ChangeLog 18911
+EBUILD heimdal-0.7.2-r3.ebuild 3545 RMD160 ab053bc40e0cc7692e7bc902798891afc0ddb4f7 SHA1 4b627bb6e3ce87a20c666c5cbf57c5a831ff6323 SHA256 108737e78593d09d97b9661e1f182e02b2911d5289d9b484d87f4869c30f56a1
+MD5 ef88c2247acd3a3af39b2a91764151dd heimdal-0.7.2-r3.ebuild 3545
+RMD160 ab053bc40e0cc7692e7bc902798891afc0ddb4f7 heimdal-0.7.2-r3.ebuild 3545
+SHA256 108737e78593d09d97b9661e1f182e02b2911d5289d9b484d87f4869c30f56a1 heimdal-0.7.2-r3.ebuild 3545
+MISC ChangeLog 19127 RMD160 2af8d754f4ddd4e5221e3fa023ee0938f1d7c171 SHA1 2e3d874ac1f49959291654f68afda951cd5fa9f4 SHA256 0b702c7897d7fc7e7a2c561f4777056f48229e1092f7ad007a3cf1a7e2b81dd3
+MD5 d5aa9757000f4f7658af1450e4e9a286 ChangeLog 19127
+RMD160 2af8d754f4ddd4e5221e3fa023ee0938f1d7c171 ChangeLog 19127
+SHA256 0b702c7897d7fc7e7a2c561f4777056f48229e1092f7ad007a3cf1a7e2b81dd3 ChangeLog 19127
 MISC metadata.xml 231 RMD160 1be9e973a8223227be2a819d21b20400ec0c2eeb SHA1 9ef61083af843eed7a918f2d91f3aef87b925e50 SHA256 a8adb0e7f6a178f4af8bfabe77a247ef7d6ad2216eb1e15d02e2954143c48d0a
 MD5 6c9cbfc951ebeca1a88d8722de4dde80 metadata.xml 231
 RMD160 1be9e973a8223227be2a819d21b20400ec0c2eeb metadata.xml 231
diff --git a/app-crypt/heimdal/files/heimdal-0.7.2-as_needed.patch b/app-crypt/heimdal/files/heimdal-0.7.2-as_needed.patch
new file mode 100644
index 000000000000..607544008250
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.7.2-as_needed.patch
@@ -0,0 +1,24 @@
+diff -Naur heimdal-0.7.2.orig/lib/editline/Makefile.am heimdal-0.7.2/lib/editline/Makefile.am
+--- heimdal-0.7.2.orig/lib/editline/Makefile.am	2007-09-07 07:59:26.000000000 +0200
++++ heimdal-0.7.2/lib/editline/Makefile.am	2007-09-07 07:59:48.000000000 +0200
+@@ -35,6 +35,8 @@
+ 	unix.h \
+ 	$(EXTRA_SOURCE)
+ 
++libeditline_la_LIBADD = @LIB_tgetent@
++
+ EXTRA_SOURCE = $(ES) 
+ 
+ libel_compat_la_SOURCES = edit_compat.c
+diff -Naur heimdal-0.7.2.orig/lib/roken/Makefile.am heimdal-0.7.2/lib/roken/Makefile.am
+--- heimdal-0.7.2.orig/lib/roken/Makefile.am	2007-09-07 07:59:26.000000000 +0200
++++ heimdal-0.7.2/lib/roken/Makefile.am	2007-09-07 08:00:17.000000000 +0200
+@@ -104,7 +104,7 @@
+ 
+ EXTRA_DIST = roken.awk roken.h.in
+ 
+-libroken_la_LIBADD = @LTLIBOBJS@
++libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt)
+ if have_cgetent
+ else
+ libroken_la_LIBADD += $(DBLIB)
diff --git a/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild b/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
index fe7c3e70385f..ce4428070554 100644
--- a/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild,v 1.14 2007/05/23 01:34:43 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.7.2-r3.ebuild,v 1.15 2007/09/07 11:33:43 dev-zero Exp $
 
 WANT_AUTOMAKE=1.8
 WANT_AUTOCONF=latest
@@ -39,6 +39,8 @@ src_unpack() {
 
 	EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches
 
+	epatch "${FILESDIR}/${P}-as_needed.patch"
+
 	AT_M4DIR="cf" eautoreconf
 }