From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RwJoR-0006BF-Ih for garchives@archives.gentoo.org; Sat, 11 Feb 2012 20:44:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C45C4E06E7; Sat, 11 Feb 2012 20:44:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7BCEAE06E7 for ; Sat, 11 Feb 2012 20:44:42 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7A881B4008 for ; Sat, 11 Feb 2012 20:44:41 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2242) id 8BDFB2004B; Sat, 11 Feb 2012 20:44:40 +0000 (UTC) From: "Christian Ruppert (idl0r)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, idl0r@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog vdr-plugin.eclass X-VCS-Directories: eclass X-VCS-Committer: idl0r X-VCS-Committer-Name: Christian Ruppert Content-Type: text/plain; charset=utf8 Message-Id: <20120211204440.8BDFB2004B@flycatcher.gentoo.org> Date: Sat, 11 Feb 2012 20:44:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f9467149-9c47-4b8f-bc26-6aafe0cf40b7 X-Archives-Hash: 1ad04af3e6681f26263fca3560e22e66 idl0r 12/02/11 20:44:40 Modified: ChangeLog vdr-plugin.eclass Log: Remove vdr_add_local_patch() and use epatch_user() from eutils instead.= Issue a error in case the old variable to pass user patches is still use= d. Also the example has been removed as it was actually a common ebuild e= xample, nothing specific. Update descriptions. Revision Changes Path 1.127 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.127&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.127&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= 1=3D1.126&r2=3D1.127 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- ChangeLog 11 Feb 2012 12:20:33 -0000 1.126 +++ ChangeLog 11 Feb 2012 20:44:40 -0000 1.127 @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.126 2012/02/11 1= 2:20:33 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.127 2012/02/11 2= 0:44:40 idl0r Exp $ + + 11 Feb 2012; Christian Ruppert vdr-plugin.eclass: + Remove vdr_add_local_patch() and use epatch_user() from eutils instead= . Issue + a error in case the old variable to pass user patches is still used. A= lso the + example has been removed as it was actually a common ebuild example, n= othing + specific. Update descriptions. =20 11 Feb 2012; Ulrich M=C3=BCller elisp-common.eclass: Delete declaration of unused variable. 1.80 eclass/vdr-plugin.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.= eclass?rev=3D1.80&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.= eclass?rev=3D1.80&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.= eclass?r1=3D1.79&r2=3D1.80 Index: vdr-plugin.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- vdr-plugin.eclass 15 Jan 2012 20:54:56 -0000 1.79 +++ vdr-plugin.eclass 11 Feb 2012 20:44:40 -0000 1.80 @@ -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/vdr-plugin.eclass,v 1.79 2012/= 01/15 20:54:56 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.80 2012/= 02/11 20:44:40 idl0r Exp $ =20 # @ECLASS: vdr-plugin.eclass # @MAINTAINER: @@ -9,64 +9,39 @@ # @DESCRIPTION: # Eclass for easing maitenance of vdr plugin ebuilds =20 -# Author: -# Matthias Schwarzott -# Joerg Bornkessel - -# Example ebuild (basic version without patching): -# -# EAPI=3D"2" -# inherit vdr-plugin -# IUSE=3D"" -# SLOT=3D"0" -# DESCRIPTION=3D"vdr Plugin: DVB Frontend Status Monitor (signal strengt= /noise)" -# HOMEPAGE=3D"http://www.saunalahti.fi/~rahrenbe/vdr/femon/" -# SRC_URI=3D"http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${P}.tgz= " -# LICENSE=3D"GPL-2" -# KEYWORDS=3D"~x86" -# DEPEND=3D">=3Dmedia-video/vdr-1.6.0" -# -# - -# For patching you should modify src_prepare phase: -# -# src_prepare() { -# epatch "${FILESDIR}"/${P}-xxx.patch -# vdr-plugin_src_prepare -# } - -# Installation of a config file for the plugin -# -# If ${VDR_CONFD_FILE} is set install this file -# else install ${FILESDIR}/confd if it exists. - -# Gets installed as /etc/conf.d/vdr.${VDRPLUGIN}. -# For the plugin vdr-femon this would be /etc/conf.d/vdr.femon - - -# Installation of an rc-addon file for the plugin -# -# If ${VDR_RCADDON_FILE} is set install this file -# else install ${FILESDIR}/rc-addon.sh if it exists. -# -# Gets installed under ${VDR_RC_DIR}/plugin-${VDRPLUGIN}.sh -# (in example vdr-femon this would be /usr/share/vdr/rcscript/plugin= -femon.sh) -# -# This file is sourced by the startscript when plugin is activated i= n /etc/conf.d/vdr -# It could be used for special startup actions for this plugins, or = to create the -# plugin command line options from a nicer version of a conf.d file. - -# HowTo use own local patches; Example -# -# Add to your /etc/make.conf: -# VDR_LOCAL_PATCHES_DIR=3D"/usr/local/patch" -# -# Add two DIR's in your local patch dir, ${PN}/${PV}, -# e.g for vdr-burn-0.1.0 should be: -# /usr/local/patch/vdr-burn/0.1.0/ -# -# all patches which ending on diff or patch in this DIR will automatical= ly applied +# Authors: +# Matthias Schwarzott +# Joerg Bornkessel +# Christian Ruppert + +# Plugin config file installation: +# +# A plugin config file can be specified through the $VDR_CONFD_FILE vari= able, it +# defaults to ${FILESDIR}/confd. Each config file will be installed as e= .g. +# ${D}/etc/conf.d/vdr.${VDRPLUGIN} + +# Installation of rc-addon files: +# NOTE: rc-addon files must be valid shell scripts! +# +# Installing rc-addon files is basically the same as for plugin config f= iles +# (see above), it's just using the $VDR_RCADDON_FILE variable instead. +# The default value when $VDR_RCADDON_FILE is undefined is: +# ${FILESDIR}/rc-addon.sh and will be installed as +# ${VDR_RC_DIR}/plugin-${VDRPLUGIN}.sh +# +# The rc-addon files will be sourced by the startscript when the specifi= c plugin +# has been enabled. +# rc-addon files may be used to prepare everything that is necessary for= the +# plugin start/stop, like passing extra command line options and so on. + +# Applying your own local/user patches: +# This is done by using the epatch_user() function of the eutils.eclass. +# Simply put your patches into one of these directories: +# /etc/portage/patches/// +# Quote: where the first of these three directories to exist will be the= one to +# use, ignoring any more general directories which might exist as well. # +# For more details about it please take a look at the eutils.class. =20 inherit base multilib eutils flag-o-matic =20 @@ -248,16 +223,6 @@ touch "${WORKDIR}"/.vdr-plugin_makefile_patched } =20 -vdr_add_local_patch() { - if test -d "${VDR_LOCAL_PATCHES_DIR}/${PN}"; then - echo - einfo "Applying local patches" - for LOCALPATCH in "${VDR_LOCAL_PATCHES_DIR}/${PN}/${PV}"/*.{diff,patch= }; do - test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}" - done - fi -} - vdr_has_gettext() { has_version ">=3Dmedia-video/vdr-1.5.7" } @@ -437,12 +402,19 @@ =20 einfo "Compiling against" einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]" + + + if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then + eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!" + eerror "Please move all your patches into" + eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}" + eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable." + die + fi } =20 vdr-plugin_src_util() { - while [ "$1" ]; do - case "$1" in all) vdr-plugin_src_util unpack add_local_patch patchmakefile i18n @@ -455,7 +427,7 @@ ;; add_local_patch) cd "${S}" || die "Could not change to plugin-source-directory!" - vdr_add_local_patch + epatch_user ;; patchmakefile) cd "${S}" || die "Could not change to plugin-source-directory!"