Full fix for sandbox bug #133409 - in some cases automake was being called, blowing away the previous patch. So now patch Makefile.am and always call automake.

(Portage version: 2.1_rc1-r2)

3 files changed, 34 insertions, 11 deletions

diff --git a/app-backup/bobs/ChangeLog b/app-backup/bobs/ChangeLog
index 520b5b882df1..6f8a92a5dab5 100644
--- a/app-backup/bobs/ChangeLog
+++ b/app-backup/bobs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/bobs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bobs/ChangeLog,v 1.4 2006/05/16 16:56:18 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bobs/ChangeLog,v 1.5 2006/05/17 22:17:05 robbat2 Exp $
+
+  17 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  files/Makefile-fixcmdloopd.patch, bobs-0.6.2-r1.ebuild:
+  Full fix for sandbox bug #133409 - in some cases automake was being called,
+  blowing away the previous patch. So now patch Makefile.am and always call
+  automake.
 
   16 May 2006; Lisa Seelye <lisa@gentoo.org>
   +files/Makefile-fixcmdloopd.patch, -bobs-0.6.2.ebuild,
diff --git a/app-backup/bobs/bobs-0.6.2-r1.ebuild b/app-backup/bobs/bobs-0.6.2-r1.ebuild
index be8df95236ea..fca87e6b63f1 100644
--- a/app-backup/bobs/bobs-0.6.2-r1.ebuild
+++ b/app-backup/bobs/bobs-0.6.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bobs/bobs-0.6.2-r1.ebuild,v 1.2 2006/05/16 16:56:18 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bobs/bobs-0.6.2-r1.ebuild,v 1.3 2006/05/17 22:17:05 robbat2 Exp $
 
-inherit webapp eutils
+inherit webapp eutils autotools
 
 DESCRIPTION="The Browsable Online Backup System"
 HOMEPAGE="http://bobs.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bobs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE=""
 
@@ -39,6 +39,8 @@ src_unpack() {
 	# Modify the webdir to match the webapp format
 	sed -e "s:myWEBDIR=\$with_webdir/bobs:myWEBDIR=\$with_webdir:" \
 		-i 'configure' || die "configure bodge failed"
+
+	eautomake
 }
 
 src_compile() {
diff --git a/app-backup/bobs/files/Makefile-fixcmdloopd.patch b/app-backup/bobs/files/Makefile-fixcmdloopd.patch
index 835480455b51..f21eabed1e90 100644
--- a/app-backup/bobs/files/Makefile-fixcmdloopd.patch
+++ b/app-backup/bobs/files/Makefile-fixcmdloopd.patch
@@ -1,11 +1,26 @@
---- Makefile.in.dist	2006-05-15 23:22:50.000000000 +0100
-+++ Makefile.in	2006-05-15 23:23:10.000000000 +0100
-@@ -539,7 +539,7 @@
- 		echo "*******************************"; \
- 	fi
+diff -Nuar --exclude '*~' bobs-0.6.2.orig/Makefile.am bobs-0.6.2/Makefile.am
+--- bobs-0.6.2.orig/Makefile.am	2006-05-17 15:08:45.000000000 -0700
++++ bobs-0.6.2/Makefile.am	2006-05-17 15:11:12.066763852 -0700
+@@ -100,22 +100,6 @@
  
--	-$(myrealSYSCONFDIR)/init.d/cmdloopd start
-+#	-$(myrealSYSCONFDIR)/init.d/cmdloopd start
+ install-data-hook:
  
+-	-@if test -x "/sbin/chkconfig"; then \
+-		/sbin/chkconfig --add cmdloopd; \
+-	else \
+-		echo ""; \
+-		echo "********** IMPORTANT **********"; \
+-		echo "/sbin/chkconfig was not found."; \
+-		echo "For bobs to run properly you must insert"; \
+-		echo "the following line into your system startup script:"; \
+-		echo "  $(myrealSYSCONFDIR)/init.d/cmdloopd start"; \
+-		echo "This will start the bobs background service."; \
+-		echo "See the INSTALL document for more information."; \
+-		echo "*******************************"; \
+-	fi
+-
+-	-$(myrealSYSCONFDIR)/init.d/cmdloopd start
+-
  # Remove some other crap for 'make distclean'
  
+ distclean-local: