Make sure USE=-ssl is actually respected and make sure mdadm is not rebuilt in src_install() so static/ssl keep their settings #137823 by Marcel Meyer.

(Portage version: 2.1.1_pre1-r2)

4 files changed, 48 insertions, 5 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 7ace6bf3165d..2eb275b0c533 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.30 2006/06/18 20:19:23 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.31 2006/06/25 00:21:12 vapier Exp $
+
+  25 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/mdadm-2.5-build.patch, files/mdadm-2.5-ssl-cleanup.patch,
+  mdadm-2.5.ebuild:
+  Make sure USE=-ssl is actually respected and make sure mdadm is not rebuilt
+  in src_install() so static/ssl keep their settings #137823 by Marcel Meyer.
 
   18 Jun 2006; Guy Martin <gmsoft@gentoo.org> mdadm-2.5.ebuild:
   Stable on hppa.
diff --git a/sys-fs/mdadm/files/mdadm-2.5-build.patch b/sys-fs/mdadm/files/mdadm-2.5-build.patch
new file mode 100644
index 000000000000..4af2b4a4e95f
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.5-build.patch
@@ -0,0 +1,23 @@
+Remove bogus depend otherwise things get rebuilt way too often
+
+http://bugs.gentoo.org/137823
+
+--- Makefile
++++ Makefile
+@@ -91,14 +91,12 @@
+ everything: all mdadm.static mdadm.uclibc swap_super test_stripe  mdassemble mdassemble.uclibc mdassemble.static mdassemble.man
+ # mdadm.tcc doesn't work..
+ 
+-mdadm : rmconf $(OBJS)
++mdadm : $(OBJS)
+ 	$(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
+ 
+ mdadm.static : STATIC=-DSTATIC
+-mdadm.static : rmconf $(OBJS)
++mdadm.static : $(OBJS)
+ 	$(CC) $(LDFLAGS) -DSTATIC -static -o mdadm.static $(OBJS) SHA1.o sha1.o
+-rmconf:
+-	rm -f config.o
+ 
+ mdadm.tcc : $(SRCS) mdadm.h
+ 	$(TCC) -o mdadm.tcc $(SRCS)
diff --git a/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch b/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
index 4c519f3158a9..71eb1f411305 100644
--- a/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
+++ b/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
@@ -14,15 +14,27 @@
  
  KLIBC=/home/src/klibc/klibc-0.77
  
-@@ -72,6 +76,11 @@
+@@ -72,6 +76,12 @@
  	Create.c Detail.c Examine.c Grow.c Monitor.c dlink.c Kill.c Query.c \
  	mdopen.c super0.c super1.c bitmap.c restripe.c sysfs.c
  
 +ifneq ($(USE_SSL),1)
 +OBJS += SHA1.o sha1.o
 +SRCS += SHA1.c sha1.c
++CPPFLAGS += -DNO_SSL
 +endif
 +
  ASSEMBLE_SRCS := mdassemble.c Assemble.c config.c dlink.c util.c super0.c super1.c
  ASSEMBLE_FLAGS:= -DMDASSEMBLE
  ifdef MDASSEMBLE_AUTO
+--- super0.c
++++ super0.c
+@@ -28,7 +28,7 @@
+  */
+ 
+ #include "mdadm.h"
+-#ifndef UCLIBC
++#ifndef NO_SSL
+ #include <openssl/sha.h> /* for SHA1 */
+ #else
+ extern unsigned char *SHA1(unsigned char *buf, int len, unsigned char *dest);
diff --git a/sys-fs/mdadm/mdadm-2.5.ebuild b/sys-fs/mdadm/mdadm-2.5.ebuild
index 6b979fd0aecd..74b925803f5f 100644
--- a/sys-fs/mdadm/mdadm-2.5.ebuild
+++ b/sys-fs/mdadm/mdadm-2.5.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/sys-fs/mdadm/mdadm-2.5.ebuild,v 1.3 2006/06/18 20:19:23 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.5.ebuild,v 1.4 2006/06/25 00:21:12 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -24,11 +24,13 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.3.1-endian.patch #122269
 	epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
 	epatch "${FILESDIR}"/${PN}-2.4.1-syslog-updates.patch
+	epatch "${FILESDIR}"/${PN}-2.5-build.patch #137823
 	use static && append-ldflags -static
+	use ssl && export USE_SSL=1 || export USE_SSL=0
+	sed -i -e 1iUSE_SSL=${USE_SSL} Makefile
 }
 
 src_compile() {
-	use ssl && export USE_SSL=1 || export USE_SSL=0
 	emake \
 		CWFLAGS="-Wall" \
 		CXFLAGS="${CFLAGS}" \
@@ -36,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	exeinto /$(get_libdir)/rcscripts/addons
 	doexe "${FILESDIR}"/raid-{start,stop}.sh || die "addon failed"
 	dodoc INSTALL TODO "ANNOUNCE-${PV}"