[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    14/02/27 17:12:01

  Modified:             xfconf.eclass
  Log:
  get rid of base.eclass, mostly thanks to einstalldocs introduction to eutils, thanks to creffert for some hints

Revision  Changes    Path
1.46                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.45&r2=1.46

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xfconf.eclass	28 Nov 2012 12:41:23 -0000	1.45
+++ xfconf.eclass	27 Feb 2014 17:12:01 -0000	1.46
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.45 2012/11/28 12:41:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.46 2014/02/27 17:12:01 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -22,7 +22,7 @@
 unset _xfconf_live
 [[ $PV == *9999* ]] && _xfconf_live=git-2
 
-inherit ${_xfconf_live} autotools base eutils fdo-mime gnome2-utils libtool
+inherit ${_xfconf_live} autotools eutils fdo-mime gnome2-utils libtool
 
 EGIT_BOOTSTRAP=autogen.sh
 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
@@ -78,10 +78,13 @@
 
 # @FUNCTION: xfconf_src_prepare
 # @DESCRIPTION:
-# Run base_src_prepare and eautoreconf or elibtoolize
+# Process PATCHES with epatch and run epatch_user followed by run of
+# elibtoolize, or eautoreconf if EAUTORECONF is set.
 xfconf_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
-	base_src_prepare
+
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	epatch_user
 
 	if [[ -n $EAUTORECONF ]]; then
 		AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
@@ -101,7 +104,8 @@
 
 # @FUNCTION: xfconf_src_install
 # @DESCRIPTION:
-# Run emake install and install documentation in the DOCS array
+# Run emake install to DESTDIR, einstalldocs to process DOCS and
+# prune_libtool_files --all to always remove libtool files (.la)
 xfconf_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -110,7 +114,9 @@
 		touch ChangeLog
 	fi
 
-	base_src_install "$@" || die
+	emake DESTDIR="${D}" "$@" install
+
+	einstalldocs
 
 	prune_libtool_files --all
 }