Move install sed into a real patch and make sure failures in subdirs are caught #156980.

(Portage version: 2.1.2_rc3-r5)

6 files changed, 111 insertions, 38 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index d15d9eec4d32..0743de242b84 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.22 2006/10/22 19:49:01 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.23 2006/12/19 22:19:33 vapier Exp $
+
+  19 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  files/3.12.4/apcupsd.in.patch, files/3.12.4/etc.patch,
+  +files/3.12.4/exit-status-build.patch, +files/3.12.4/no-strip.patch,
+  apcupsd-3.12.4.ebuild:
+  Move install sed into a real patch and make sure failures in subdirs are
+  caught #156980.
 
   22 Oct 2006; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.15-r1.ebuild,
   apcupsd-3.10.16-r3.ebuild, apcupsd-3.10.17-r1.ebuild,
diff --git a/sys-power/apcupsd/apcupsd-3.12.4.ebuild b/sys-power/apcupsd/apcupsd-3.12.4.ebuild
index 9ed18845dfa5..8bad2ca506ee 100644
--- a/sys-power/apcupsd/apcupsd-3.12.4.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.12.4.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.3 2006/10/22 19:49:01 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.4 2006/12/19 22:19:33 vapier Exp $
 
+WEBAPP_MANUAL_SLOT="yes"
 inherit eutils webapp
 
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
@@ -9,13 +10,11 @@ HOMEPAGE="http://www.apcupsd.org/"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
-WEBAPP_MANUAL_SLOT="yes"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="doc snmp usb cgi threads ncurses nls"
 
