Fix up depend system to use gcc to generate deps #149583.

Package-Manager: portage-2.1.2_pre2

5 files changed, 53 insertions, 26 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 93f4283c0994..5e23c2a61550 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.204 2006/10/01 20:16:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.205 2006/10/01 21:03:21 vapier Exp $
+
+  01 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/openssl-0.9.8-makedepend.patch, openssl-0.9.7l.ebuild,
+  openssl-0.9.8d.ebuild:
+  Fix up depend system to use gcc to generate deps #149583.
 
   01 Oct 2006; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8d.ebuild:
   Respect LDFLAGS #149676 by Donnie Berkholz.
@@ -9,10 +14,6 @@
   openssl-0.9.8d.ebuild:
   Stable on alpha as per security bug #145510
 
-  30 Sep 2006; Mike Frysinger <vapier@gentoo.org> openssl-0.9.7l.ebuild,
-  openssl-0.9.8d.ebuild:
-  Pull in x11-misc/makedepend #149583.
-
   28 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   openssl-0.9.7l.ebuild, openssl-0.9.8d.ebuild:
   ppc stable, bug #145510
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 9b410be00839..cfa17e8b9541 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -57,6 +57,10 @@ AUX openssl-0.9.8-make-engines-dir.patch 461 RMD160 78938bd399d705a2364d5f12b412
 MD5 8c5ab963e60bc0744408eebf48596981 files/openssl-0.9.8-make-engines-dir.patch 461
 RMD160 78938bd399d705a2364d5f12b412a23111967944 files/openssl-0.9.8-make-engines-dir.patch 461
 SHA256 1cc5a34eb0c3c687846e4a0e3bf72c81eecf414742e9327f206ba9875f2d16b3 files/openssl-0.9.8-make-engines-dir.patch 461
+AUX openssl-0.9.8-makedepend.patch 615 RMD160 aa34fbd2f32a9471f6ee820cdec921f72106cc63 SHA1 3fd4eea708482fe9140553d0d84b2d6c255526b5 SHA256 39ccead670db92f20ab33791b672313778a3e2923cb2bb6cb24297ce597a6a8e
+MD5 33e223eaa4049ef18776f412cc2e8a5c files/openssl-0.9.8-makedepend.patch 615
+RMD160 aa34fbd2f32a9471f6ee820cdec921f72106cc63 files/openssl-0.9.8-makedepend.patch 615
+SHA256 39ccead670db92f20ab33791b672313778a3e2923cb2bb6cb24297ce597a6a8e files/openssl-0.9.8-makedepend.patch 615
 AUX openssl-0.9.8-ppc64.patch 1463 RMD160 d285eabc77ad8c8f8720d9047c868168ce1c8973 SHA1 261863f2e864f9850935231612e9068d8644a653 SHA256 9e521f5b76a46a56414cf49cde452f4bd96c9f42f5ac30257c0404808b125886
 MD5 4a170a962292bdd019fe303ba981e3ab files/openssl-0.9.8-ppc64.patch 1463
 RMD160 d285eabc77ad8c8f8720d9047c868168ce1c8973 files/openssl-0.9.8-ppc64.patch 1463
@@ -87,10 +91,10 @@ EBUILD openssl-0.9.7k.ebuild 5402 RMD160 89fd43fb8bc64f345483c21b14690b5f7cbdcae
 MD5 1fdb5bbcd56f2780f574e907be69fb91 openssl-0.9.7k.ebuild 5402
 RMD160 89fd43fb8bc64f345483c21b14690b5f7cbdcae6 openssl-0.9.7k.ebuild 5402
 SHA256 9d19a2b0f8b3c1e7637639b77780abc7939c2fdae6c9ec0864e5ee8df8cd49bb openssl-0.9.7k.ebuild 5402
-EBUILD openssl-0.9.7l.ebuild 5432 RMD160 b7378ab51d87839109ba608d1c420381a1d3dd14 SHA1 18791178db914c81b13ab411eb268a5737d7dcfb SHA256 031bc04b69c0d9e5ad0630f40f6fef48e5df94fc0102217edc14fc32dd58c631
-MD5 3bad16b1e275ee1f8319689c352a9cfd openssl-0.9.7l.ebuild 5432
-RMD160 b7378ab51d87839109ba608d1c420381a1d3dd14 openssl-0.9.7l.ebuild 5432
-SHA256 031bc04b69c0d9e5ad0630f40f6fef48e5df94fc0102217edc14fc32dd58c631 openssl-0.9.7l.ebuild 5432
+EBUILD openssl-0.9.7l.ebuild 5346 RMD160 a6a64cbd73cf98c8f85affba915cc51ecb5fb57b SHA1 656942c868723a34675393e657bf5bc0bd450192 SHA256 25e762663be8aca6a9a7212ab0a901ed5405a3ed60dca9c6b42d9a56a69ff723
+MD5 12082aa762cfcd4f9ae2cef76deda05f openssl-0.9.7l.ebuild 5346
+RMD160 a6a64cbd73cf98c8f85affba915cc51ecb5fb57b openssl-0.9.7l.ebuild 5346
+SHA256 25e762663be8aca6a9a7212ab0a901ed5405a3ed60dca9c6b42d9a56a69ff723 openssl-0.9.7l.ebuild 5346
 EBUILD openssl-0.9.8b.ebuild 4997 RMD160 6900925606a9c21f3ae136fd400e2cc6961be378 SHA1 b7fcdd25e5a7a46d0897771e0cef19689ebf229b SHA256 c6172cdb7c1ad3728ac08c2474004c824a635ba9151a71751cd36dae8c53c1fd
 MD5 4b67c1cdcfc7fe43341536e549eb8db9 openssl-0.9.8b.ebuild 4997
 RMD160 6900925606a9c21f3ae136fd400e2cc6961be378 openssl-0.9.8b.ebuild 4997
@@ -99,14 +103,14 @@ EBUILD openssl-0.9.8c-r2.ebuild 5516 RMD160 611d53a1ba338a78a10a56aeec0a046c16f8
 MD5 4d09331c22c10fbfa527a17b040a6e08 openssl-0.9.8c-r2.ebuild 5516
 RMD160 611d53a1ba338a78a10a56aeec0a046c16f839d4 openssl-0.9.8c-r2.ebuild 5516
 SHA256 69c69ec5ca42dfebb55ef24a9df610f4b2637a0c9a43036896e2f714fd944396 openssl-0.9.8c-r2.ebuild 5516
