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

(Portage version: 2.1.2_pre2)

4 files changed, 34 insertions, 11 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/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