-DEPEND="doc? ( virtual/tetex
-		dev-tex/latex2html )
+DEPEND="doc? ( virtual/tetex dev-tex/latex2html )
 	cgi? ( >=media-libs/gd-1.8.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
@@ -29,15 +28,11 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/platforms/gentoo
-	epatch ${FILESDIR}/${PV}/apcupsd.in.patch
-
-	cd ${S}/platforms
-	epatch ${FILESDIR}/${PV}/etc.patch
-
-	# Avoid usage of install -s, leave to portage stripping binaries
-	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
-		${S}/src/Makefile.in ${S}/src/cgi/Makefile.in
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}/apcupsd.in.patch
+	epatch "${FILESDIR}"/${PV}/etc.patch
+	epatch "${FILESDIR}"/${PV}/exit-status-build.patch
+	epatch "${FILESDIR}"/${PV}/no-strip.patch
 }
 
 src_compile() {
@@ -80,7 +75,7 @@ src_compile() {
 src_install() {
 	use cgi && webapp_src_preinst
 
-	make DESTDIR=${D} install || die "installed failed"
+	emake DESTDIR="${D}" install || die "installed failed"
 	rm -f "${D}"/etc/init.d/halt
 
 	insinto /etc/apcupsd
diff --git a/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch b/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
index 7bcb0f41c086..69dad9d74d1c 100644
--- a/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
+++ b/sys-power/apcupsd/files/3.12.4/apcupsd.in.patch
@@ -1,5 +1,5 @@
---- apcupsd.in	2002-09-14 14:03:18.000000000 +0200
-+++ apcupsd.in.new	2003-11-06 16:34:28.000000000 +0100
+--- platforms/gentoo/apcupsd.in
++++ platforms/gentoo/apcupsd.in
 @@ -6,6 +6,12 @@
  APCPID=@PIDDIR@/apcupsd.pid
  APCUPSD=@sbindir@/apcupsd
diff --git a/sys-power/apcupsd/files/3.12.4/etc.patch b/sys-power/apcupsd/files/3.12.4/etc.patch
index a3acfdbd6fe4..a4951f8dae43 100644
--- a/sys-power/apcupsd/files/3.12.4/etc.patch
+++ b/sys-power/apcupsd/files/3.12.4/etc.patch
@@ -1,6 +1,5 @@
-diff -cwb etc.bak/changeme.in etc/changeme.in
-*** etc.bak/changeme.in	Sun Mar 19 01:39:52 2006
---- etc/changeme.in	Sun Mar 19 01:41:31 2006
+*** platforms/etc.bak/changeme.in	Sun Mar 19 01:39:52 2006
+--- platforms/etc/changeme.in	Sun Mar 19 01:41:31 2006
 ***************
 *** 13,21 ****
   #
@@ -23,9 +22,8 @@ diff -cwb etc.bak/changeme.in etc/changeme.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/commfailure.in etc/commfailure.in
-*** etc.bak/commfailure.in	Sun Mar 19 01:39:52 2006
---- etc/commfailure.in	Sun Mar 19 01:41:51 2006
+*** platforms/etc.bak/commfailure.in	Sun Mar 19 01:39:52 2006
+--- platforms/etc/commfailure.in	Sun Mar 19 01:41:51 2006
 ***************
 *** 13,21 ****
   #
@@ -48,9 +46,8 @@ diff -cwb etc.bak/commfailure.in etc/commfailure.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/commok.in etc/commok.in
-*** etc.bak/commok.in	Sun Mar 19 01:39:52 2006
---- etc/commok.in	Sun Mar 19 01:42:05 2006
+*** platforms/etc.bak/commok.in	Sun Mar 19 01:39:52 2006
+--- platforms/etc/commok.in	Sun Mar 19 01:42:05 2006
 ***************
 *** 13,21 ****
   #
@@ -73,9 +70,8 @@ diff -cwb etc.bak/commok.in etc/commok.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/masterconnect.in etc/masterconnect.in
-*** etc.bak/masterconnect.in	Sun Mar 19 01:39:52 2006
---- etc/masterconnect.in	Sun Mar 19 01:42:22 2006
+*** platforms/etc.bak/masterconnect.in	Sun Mar 19 01:39:52 2006
+--- platforms/etc/masterconnect.in	Sun Mar 19 01:42:22 2006
 ***************
 *** 13,21 ****
   #
@@ -98,9 +94,8 @@ diff -cwb etc.bak/masterconnect.in etc/masterconnect.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/mastertimeout.in etc/mastertimeout.in
-*** etc.bak/mastertimeout.in	Sun Mar 19 01:39:52 2006
---- etc/mastertimeout.in	Sun Mar 19 01:42:35 2006
+*** platforms/etc.bak/mastertimeout.in	Sun Mar 19 01:39:52 2006
+--- platforms/etc/mastertimeout.in	Sun Mar 19 01:42:35 2006
 ***************
 *** 13,21 ****
   #
@@ -123,9 +118,8 @@ diff -cwb etc.bak/mastertimeout.in etc/mastertimeout.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/offbattery.in etc/offbattery.in
-*** etc.bak/offbattery.in	Sun Mar 19 01:39:52 2006
---- etc/offbattery.in	Sun Mar 19 01:42:53 2006
+*** platforms/etc.bak/offbattery.in	Sun Mar 19 01:39:52 2006
+--- platforms/etc/offbattery.in	Sun Mar 19 01:42:53 2006
 ***************
 *** 13,21 ****
   #
@@ -148,9 +142,8 @@ diff -cwb etc.bak/offbattery.in etc/offbattery.in
      @sbindir@/apcaccess status
 ! ) | $APCUPSD_MAIL $SYSADMIN
   exit 0
-diff -cwb etc.bak/onbattery.in etc/onbattery.in
-*** etc.bak/onbattery.in	Sun Mar 19 01:39:52 2006
---- etc/onbattery.in	Sun Mar 19 01:43:10 2006
+*** platforms/etc.bak/onbattery.in	Sun Mar 19 01:39:52 2006
+--- platforms/etc/onbattery.in	Sun Mar 19 01:43:10 2006
 ***************
 *** 13,21 ****
   #
diff --git a/sys-power/apcupsd/files/3.12.4/exit-status-build.patch b/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
new file mode 100644
index 000000000000..bce950448336
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.4/exit-status-build.patch
@@ -0,0 +1,15 @@
+if a subdir fails, we need to abort
+
+--- autoconf/targets.mak
++++ autoconf/targets.mak
+@@ -20,9 +20,7 @@
+ 	    for file in . ${subdirs}; \
+ 	    do \
+ 		(cd $$file && if test "$$file" != "."; then $(MAKE) DESTDIR=$(DESTDIR) all; fi); \
+-		  if test "$$?" != "0"; then \
+-		     break; \
+-		  fi; \
++		  test "$$?" != "0" && exit 1 ; \
+ 	    done; \
+ 	fi
+ 
diff --git a/sys-power/apcupsd/files/3.12.4/no-strip.patch b/sys-power/apcupsd/files/3.12.4/no-strip.patch
new file mode 100644
index 000000000000..494ba37f5478
--- /dev/null
+++ b/sys-power/apcupsd/files/3.12.4/no-strip.patch
@@ -0,0 +1,63 @@
+let portage handle stripping
+
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -56,9 +56,9 @@
+ install-binary: $(allexe)
+ 	@$(ECHO) "Installing daemons ..."
+ 	@$(SHELL) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+-	@$(INSTALL_PROGRAM) -s -m 700 apcupsd@EXEEXT@ \
++	@$(INSTALL_PROGRAM) -m 700 apcupsd@EXEEXT@ \
+ 		$(DESTDIR)$(sbindir)/apcupsd@EXEEXT@
+-	@$(INSTALL_PROGRAM) -s -m 700 apctest@EXEEXT@ \
++	@$(INSTALL_PROGRAM) -m 700 apctest@EXEEXT@ \
+ 		$(DESTDIR)$(sbindir)/apctest@EXEEXT@
+ 	@$(MAKE) DESTDIR=$(DESTDIR) install-@APCACCESS@
+ 	@$(MAKE) DESTDIR=$(DESTDIR) install-@SMTP@
+@@ -66,15 +66,15 @@
+ 	@$(MAKE) DESTDIR=$(DESTDIR) install-@CGI@
+ 
+ install-apcaccess:
+-	@$(INSTALL_PROGRAM) -s -m 755 apcaccess@EXEEXT@ \
++	@$(INSTALL_PROGRAM) -m 755 apcaccess@EXEEXT@ \
+ 		$(DESTDIR)$(sbindir)/apcaccess@EXEEXT@
+ 
+ install-smtp:
+-	@$(INSTALL_PROGRAM) -s -m 755 smtp@EXEEXT@ \
++	@$(INSTALL_PROGRAM) -m 755 smtp@EXEEXT@ \
+ 		$(DESTDIR)$(sbindir)/smtp@EXEEXT@
+ 
+ install-powerflute:
+-	@$(INSTALL_PROGRAM) -s -m 755 powerflute@EXEEXT@ \
++	@$(INSTALL_PROGRAM) -m 755 powerflute@EXEEXT@ \
+ 		$(DESTDIR)$(sbindir)/powerflute@EXEEXT@
+ install-cgi:
+ 	(cd cgi/; $(MAKE) DESTDIR=$(DESTDIR) install)
+--- src/win32/Makefile.in
++++ src/win32/Makefile.in
+@@ -63,9 +63,9 @@
+ 
+ install:
+ 	@echo "Installing executables ..."
+-	@$(INSTALL_PROGRAM) -s -m 755 popup.exe $(sbindir)/popup.exe
+-	@$(INSTALL_PROGRAM) -s -m 755 shutdown.exe $(sbindir)/shutdown.exe
+-	@$(INSTALL_PROGRAM) -s -m 755 email.exe $(sbindir)/email.exe
++	@$(INSTALL_PROGRAM) -m 755 popup.exe $(sbindir)/popup.exe
++	@$(INSTALL_PROGRAM) -m 755 shutdown.exe $(sbindir)/shutdown.exe
++	@$(INSTALL_PROGRAM) -m 755 email.exe $(sbindir)/email.exe
+ 
+ # Make a Win32 binary release 
+ binary-release:
+--- src/cgi/Makefile.in
++++ src/cgi/Makefile.in
+@@ -54,8 +54,8 @@
+ 
+ install: all-targets
+ 	@for p in $(allexe) ; do \
+-	    echo $(INSTALL_PROGRAM) -s $$p $(DESTDIR)$(cgibin); \
+-	    $(INSTALL_PROGRAM) -s $$p $(DESTDIR)$(cgibin); \
++	    echo $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \
++	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgibin); \
+ 	done
+ 	# don't overwrite any existing config file
+ 	@if test ! -f $(DESTDIR)$(sysconfdir)/apcupsd.css; then \