-EBUILD openssl-0.9.8d.ebuild 5591 RMD160 7c12cddeb9a951af301dd31ea0a54504ca57190f SHA1 bfd8c8464295bdc18c6bdf16c144f50182eeedfa SHA256 f2f6e9133d6132bab21665fe65c3f2a5783d5311316ef4cdfdd25e4f4801261a
-MD5 4f4dccea743f983fc97eca6e3bd913bb openssl-0.9.8d.ebuild 5591
-RMD160 7c12cddeb9a951af301dd31ea0a54504ca57190f openssl-0.9.8d.ebuild 5591
-SHA256 f2f6e9133d6132bab21665fe65c3f2a5783d5311316ef4cdfdd25e4f4801261a openssl-0.9.8d.ebuild 5591
-MISC ChangeLog 31356 RMD160 e622da873b05fc7a2edcccd2a2bc571946799e82 SHA1 446e41c5a504fa17905dc415ac4ea1e0dcd0a968 SHA256 a8d582df71ded05a8ead5a0c1dfbfd158be029c652351463b1e6b2ea8c267405
-MD5 756adeb4789b126857018e895e8e2b2b ChangeLog 31356
-RMD160 e622da873b05fc7a2edcccd2a2bc571946799e82 ChangeLog 31356
-SHA256 a8d582df71ded05a8ead5a0c1dfbfd158be029c652351463b1e6b2ea8c267405 ChangeLog 31356
+EBUILD openssl-0.9.8d.ebuild 5630 RMD160 11eb3b8ab66d7176646c00b425081ccc9971aa9c SHA1 6e17935b72f90d55c714d655b547cff5d52d3bb4 SHA256 e36503ef2b4b945fd715c091288116ad2e80be746c0e67262a12069d33b32ddd
+MD5 502db913fc5461e593698fbb77b4d8b5 openssl-0.9.8d.ebuild 5630
+RMD160 11eb3b8ab66d7176646c00b425081ccc9971aa9c openssl-0.9.8d.ebuild 5630
+SHA256 e36503ef2b4b945fd715c091288116ad2e80be746c0e67262a12069d33b32ddd openssl-0.9.8d.ebuild 5630
+MISC ChangeLog 31418 RMD160 6d34121abeba3f2b1033a149d4fa0060b2743ea7 SHA1 629033a83cdf1a5772e38042bad052722bb696f0 SHA256 6bef68d039b826b2745419102fd773b480fd80ad1dc743851cb87eae69d014cc
+MD5 8261c77a68456e6f0103ef711cbf278d ChangeLog 31418
+RMD160 6d34121abeba3f2b1033a149d4fa0060b2743ea7 ChangeLog 31418
+SHA256 6bef68d039b826b2745419102fd773b480fd80ad1dc743851cb87eae69d014cc ChangeLog 31418
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -132,7 +136,7 @@ SHA256 f71ab1e8bddbc1f5dfcfafba984d0c2c95088b751768ff691f5fcc911be601a8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFICI7amhnQswr0vIRAp6IAJ96mGdM9jKxOBqOwdPGKyZjkvmHWACfcTF5
-RaKIqipaEaFDD5gOJhqPr/0=
-=oanT
+iD8DBQFFIC1DamhnQswr0vIRAkA4AKCAhp9x45obfHFQAE/xOeJ3u2/25gCgl7+U
+4cbACwIhU4AQZNuoAw9HA6M=
+=w1yZ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-0.9.8-makedepend.patch b/dev-libs/openssl/files/openssl-0.9.8-makedepend.patch
new file mode 100644
index 000000000000..02a9f57845c3
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.8-makedepend.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/149583
+
+--- util/domd
++++ util/domd
+@@ -14,7 +14,7 @@
+ cp Makefile Makefile.save
+ # fake the presence of Kerberos
+ touch $TOP/krb5.h
+-if [ "$MAKEDEPEND" = "gcc" ]; then
++if [ "$MAKEDEPEND" != "makedepend" ]; then
+     args=""
+     while [ $# -gt 0 ]; do
+ 	if [ "$1" != "--" ]; then args="$args $1"; fi
+--- Makefile.org
++++ Makefile.org
+@@ -69,7 +69,7 @@
+ PERL= perl
+ TAR= tar
+ TARFLAGS= --no-recursion
+-MAKEDEPPROG=makedepend
++MAKEDEPPROG=$(CC)
+ 
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
diff --git a/dev-libs/openssl/openssl-0.9.7l.ebuild b/dev-libs/openssl/openssl-0.9.7l.ebuild
index 5162cd504f29..3377fd4ca292 100644
--- a/dev-libs/openssl/openssl-0.9.7l.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7l.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7l.ebuild,v 1.9 2006/10/01 20:15:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7l.ebuild,v 1.10 2006/10/01 21:03:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,13 +10,11 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-# make sure your arch is ABI compat before adding KEYWORD back in
 KEYWORDS="-* alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="emacs test bindist zlib"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-misc/makedepend
 	sys-apps/diffutils
 	>=dev-lang/perl-5
 	test? ( sys-devel/bc )"
diff --git a/dev-libs/openssl/openssl-0.9.8d.ebuild b/dev-libs/openssl/openssl-0.9.8d.ebuild
index 517091be590d..0d52c1f4078c 100644
--- a/dev-libs/openssl/openssl-0.9.8d.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8d.ebuild,v 1.10 2006/10/01 20:16:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8d.ebuild,v 1.11 2006/10/01 21:03:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -15,7 +15,6 @@ IUSE="bindist emacs sse2 test zlib"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	x11-misc/makedepend
 	sys-apps/diffutils
 	>=dev-lang/perl-5
 	test? ( sys-devel/bc )"
@@ -34,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch
 	epatch "${FILESDIR}"/${PN}-0.9.8-toolchain.patch
 	epatch "${FILESDIR}"/${PN}-0.9.8b-doc-updates.patch
+	epatch "${FILESDIR}"/${PN}-0.9.8-makedepend.patch #149583
 
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
@@ -99,7 +99,7 @@ src_compile() {
 	)
 	sed -i \
 		-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-		-e "/^SHARED_LDFLAGS/s:$: ${LDFLAGS}:" \
+		-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
 		Makefile || die
 
 	# depend is needed to use $confopts