From: "Christian Ruppert (idl0r)" <idl0r@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin.eclass
Date: Sat, 11 Feb 2012 20:44:40 +0000 (UTC) [thread overview]
Message-ID: <20120211204440.8BDFB2004B@flycatcher.gentoo.org> (raw)
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 used. Also the example has been removed as it was actually a common ebuild example, nothing specific. Update descriptions.
Revision Changes Path
1.127 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.126&r2=1.127
Index: ChangeLog
===================================================================
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 12:20:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.127 2012/02/11 20:44:40 idl0r Exp $
+
+ 11 Feb 2012; Christian Ruppert <idl0r@gentoo.org> 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. Also the
+ example has been removed as it was actually a common ebuild example, nothing
+ specific. Update descriptions.
11 Feb 2012; Ulrich Müller <ulm@gentoo.org> 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=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.79&r2=1.80
Index: vdr-plugin.eclass
===================================================================
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 $
# @ECLASS: vdr-plugin.eclass
# @MAINTAINER:
@@ -9,64 +9,39 @@
# @DESCRIPTION:
# Eclass for easing maitenance of vdr plugin ebuilds
-# Author:
-# Matthias Schwarzott <zzam@gentoo.org>
-# Joerg Bornkessel <hd_brummy@gentoo.org>
-
-# Example ebuild (basic version without patching):
-#
-# EAPI="2"
-# inherit vdr-plugin
-# IUSE=""
-# SLOT="0"
-# DESCRIPTION="vdr Plugin: DVB Frontend Status Monitor (signal strengt/noise)"
-# HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/femon/"
-# SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${P}.tgz"
-# LICENSE="GPL-2"
-# KEYWORDS="~x86"
-# DEPEND=">=media-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 in /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="/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 automatically applied
+# Authors:
+# Matthias Schwarzott <zzam@gentoo.org>
+# Joerg Bornkessel <hd_brummy@gentoo.org>
+# Christian Ruppert <idl0r@gentoo.org>
+
+# Plugin config file installation:
+#
+# A plugin config file can be specified through the $VDR_CONFD_FILE variable, 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 files
+# (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 specific 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/<CATEGORY>/<PF|P|PN>/
+# 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.
inherit base multilib eutils flag-o-matic
@@ -248,16 +223,6 @@
touch "${WORKDIR}"/.vdr-plugin_makefile_patched
}
-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 ">=media-video/vdr-1.5.7"
}
@@ -437,12 +402,19 @@
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
}
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!"
next reply other threads:[~2012-02-11 20:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-11 20:44 Christian Ruppert (idl0r) [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-26 5:13 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vdr-plugin.eclass Joerg Bornkessel (hd_brummy)
2014-01-15 1:12 Joerg Bornkessel (hd_brummy)
2013-02-18 9:43 Joerg Bornkessel (hd_brummy)
2012-04-23 23:13 Joerg Bornkessel (hd_brummy)
2012-04-18 16:52 Joerg Bornkessel (hd_brummy)
2012-04-07 10:18 Joerg Bornkessel (hd_brummy)
2012-04-07 10:12 Joerg Bornkessel (hd_brummy)
2012-03-18 23:33 Joerg Bornkessel (hd_brummy)
2012-03-09 23:14 Joerg Bornkessel (hd_brummy)
2012-03-09 22:44 Joerg Bornkessel (hd_brummy)
2012-02-15 18:41 Joerg Bornkessel (hd_brummy)
2012-01-15 20:54 Christian Ruppert (idl0r)
2012-01-15 17:11 Christian Ruppert (idl0r)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120211204440.8BDFB2004B@flycatcher.gentoo.org \
--to=idl0r@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox