[gentoo-dev] [PATCH] xfconf.eclass: remove git logic

[Marty E. Plummer]

There are currently no ebuilds using xfconf which are live, and the live
logic here is based around git-2 which has been deprecated since 20151113.

Signed-off-by: Marty E. Plummer <hanetzer@×××××××××.com>
---
 eclass/xfconf.eclass | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
index 496c42d5cf1..705324494a4 100644
--- a/eclass/xfconf.eclass
+++ b/eclass/xfconf.eclass
@@ -22,18 +22,11 @@ fi
 # @DESCRIPTION:
 # This should be an array defining arguments for econf
 
-unset _xfconf_live
-[[ $PV == *9999* ]] && _xfconf_live=git-2
-
-inherit ${_xfconf_live} autotools eutils gnome2-utils libtool xdg-utils
-
-EGIT_BOOTSTRAP=autogen.sh
-EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
+inherit autotools eutils gnome2-utils libtool xdg-utils
 
 _xfconf_deps=""
 _xfconf_m4=">=dev-util/xfce4-dev-tools-4.10"
 
-[[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
 [[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"
 
 RDEPEND=""
@@ -47,9 +40,7 @@ case ${EAPI:-0} in
 	*) die "Unknown EAPI." ;;
 esac
 
-[[ -n $_xfconf_live ]] && _xfconf_live=src_unpack
-
-EXPORT_FUNCTIONS ${_xfconf_live} src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @FUNCTION: xfconf_use_debug
 # @DESCRIPTION:
@@ -101,7 +92,6 @@ xfconf_src_prepare() {
 # Run econf with opts from the XFCONF array
 xfconf_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
-	[[ -n $_xfconf_live ]] && XFCONF+=( --enable-maintainer-mode )
 	econf "${XFCONF[@]}"
 }
 
@@ -112,11 +102,6 @@ xfconf_src_configure() {
 xfconf_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# FIXME
-	if [[ -n $_xfconf_live ]] && ! [[ -e ChangeLog ]]; then
-		touch ChangeLog
-	fi
-
 	emake DESTDIR="${D}" "$@" install
 
 	einstalldocs
-- 
2.17.1