From 84e6802074223326fe999092346d9ff6b501da2a Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Wed, 24 Dec 2014 09:58:27 +0000 Subject: [PATCH] remove base.eclass inherit --- eclass/ChangeLog | 5 ++++- eclass/netsurf.eclass | 14 ++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0083dab4124a..47bdd197ee73 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1471 2014/12/21 14:30:08 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1472 2014/12/24 09:58:27 xmw Exp $ + + 24 Dec 2014; Michael Weber netsurf.eclass: + remove base.eclass inherit 21 Dec 2014; Michał Górny tests/python-utils-r1.sh: Update tests for unsupported python3.2. diff --git a/eclass/netsurf.eclass b/eclass/netsurf.eclass index e1d778729adf..4574ebb706a5 100644 --- a/eclass/netsurf.eclass +++ b/eclass/netsurf.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/netsurf.eclass,v 1.1 2013/06/23 16:36:49 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/netsurf.eclass,v 1.2 2014/12/24 09:58:27 xmw Exp $ # @ECLASS: netsurf.eclass # @MAINTAINER: @@ -17,7 +17,7 @@ case ${EAPI:-0} in *) ;; esac -inherit base toolchain-funcs multilib-minimal +inherit eutils toolchain-funcs multilib-minimal EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install @@ -56,10 +56,12 @@ DEPEND="virtual/pkgconfig" # @FUNCTION: netsurf_src_prepare # @DESCRIPTION: -# Run base_src_prepare for PATCHES support and multilib_copy_sources for -# in-source build. +# Apply and PATCHES and multilib_copy_sources for in-source build. netsurf_src_prepare() { - base_src_prepare + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + debug-print "$FUNCNAME: applying user patches" + epatch_user + multilib_copy_sources } -- 2.26.2