Adds patch to source functions.sh from /lib/gentoo, bug #504132

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A8C8FBCF)

3 files changed, 38 insertions, 2 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index 2cdbf3b14b80..e4f5d8284e3f 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webapp-config
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.116 2014/11/26 07:06:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.117 2014/12/28 01:55:44 twitch153 Exp $
+
+*webapp-config-1.53-r1 (28 Dec 2014)
+
+  28 Dec 2014; Devan Franchini <twitch153@gentoo.org>
+  +files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch,
+  +webapp-config-1.53-r1.ebuild, -webapp-config-1.53.ebuild:
+  Adds patch to source functions.sh from /lib/gentoo, bug #504132
 
   26 Nov 2014; Ian Delaney <idella4@gentoo.org> webapp-config-1.53.ebuild:
   clean old python impls
diff --git a/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch
new file mode 100644
index 000000000000..06a924a426be
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch
@@ -0,0 +1,25 @@
+From ff7ba0d89c79584f14a8137d886a656a9af6de5c Mon Sep 17 00:00:00 2001
+From: Devan Franchini <twitch153@gentoo.org>
+Date: Sat, 27 Dec 2014 20:43:08 -0500
+Subject: [PATCH] webapp-cleaner: sources function.sh from /lib/gentoo
+
+---
+ sbin/webapp-cleaner | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
+index bfec623..52e44ac 100755
+--- a/sbin/webapp-cleaner
++++ b/sbin/webapp-cleaner
+@@ -13,7 +13,7 @@ CMD="emerge -Cav"
+ WEBAPP_DIR="/usr/share/webapps"
+ WEBAPP_CONFIG=
+ 
+-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh
++[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh
+ 
+ function help() {
+ 	echo "Remove obsolete and unused versions of web applications"
+-- 
+2.0.5
+
diff --git a/app-admin/webapp-config/webapp-config-1.53.ebuild b/app-admin/webapp-config/webapp-config-1.53-r1.ebuild
index 75fdddc8a3f7..91bac21b4f01 100644
--- a/app-admin/webapp-config/webapp-config-1.53.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.53-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.53.ebuild,v 1.5 2014/11/26 07:06:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.53-r1.ebuild,v 1.1 2014/12/28 01:55:44 twitch153 Exp $
 
 EAPI="5"
 
@@ -22,6 +22,10 @@ DEPEND="app-text/xmlto
 	!dev-python/configparser"
 RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
+python_prepare() {
+	epatch "${FILESDIR}/${P}-sources-function.sh-from-lib-gentoo.patch"
+}
+
 python_compile_all() {
 	emake -C doc/
 }