Fix build/install when USE=multicall.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 42 insertions, 2 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index a31c45e4271d..839103fdc1cc 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.113 2013/12/09 01:24:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.114 2013/12/09 01:25:30 vapier Exp $
+
+  09 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/dropbear-2013.62-multi-install-man.patch,
+  +files/dropbear-2013.62-multi-no-relink.patch, dropbear-2013.62.ebuild:
+  Fix build/install when USE=multicall.
 
   09 Dec 2013; Mike Frysinger <vapier@gentoo.org> dropbear-2013.60.ebuild,
   dropbear-2013.62.ebuild:
diff --git a/net-misc/dropbear/dropbear-2013.62.ebuild b/net-misc/dropbear/dropbear-2013.62.ebuild
index 9066a64dd109..bffa1a0a9f9d 100644
--- a/net-misc/dropbear/dropbear-2013.62.ebuild
+++ b/net-misc/dropbear/dropbear-2013.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.62.ebuild,v 1.2 2013/12/09 01:24:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.62.ebuild,v 1.3 2013/12/09 01:25:30 vapier Exp $
 
 EAPI="4"
 
@@ -39,6 +39,8 @@ set_options() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+	epatch "${FILESDIR}"/${PN}-2013.62-multi-install-man.patch
+	epatch "${FILESDIR}"/${PN}-2013.62-multi-no-relink.patch
 	sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
 	sed -i \
 		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
diff --git a/net-misc/dropbear/files/dropbear-2013.62-multi-install-man.patch b/net-misc/dropbear/files/dropbear-2013.62-multi-install-man.patch
new file mode 100644
index 000000000000..efaeb8753b00
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2013.62-multi-install-man.patch
@@ -0,0 +1,13 @@
+only install man pages that exist as things like scp.1 do not
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -136,7 +136,7 @@ insmulti%: dropbearmulti
+ 	-rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) 
+ 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+-	$(INSTALL) -m 644 $*.1  $(DESTDIR)$(mandir)/man1/$*.1
++	if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
+ 
+ # dropbear should go in sbin, so it needs a seperate rule
+ inst_dropbear: dropbear
diff --git a/net-misc/dropbear/files/dropbear-2013.62-multi-no-relink.patch b/net-misc/dropbear/files/dropbear-2013.62-multi-no-relink.patch
new file mode 100644
index 000000000000..cd12a9634138
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2013.62-multi-no-relink.patch
@@ -0,0 +1,20 @@
+turn dropbearmulti into a real target so we don't constantly re-link it
+
+otherwise make has no idea what "multibinary" is and so always re-links it
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -175,10 +175,10 @@ ifeq ($(MULTI),1)
+ 	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
+ endif
+ 
+-dropbearmulti: multilink 
++dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
++	$(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBS)
+ 
+-multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
+-	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
++multibinary: dropbearmulti$(EXEEXT)
+ 
+ multilink: multibinary $(addprefix link, $(PROGRAMS))
+