* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-06-24 16:43 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-06-24 16:43 UTC (permalink / raw
To: gentoo-commits
zzam 08/06/24 16:43:39
Modified: vdr-plugin.eclass
Log:
Fix typo.
Revision Changes Path
1.63 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.62&r2=1.63
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- vdr-plugin.eclass 2 Jun 2008 05:15:27 -0000 1.62
+++ vdr-plugin.eclass 24 Jun 2008 16:43:38 -0000 1.63
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.62 2008/06/02 05:15:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.63 2008/06/24 16:43:38 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -185,7 +185,7 @@
# Set VDRINCDIR=/usr/include
# Change $(VDRDIR)/include to $(VDRINCDIR)
- ebegin " Setting Pathes"
+ ebegin " Setting paths"
sed -i Makefile \
-e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
-e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2011-12-31 1:01 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 26+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2011-12-31 1:01 UTC (permalink / raw
To: gentoo-commits
hd_brummy 11/12/31 01:01:56
Modified: vdr-plugin.eclass
Log:
fix for missing i18n-to-gettext, up from vdr-1.7.22
Revision Changes Path
1.77 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.76&r2=1.77
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- vdr-plugin.eclass 27 Dec 2011 17:55:12 -0000 1.76
+++ vdr-plugin.eclass 31 Dec 2011 01:01:56 -0000 1.77
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.76 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.77 2011/12/31 01:01:56 hd_brummy Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -265,7 +265,11 @@
}
vdr_i18n_convert_to_gettext() {
- local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
+ if has_version ">=media-video/vdr-1.7.22"; then
+ local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext"
+ else
+ local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
+ fi
if [[ ${NO_GETTEXT_HACK} == "1" ]]; then
ewarn "Conversion to gettext disabled in ebuild"
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2011-10-24 19:54 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 26+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2011-10-24 19:54 UTC (permalink / raw
To: gentoo-commits
hd_brummy 11/10/24 19:54:51
Modified: vdr-plugin.eclass
Log:
vdr-plugin.eclass; fixed locale DIR, changed up from >=media-video/vdr-1.6.0_p2-r7
Revision Changes Path
1.75 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.74&r2=1.75
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- vdr-plugin.eclass 29 Aug 2011 01:28:10 -0000 1.74
+++ vdr-plugin.eclass 24 Oct 2011 19:54:51 -0000 1.75
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.74 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.75 2011/10/24 19:54:51 hd_brummy Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -405,7 +405,7 @@
DVB_INCLUDE_DIR="/usr/include"
TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
- if has_version ">=media-video/vdr-1.7.17"; then
+ if has_version ">=media-video/vdr-1.6.0_p2-r7"; then
LOCDIR="/usr/share/locale"
else
LOCDIR="/usr/share/vdr/locale"
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2011-03-13 19:06 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 26+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2011-03-13 19:06 UTC (permalink / raw
To: gentoo-commits
hd_brummy 11/03/13 19:06:26
Modified: vdr-plugin.eclass
Log:
addapted to the new vdr locale DIR, used up from vdr-1.7.17
Revision Changes Path
1.73 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.72&r2=1.73
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- vdr-plugin.eclass 28 Jan 2011 17:07:03 -0000 1.72
+++ vdr-plugin.eclass 13 Mar 2011 19:06:26 -0000 1.73
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.72 2011/01/28 17:07:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.73 2011/03/13 19:06:26 hd_brummy Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -405,7 +405,11 @@
DVB_INCLUDE_DIR="/usr/include"
TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
- LOCDIR="/usr/share/vdr/locale"
+ if has_version ">=media-video/vdr-1.7.17"; then
+ LOCDIR="/usr/share/locale"
+ else
+ LOCDIR="/usr/share/vdr/locale"
+ fi
if ! has_vdr; then
# set to invalid values to detect abuses
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2011-01-28 17:07 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 26+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2011-01-28 17:07 UTC (permalink / raw
To: gentoo-commits
hd_brummy 11/01/28 17:07:03
Modified: vdr-plugin.eclass
Log:
addapted to EAPI=3
Revision Changes Path
1.72 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.71&r2=1.72
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- vdr-plugin.eclass 11 Oct 2009 11:49:05 -0000 1.71
+++ vdr-plugin.eclass 28 Jan 2011 17:07:03 -0000 1.72
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.71 2009/10/11 11:49:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.72 2011/01/28 17:07:03 hd_brummy Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -68,6 +68,10 @@
inherit base multilib eutils flag-o-matic
+if ! has "${EAPI:-0}" 0 1 2 3; then
+ die "API of vdr-plugin.eclass in EAPI=\"${EAPI}\" not established"
+fi
+
IUSE=""
# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
@@ -382,6 +386,12 @@
# -fPIC is needed for shared objects on some platforms (amd64 and others)
append-flags -fPIC
+ # Plugins need to be compiled with position independent code, otherwise linking
+ # VDR against it will fail
+ if has_version ">=media-video/vdr-1.7.13"; then
+ append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ fi
+
# Where should the plugins live in the filesystem
VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"
@@ -461,7 +471,7 @@
fi
if [ -z "$1" ]; then
case "${EAPI:-0}" in
- 2)
+ 2|3)
vdr-plugin_src_util unpack
;;
*)
@@ -604,7 +614,7 @@
}
case "${EAPI:-0}" in
- 2)
+ 2|3)
EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
;;
*)
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2009-10-11 11:49 Markus Meier (maekke)
0 siblings, 0 replies; 26+ messages in thread
From: Markus Meier (maekke) @ 2009-10-11 11:49 UTC (permalink / raw
To: gentoo-commits
maekke 09/10/11 11:49:05
Modified: vdr-plugin.eclass
Log:
whitespace
Revision Changes Path
1.71 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.70&r2=1.71
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- vdr-plugin.eclass 8 Oct 2009 08:12:50 -0000 1.70
+++ vdr-plugin.eclass 11 Oct 2009 11:49:05 -0000 1.71
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.70 2009/10/08 08:12:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.71 2009/10/11 11:49:05 maekke Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -410,7 +410,7 @@
fi
return
fi
-
+
VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2009-10-08 8:12 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-10-08 8:12 UTC (permalink / raw
To: gentoo-commits
zzam 09/10/08 08:12:51
Modified: vdr-plugin.eclass
Log:
Improve disable file stripping. Be less verbose. Update example ebuild code.
Revision Changes Path
1.70 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.69&r2=1.70
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- vdr-plugin.eclass 24 Mar 2009 21:10:13 -0000 1.69
+++ vdr-plugin.eclass 8 Oct 2009 08:12:50 -0000 1.70
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.69 2009/03/24 21:10:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.70 2009/10/08 08:12:50 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -11,8 +11,9 @@
# eclass to create ebuilds for vdr plugins
#
-# Example ebuild (vdr-femon):
+# Example ebuild (basic version without patching):
#
+# EAPI="2"
# inherit vdr-plugin
# IUSE=""
# SLOT="0"
@@ -21,10 +22,17 @@
# SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${P}.tgz"
# LICENSE="GPL-2"
# KEYWORDS="~x86"
-# DEPEND=">=media-video/vdr-1.3.27"
+# 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
@@ -165,7 +173,7 @@
fix_vdr_libsi_include()
{
- einfo "Fixing include of libsi-headers"
+ #einfo "Fixing include of libsi-headers"
local f
for f; do
sed -i "${f}" \
@@ -195,7 +203,6 @@
# Set VDRINCDIR=/usr/include
# Change $(VDRDIR)/include to $(VDRINCDIR)
- ebegin " Setting paths"
sed -i Makefile \
-e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
-e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \
@@ -203,7 +210,6 @@
\
-e 's:-I$(DVBDIR)/include::' \
-e 's:-I$(DVBDIR)::'
- eend 0
# maybe needed for multiproto:
#sed -i Makefile \
@@ -229,7 +235,7 @@
sed -i Makefile \
-e '/@.*strip/d' \
-e '/strip \$(LIBDIR)\/\$@/d' \
- -e '/@.*\$(STRIP)/d'
+ -e 's/STRIP.*=.*$/STRIP = true/'
# Use a file instead of a variable as single-stepping via ebuild
# destroys environment.
@@ -295,20 +301,20 @@
}
vdr_i18n_disable_gettext() {
- ebegin "Disabling gettext support in plugin"
+ #einfo "Disabling gettext support in plugin"
+
# Remove i18n Target if using older vdr
sed -i Makefile \
-e '/^all:/s/ i18n//'
- eend 0
}
vdr_i18n() {
if vdr_has_gettext; then
- einfo "VDR has gettext support"
+ #einfo "VDR has gettext support"
if plugin_has_gettext; then
- einfo "Plugin has gettext support, fine"
+ #einfo "Plugin has gettext support, fine"
if [[ ${NO_GETTEXT_HACK} == "1" ]]; then
- ewarn "Please remove left over NO_GETTEXT_HACK."
+ ewarn "Please remove unneeded NO_GETTEXT_HACK from ebuild."
fi
else
vdr_i18n_convert_to_gettext
@@ -319,7 +325,7 @@
fi
fi
else
- einfo "VDR has no gettext support"
+ #einfo "VDR has no gettext support"
if plugin_has_gettext; then
vdr_i18n_disable_gettext
fi
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2009-03-24 21:10 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-03-24 21:10 UTC (permalink / raw
To: gentoo-commits
zzam 09/03/24 21:10:14
Modified: vdr-plugin.eclass
Log:
Make vdr conditional when GENTOO_VDR_CONDITIONAL=yes is set. This is for cases like vdr-xineliboutput which want to compile vdr-plugins based on useflag vdr.
Revision Changes Path
1.69 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.68&r2=1.69
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vdr-plugin.eclass 6 Mar 2009 09:09:29 -0000 1.68
+++ vdr-plugin.eclass 24 Mar 2009 21:10:13 -0000 1.69
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.68 2009/03/06 09:09:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.69 2009/03/24 21:10:13 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -80,6 +80,15 @@
RDEPEND="${COMMON_DEPEND}
>=app-admin/eselect-vdr-0.0.2"
+# this is a hack for ebuilds like vdr-xineliboutput that want to
+# conditionally install a vdr-plugin
+if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then
+ # make DEPEND conditional
+ IUSE="${IUSE} vdr"
+ DEPEND="vdr? ( ${DEPEND} )"
+ RDEPEND="vdr? ( ${RDEPEND} )"
+fi
+
# New method of storing plugindb
# Called from src_install
# file maintained by normal portage-methods
@@ -357,6 +366,9 @@
elog
}
+has_vdr() {
+ [[ -f "${VDR_INCLUDE_DIR}"/config.h ]]
+}
## exported functions
@@ -379,6 +391,20 @@
TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
LOCDIR="/usr/share/vdr/locale"
+ if ! has_vdr; then
+ # set to invalid values to detect abuses
+ VDRVERSION="eclass_no_vdr_installed"
+ APIVERSION="eclass_no_vdr_installed"
+
+ if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]] && ! use vdr; then
+ einfo "VDR not found!"
+ else
+ # if vdr is required
+ die "VDR not found!"
+ fi
+ return
+ fi
+
VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2009-03-06 9:09 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-03-06 9:09 UTC (permalink / raw
To: gentoo-commits
zzam 09/03/06 09:09:29
Modified: vdr-plugin.eclass
Log:
Disambiguate the parameters to call only parts of src_* functions
Revision Changes Path
1.68 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.67&r2=1.68
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vdr-plugin.eclass 24 Feb 2009 00:26:25 -0000 1.67
+++ vdr-plugin.eclass 6 Mar 2009 09:09:29 -0000 1.68
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.67 2009/02/24 00:26:25 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.68 2009/03/06 09:09:29 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -395,7 +395,7 @@
all)
vdr-plugin_src_util unpack add_local_patch patchmakefile i18n
;;
- all_but_unpack)
+ prepare|all_but_unpack)
vdr-plugin_src_util add_local_patch patchmakefile i18n
;;
unpack)
@@ -444,16 +444,16 @@
vdr-plugin_src_prepare() {
base_src_prepare
- vdr-plugin_src_util all_but_unpack
+ vdr-plugin_src_util prepare
}
vdr-plugin_src_compile() {
- [ -z "$1" ] && vdr-plugin_src_compile prepare compile
+ [ -z "$1" ] && vdr-plugin_src_compile copy_source compile
while [ "$1" ]; do
case "$1" in
- prepare)
+ copy_source)
[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_copy_source_tree
;;
compile)
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2009-02-24 0:26 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-02-24 0:26 UTC (permalink / raw
To: gentoo-commits
zzam 09/02/24 00:26:25
Modified: vdr-plugin.eclass
Log:
Add forgotten call to base_src_prepare
Revision Changes Path
1.67 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.66&r2=1.67
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vdr-plugin.eclass 23 Feb 2009 23:46:31 -0000 1.66
+++ vdr-plugin.eclass 24 Feb 2009 00:26:25 -0000 1.67
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.66 2009/02/23 23:46:31 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.67 2009/02/24 00:26:25 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -443,6 +443,7 @@
}
vdr-plugin_src_prepare() {
+ base_src_prepare
vdr-plugin_src_util all_but_unpack
}
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2009-02-23 23:46 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-02-23 23:46 UTC (permalink / raw
To: gentoo-commits
zzam 09/02/23 23:46:31
Modified: vdr-plugin.eclass
Log:
make eclass ready for eapi2
Revision Changes Path
1.66 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.65&r2=1.66
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vdr-plugin.eclass 3 Jul 2008 11:18:13 -0000 1.65
+++ vdr-plugin.eclass 23 Feb 2009 23:46:31 -0000 1.66
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.65 2008/07/03 11:18:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.66 2009/02/23 23:46:31 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -387,21 +387,16 @@
einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
}
-vdr-plugin_src_unpack() {
- if [[ -z ${VDR_INCLUDE_DIR} ]]; then
- eerror "Wrong use of vdr-plugin.eclass."
- eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin_pkg_setup."
- echo
- eerror "Please report this at bugs.gentoo.org."
- die "vdr-plugin_pkg_setup not called!"
- fi
- [ -z "$1" ] && vdr-plugin_src_unpack unpack add_local_patch patchmakefile i18n
+vdr-plugin_src_util() {
while [ "$1" ]; do
case "$1" in
+ all)
+ vdr-plugin_src_util unpack add_local_patch patchmakefile i18n
+ ;;
all_but_unpack)
- vdr-plugin_src_unpack add_local_patch patchmakefile i18n
+ vdr-plugin_src_util add_local_patch patchmakefile i18n
;;
unpack)
base_src_unpack
@@ -424,6 +419,33 @@
done
}
+vdr-plugin_src_unpack() {
+ if [[ -z ${VDR_INCLUDE_DIR} ]]; then
+ eerror "Wrong use of vdr-plugin.eclass."
+ eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin_pkg_setup."
+ echo
+ eerror "Please report this at bugs.gentoo.org."
+ die "vdr-plugin_pkg_setup not called!"
+ fi
+ if [ -z "$1" ]; then
+ case "${EAPI:-0}" in
+ 2)
+ vdr-plugin_src_util unpack
+ ;;
+ *)
+ vdr-plugin_src_util all
+ ;;
+ esac
+
+ else
+ vdr-plugin_src_util $@
+ fi
+}
+
+vdr-plugin_src_prepare() {
+ vdr-plugin_src_util all_but_unpack
+}
+
vdr-plugin_src_compile() {
[ -z "$1" ] && vdr-plugin_src_compile prepare compile
@@ -548,4 +570,11 @@
vdr-plugin_print_enable_command
}
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_postrm pkg_config
+case "${EAPI:-0}" in
+ 2)
+ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
+ ;;
+ *)
+ EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_postrm pkg_config
+ ;;
+esac
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-07-03 11:18 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-07-03 11:18 UTC (permalink / raw
To: gentoo-commits
zzam 08/07/03 11:18:13
Modified: vdr-plugin.eclass
Log:
Now prefer BUILD_TARGETS instead of VDRPLUGIN_MAKE_TARGET. Set RDEPEND and DEPEND appropriate.
Revision Changes Path
1.65 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.64&r2=1.65
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- vdr-plugin.eclass 25 Jun 2008 21:35:27 -0000 1.64
+++ vdr-plugin.eclass 3 Jul 2008 11:18:13 -0000 1.65
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.64 2008/06/25 21:35:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.65 2008/07/03 11:18:13 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -73,11 +73,12 @@
S="${WORKDIR}/${VDRPLUGIN}-${PV}"
# depend on headers for DVB-driver
-DEPEND=">=media-tv/gentoo-vdr-scripts-0.3.8
- || ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=media-tv/vdrplugin-rebuild-0.2 )
- >=app-admin/eselect-vdr-0.0.2
- media-tv/linuxtv-dvb-headers"
+COMMON_DEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2"
+DEPEND="${COMMON_DEPEND}
+ media-tv/linuxtv-dvb-headers"
+RDEPEND="${COMMON_DEPEND}
+ >=app-admin/eselect-vdr-0.0.2"
# New method of storing plugindb
# Called from src_install
@@ -443,8 +444,10 @@
fi
cd "${S}"
+ BUILD_TARGETS=${BUILD_TARGETS:-${VDRPLUGIN_MAKE_TARGET:-all}}
+
emake ${BUILD_PARAMS} \
- ${VDRPLUGIN_MAKE_TARGET:-all} \
+ ${BUILD_TARGETS} \
LOCALEDIR="${TMP_LOCALE_DIR}" \
LIBDIR="${S}" \
TMPDIR="${T}" \
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-06-25 21:35 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-06-25 21:35 UTC (permalink / raw
To: gentoo-commits
zzam 08/06/25 21:35:28
Modified: vdr-plugin.eclass
Log:
Show not only command to enable main plugin, but list of installed plugins.
Revision Changes Path
1.64 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.63&r2=1.64
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- vdr-plugin.eclass 24 Jun 2008 16:43:38 -0000 1.63
+++ vdr-plugin.eclass 25 Jun 2008 21:35:27 -0000 1.64
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.63 2008/06/24 16:43:38 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.64 2008/06/25 21:35:27 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -340,9 +340,19 @@
}
vdr-plugin_print_enable_command() {
+ local p_name c=0 l=""
+ for p_name in ${vdr_plugin_list}; do
+ c=$(( c+1 ))
+ l="$l ${p_name#vdr-}"
+ done
+
elog
- elog "To activate this vdr-plugin execute the following command:"
- elog "\teselect vdr-plugin enable ${PN#vdr-}"
+ case $c in
+ 1) elog "Installed plugin${l}" ;;
+ *) elog "Installed $c plugins:${l}" ;;
+ esac
+ elog "To activate a plugin execute this command:"
+ elog "\teselect vdr-plugin enable <plugin_name> ..."
elog
}
@@ -475,15 +485,16 @@
doins libvdr-*.so.*
# create list of all created plugin libs
- local p_list="" p_name
+ vdr_plugin_list=""
+ local p_name
for p in libvdr-*.so.*; do
p_name="${p%.so*}"
p_name="${p_name#lib}"
- p_list="${p_list} ${p_name}"
+ vdr_plugin_list="${vdr_plugin_list} ${p_name}"
done
- create_header_checksum_file ${p_list}
- create_plugindb_file ${p_list}
+ create_header_checksum_file ${vdr_plugin_list}
+ create_plugindb_file ${vdr_plugin_list}
if vdr_has_gettext && [[ -d ${TMP_LOCALE_DIR} ]]; then
einfo "Installing locales"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-06-02 5:15 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-06-02 5:15 UTC (permalink / raw
To: gentoo-commits
zzam 08/06/02 05:15:27
Modified: vdr-plugin.eclass
Log:
Warn about useless leftover NO_GETTEXT_HACK if plugin already was updated for gettext.
Revision Changes Path
1.62 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.61&r2=1.62
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- vdr-plugin.eclass 16 May 2008 13:52:16 -0000 1.61
+++ vdr-plugin.eclass 2 Jun 2008 05:15:27 -0000 1.62
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.61 2008/05/16 13:52:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.62 2008/06/02 05:15:27 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -297,6 +297,9 @@
einfo "VDR has gettext support"
if plugin_has_gettext; then
einfo "Plugin has gettext support, fine"
+ if [[ ${NO_GETTEXT_HACK} == "1" ]]; then
+ ewarn "Please remove left over NO_GETTEXT_HACK."
+ fi
else
vdr_i18n_convert_to_gettext
if [[ $? != 0 ]]; then
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-05-16 13:52 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-05-16 13:52 UTC (permalink / raw
To: gentoo-commits
zzam 08/05/16 13:52:17
Modified: vdr-plugin.eclass
Log:
Revert installing libs to a different tmp directory. Install to $S as before.
Revision Changes Path
1.61 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.60&r2=1.61
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- vdr-plugin.eclass 15 May 2008 14:03:15 -0000 1.60
+++ vdr-plugin.eclass 16 May 2008 13:52:16 -0000 1.61
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.60 2008/05/15 14:03:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.61 2008/05/16 13:52:16 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -365,8 +365,6 @@
TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
LOCDIR="/usr/share/vdr/locale"
- TMP_LIBDIR="${WORKDIR}/tmp-libdir"
-
VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
@@ -432,11 +430,10 @@
fi
cd "${S}"
- mkdir -p "${TMP_LIBDIR}"
emake ${BUILD_PARAMS} \
${VDRPLUGIN_MAKE_TARGET:-all} \
LOCALEDIR="${TMP_LOCALE_DIR}" \
- LIBDIR="${TMP_LIBDIR}" \
+ LIBDIR="${S}" \
TMPDIR="${T}" \
|| die "emake failed"
;;
@@ -469,16 +466,17 @@
fi
- local p_list="" p_name
- cd "${TMP_LIBDIR}"
+ cd "${S}"
+ insinto "${VDR_PLUGIN_DIR}"
+ doins libvdr-*.so.*
+
+ # create list of all created plugin libs
+ local p_list="" p_name
for p in libvdr-*.so.*; do
p_name="${p%.so*}"
p_name="${p_name#lib}"
p_list="${p_list} ${p_name}"
-
- insinto "${VDR_PLUGIN_DIR}"
- doins "$p"
done
create_header_checksum_file ${p_list}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-05-15 14:03 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-05-15 14:03 UTC (permalink / raw
To: gentoo-commits
zzam 08/05/15 14:03:16
Modified: vdr-plugin.eclass
Log:
More cleanups of VDRDIR handling. Added VDRINCDIR variable for more easy patching. Added large description for this. Pass TMPDIR and LIBDIR only via make parameters. Now install header-checksums for all installed plugins.
Revision Changes Path
1.60 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.59&r2=1.60
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- vdr-plugin.eclass 23 Apr 2008 13:56:20 -0000 1.59
+++ vdr-plugin.eclass 15 May 2008 14:03:15 -0000 1.60
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.59 2008/04/23 13:56:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.60 2008/05/15 14:03:15 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -99,6 +99,7 @@
echo "CREATOR=ECLASS"
echo "EBUILD=${CATEGORY}/${PN}"
echo "EBUILD_V=${PVR}"
+ echo "PLUGINS=\"$@\""
} > "${D}/${DB_FILE}"
}
@@ -132,19 +133,24 @@
# Danger: Not using $ROOT here, as compile will also not use it !!!
# If vdr in $ROOT and / differ, plugins will not run anyway
- insinto "${VDR_CHECKSUM_DIR}"
+ local CHKSUM="header-md5-vdr"
+
if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
- newins "${VDR_CHECKSUM_DIR}/header-md5-vdr header-md5-${PN}"
+ cp "${VDR_CHECKSUM_DIR}/header-md5-vdr" "${CHKSUM}"
+ elif type -p md5sum >/dev/null 2>&1; then
+ (
+ cd "${VDR_INCLUDE_DIR}"
+ md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
+ ) > "${CHKSUM}"
else
- if type -p md5sum >/dev/null 2>&1; then
- cd "${S}"
- (
- cd "${VDR_INCLUDE_DIR}"
- md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
- ) > header-md5-${PN}
- doins header-md5-${PN}
- fi
+ die "Could not create md5 checksum of headers"
fi
+
+ insinto "${VDR_CHECKSUM_DIR}"
+ local p_name
+ for p_name; do
+ newins "${CHKSUM}" "header-md5-${p_name}"
+ done
}
fix_vdr_libsi_include()
@@ -163,21 +169,35 @@
[[ -e Makefile ]] || die "Makefile of plugin can not be found!"
cp Makefile "${WORKDIR}"/Makefile.before
+ # plugin makefiles use VDRDIR in strange ways
+ # assumptions:
+ # 1. $(VDRDIR) contains Make.config
+ # 2. $(VDRDIR) contains config.h
+ # 3. $(VDRDIR)/include/vdr contains the headers
+ # 4. $(VDRDIR) contains main vdr Makefile
+ # 5. $(VDRDIR)/locale exists
+ # 6. $(VDRDIR) allows to access vdr source files
+ #
+ # We only have one directory (for now /usr/include/vdr),
+ # that contains vdr-headers and Make.config.
+ # To satisfy 1-3 we do this:
+ # Set VDRDIR=/usr/include/vdr
+ # Set VDRINCDIR=/usr/include
+ # Change $(VDRDIR)/include to $(VDRINCDIR)
+
ebegin " Setting Pathes"
sed -i Makefile \
-e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
- -e "s:^LIBDIR.*$:LIBDIR = ${S}:" \
- -e "s:^TMPDIR.*$:TMPDIR = ${T}:" \
- -e 's:-I$(VDRDIR)/include:-I'"${VDR_INCLUDE_DIR%vdr}"':' \
- -e "/^DVBDIR/d" \
+ -e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \
+ -e '/VDRINCDIR.*=/!s:$(VDRDIR)/include:$(VDRINCDIR):' \
+ \
-e 's:-I$(DVBDIR)/include::' \
-e 's:-I$(DVBDIR)::'
- eend $?
+ eend 0
# maybe needed for multiproto:
#sed -i Makefile \
# -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
- # -e 's:-I$(VDRDIR)/include -I$(DVBDIR)/include:-I$(DVBDIR)/include -I$(VDRDIR)/include:' \
# -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):'
if ! grep -q APIVERSION Makefile; then
@@ -342,10 +362,11 @@
VDR_INCLUDE_DIR="/usr/include/vdr"
DVB_INCLUDE_DIR="/usr/include"
-
TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
LOCDIR="/usr/share/vdr/locale"
+ TMP_LIBDIR="${WORKDIR}/tmp-libdir"
+
VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
@@ -411,9 +432,12 @@
fi
cd "${S}"
+ mkdir -p "${TMP_LIBDIR}"
emake ${BUILD_PARAMS} \
${VDRPLUGIN_MAKE_TARGET:-all} \
LOCALEDIR="${TMP_LOCALE_DIR}" \
+ LIBDIR="${TMP_LIBDIR}" \
+ TMPDIR="${T}" \
|| die "emake failed"
;;
esac
@@ -444,9 +468,21 @@
fi
- cd "${S}"
- insinto "${VDR_PLUGIN_DIR}"
- doins libvdr-*.so.*
+
+ local p_list="" p_name
+
+ cd "${TMP_LIBDIR}"
+ for p in libvdr-*.so.*; do
+ p_name="${p%.so*}"
+ p_name="${p_name#lib}"
+ p_list="${p_list} ${p_name}"
+
+ insinto "${VDR_PLUGIN_DIR}"
+ doins "$p"
+ done
+
+ create_header_checksum_file ${p_list}
+ create_plugindb_file ${p_list}
if vdr_has_gettext && [[ -d ${TMP_LOCALE_DIR} ]]; then
einfo "Installing locales"
@@ -476,9 +512,6 @@
insinto "${VDR_RC_DIR}"
newins "${VDR_RCADDON_FILE}" plugin-${VDRPLUGIN}.sh
fi
-
- create_header_checksum_file
- create_plugindb_file
}
vdr-plugin_pkg_postinst() {
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-04-23 13:56 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-04-23 13:56 UTC (permalink / raw
To: gentoo-commits
zzam 08/04/23 13:56:20
Modified: vdr-plugin.eclass
Log:
Remove maybe unset DVBDIR variable from list of includes.
Revision Changes Path
1.59 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.58&r2=1.59
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- vdr-plugin.eclass 22 Apr 2008 11:04:05 -0000 1.58
+++ vdr-plugin.eclass 23 Apr 2008 13:56:20 -0000 1.59
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.58 2008/04/22 11:04:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.59 2008/04/23 13:56:20 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -170,7 +170,8 @@
-e "s:^TMPDIR.*$:TMPDIR = ${T}:" \
-e 's:-I$(VDRDIR)/include:-I'"${VDR_INCLUDE_DIR%vdr}"':' \
-e "/^DVBDIR/d" \
- -e 's:-I$(DVBDIR)/include::'
+ -e 's:-I$(DVBDIR)/include::' \
+ -e 's:-I$(DVBDIR)::'
eend $?
# maybe needed for multiproto:
@@ -297,6 +298,7 @@
cp -r "${S}" "${T}"/source-tree
cd "${T}"/source-tree
cp "${WORKDIR}"/Makefile.before Makefile
+ # TODO: Fix this, maybe no longer needed
sed -i Makefile \
-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
-e 's:^CXXFLAGS:#CXXFLAGS:' \
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-04-22 11:04 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-04-22 11:04 UTC (permalink / raw
To: gentoo-commits
zzam 08/04/22 11:04:06
Modified: vdr-plugin.eclass
Log:
Change message about failed gettext conversion to eerror.
Revision Changes Path
1.58 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.57&r2=1.58
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- vdr-plugin.eclass 21 Apr 2008 02:56:34 -0000 1.57
+++ vdr-plugin.eclass 22 Apr 2008 11:04:05 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.57 2008/04/21 02:56:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.58 2008/04/22 11:04:05 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -279,9 +279,9 @@
else
vdr_i18n_convert_to_gettext
if [[ $? != 0 ]]; then
- ewarn ""
- ewarn "Plugin will have only english OSD texts"
- ewarn "it needs manual fixing."
+ eerror ""
+ eerror "Plugin will have only english OSD texts"
+ eerror "it needs manual fixing."
fi
fi
else
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-04-21 2:56 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-04-21 2:56 UTC (permalink / raw
To: gentoo-commits
zzam 08/04/21 02:56:34
Modified: vdr-plugin.eclass
Log:
Add back lost ebegin.
Revision Changes Path
1.57 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.56&r2=1.57
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- vdr-plugin.eclass 21 Apr 2008 02:45:45 -0000 1.56
+++ vdr-plugin.eclass 21 Apr 2008 02:56:34 -0000 1.57
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.56 2008/04/21 02:45:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.57 2008/04/21 02:56:34 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -264,6 +264,7 @@
}
vdr_i18n_disable_gettext() {
+ ebegin "Disabling gettext support in plugin"
# Remove i18n Target if using older vdr
sed -i Makefile \
-e '/^all:/s/ i18n//'
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-04-21 2:45 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-04-21 2:45 UTC (permalink / raw
To: gentoo-commits
zzam 08/04/21 02:45:45
Modified: vdr-plugin.eclass
Log:
Modularized i18n handling.
Revision Changes Path
1.56 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.55&r2=1.56
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- vdr-plugin.eclass 13 Apr 2008 16:26:05 -0000 1.55
+++ vdr-plugin.eclass 21 Apr 2008 02:45:45 -0000 1.56
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.55 2008/04/13 16:26:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.56 2008/04/21 02:45:45 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -215,42 +215,78 @@
fi
}
-vdr_i18n() {
- if [[ ${USE_GETTEXT} = 0 ]]; then
- # Remove i18n Target if using older vdr
- sed -i Makefile \
- -e '/^all:/s/ i18n//'
- elif [[ ${USE_GETTEXT} = 1 && ! -d po && ${NO_GETTEXT_HACK} != 1 ]]; then
- einfo "Plugin is not yet changed for new translation system."
- einfo "Auto converting translations to gettext"
-
- local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
- if [[ ! -x ${i18n_tool} ]]; then
- eerror "Missing ${i18n_tool}"
- eerror "Please re-emerge vdr"
- die "Missing ${i18n_tool}"
- fi
+vdr_has_gettext() {
+ has_version ">=media-video/vdr-1.5.7"
+}
- # call i18n-to-gettext tool
- # take all texts missing tr call into special file
- "${i18n_tool}" 2>/dev/null \
- |sed -e '/^"/!d' \
- -e '/^""$/d' \
- -e 's/\(.*\)/trNOOP(\1)/' \
- > dummy-translations-trNOOP.c
-
- # if there were untranslated texts just run it again
- # now the missing calls are listed in
- # dummy-translations-trNOOP.c
- if [[ -s dummy-translations-trNOOP.c ]]; then
- "${i18n_tool}" &>/dev/null
- fi
+plugin_has_gettext() {
+ [[ -d po ]]
+}
+
+vdr_i18n_convert_to_gettext() {
+ local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
+
+ if [[ ${NO_GETTEXT_HACK} == "1" ]]; then
+ ewarn "Conversion to gettext disabled in ebuild"
+ return 1
+ fi
+
+ if [[ ! -x ${i18n_tool} ]]; then
+ eerror "Missing ${i18n_tool}"
+ eerror "Please re-emerge vdr"
+ die "Missing ${i18n_tool}"
+ fi
+
+ ebegin "Auto converting translations to gettext"
+ # call i18n-to-gettext tool
+ # take all texts missing tr call into special file
+ "${i18n_tool}" 2>/dev/null \
+ |sed -e '/^"/!d' \
+ -e '/^""$/d' \
+ -e 's/\(.*\)/trNOOP(\1)/' \
+ > dummy-translations-trNOOP.c
+
+ # if there were untranslated texts just run it again
+ # now the missing calls are listed in
+ # dummy-translations-trNOOP.c
+ if [[ -s dummy-translations-trNOOP.c ]]; then
+ "${i18n_tool}" &>/dev/null
+ fi
- # now use the modified Makefile
- if [[ -f Makefile.new ]]; then
- mv Makefile.new Makefile
+ # now use the modified Makefile
+ if [[ -f Makefile.new ]]; then
+ mv Makefile.new Makefile
+ eend 0 ""
+ else
+ eend 1 "Conversion to gettext failed. Plugin needs fixing."
+ return 1
+ fi
+}
+
+vdr_i18n_disable_gettext() {
+ # Remove i18n Target if using older vdr
+ sed -i Makefile \
+ -e '/^all:/s/ i18n//'
+ eend 0
+}
+
+vdr_i18n() {
+ if vdr_has_gettext; then
+ einfo "VDR has gettext support"
+ if plugin_has_gettext; then
+ einfo "Plugin has gettext support, fine"
else
- ewarn "Conversion to gettext failed. Plugin needs fixing."
+ vdr_i18n_convert_to_gettext
+ if [[ $? != 0 ]]; then
+ ewarn ""
+ ewarn "Plugin will have only english OSD texts"
+ ewarn "it needs manual fixing."
+ fi
+ fi
+ else
+ einfo "VDR has no gettext support"
+ if plugin_has_gettext; then
+ vdr_i18n_disable_gettext
fi
fi
}
@@ -306,11 +342,6 @@
TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
LOCDIR="/usr/share/vdr/locale"
- if has_version ">=media-video/vdr-1.5.7"; then
- USE_GETTEXT=1
- else
- USE_GETTEXT=0
- fi
VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
@@ -414,7 +445,7 @@
insinto "${VDR_PLUGIN_DIR}"
doins libvdr-*.so.*
- if [[ ${USE_GETTEXT} = 1 && -d ${TMP_LOCALE_DIR} ]]; then
+ if vdr_has_gettext && [[ -d ${TMP_LOCALE_DIR} ]]; then
einfo "Installing locales"
cd "${TMP_LOCALE_DIR}"
insinto "${LOCDIR}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-04-13 16:26 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-04-13 16:26 UTC (permalink / raw
To: gentoo-commits
zzam 08/04/13 16:26:05
Modified: vdr-plugin.eclass
Log:
Cleanup of eclass. Try to minimize changes to Makefile.
Revision Changes Path
1.55 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.54&r2=1.55
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- vdr-plugin.eclass 22 Mar 2008 18:04:51 -0000 1.54
+++ vdr-plugin.eclass 13 Apr 2008 16:26:05 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.54 2008/03/22 18:04:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.55 2008/04/13 16:26:05 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -147,6 +147,146 @@
fi
}
+fix_vdr_libsi_include()
+{
+ einfo "Fixing include of libsi-headers"
+ local f
+ for f; do
+ sed -i "${f}" \
+ -e '/#include/s:"\(.*libsi.*\)":<\1>:' \
+ -e '/#include/s:<.*\(libsi/.*\)>:<vdr/\1>:'
+ done
+}
+
+vdr_patchmakefile() {
+ einfo "Patching Makefile"
+ [[ -e Makefile ]] || die "Makefile of plugin can not be found!"
+ cp Makefile "${WORKDIR}"/Makefile.before
+
+ ebegin " Setting Pathes"
+ sed -i Makefile \
+ -e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
+ -e "s:^LIBDIR.*$:LIBDIR = ${S}:" \
+ -e "s:^TMPDIR.*$:TMPDIR = ${T}:" \
+ -e 's:-I$(VDRDIR)/include:-I'"${VDR_INCLUDE_DIR%vdr}"':' \
+ -e "/^DVBDIR/d" \
+ -e 's:-I$(DVBDIR)/include::'
+ eend $?
+
+ # maybe needed for multiproto:
+ #sed -i Makefile \
+ # -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
+ # -e 's:-I$(VDRDIR)/include -I$(DVBDIR)/include:-I$(DVBDIR)/include -I$(VDRDIR)/include:' \
+ # -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):'
+
+ if ! grep -q APIVERSION Makefile; then
+ ebegin " Converting to APIVERSION"
+ sed -i Makefile \
+ -e 's:^APIVERSION = :APIVERSION ?= :' \
+ -e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \
+ -e '/VDRVERSION =/a\APIVERSION = $(shell sed -ne '"'"'/define APIVERSION/s/^.*"\\(.*\\)".*$$/\\1/p'"'"' $(VDRDIR)/config.h)'
+ eend $?
+ fi
+
+ # Correcting Compile-Flags
+ # Do not overwrite CXXFLAGS, add LDFLAGS if missing
+ sed -i Makefile \
+ -e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
+ -e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
+
+ # Disabling file stripping, useful for debugging
+ sed -i Makefile \
+ -e '/@.*strip/d' \
+ -e '/strip \$(LIBDIR)\/\$@/d' \
+ -e '/@.*\$(STRIP)/d'
+
+ # Use a file instead of a variable as single-stepping via ebuild
+ # destroys environment.
+ 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_i18n() {
+ if [[ ${USE_GETTEXT} = 0 ]]; then
+ # Remove i18n Target if using older vdr
+ sed -i Makefile \
+ -e '/^all:/s/ i18n//'
+ elif [[ ${USE_GETTEXT} = 1 && ! -d po && ${NO_GETTEXT_HACK} != 1 ]]; then
+ einfo "Plugin is not yet changed for new translation system."
+ einfo "Auto converting translations to gettext"
+
+ local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
+ if [[ ! -x ${i18n_tool} ]]; then
+ eerror "Missing ${i18n_tool}"
+ eerror "Please re-emerge vdr"
+ die "Missing ${i18n_tool}"
+ fi
+
+ # call i18n-to-gettext tool
+ # take all texts missing tr call into special file
+ "${i18n_tool}" 2>/dev/null \
+ |sed -e '/^"/!d' \
+ -e '/^""$/d' \
+ -e 's/\(.*\)/trNOOP(\1)/' \
+ > dummy-translations-trNOOP.c
+
+ # if there were untranslated texts just run it again
+ # now the missing calls are listed in
+ # dummy-translations-trNOOP.c
+ if [[ -s dummy-translations-trNOOP.c ]]; then
+ "${i18n_tool}" &>/dev/null
+ fi
+
+ # now use the modified Makefile
+ if [[ -f Makefile.new ]]; then
+ mv Makefile.new Makefile
+ else
+ ewarn "Conversion to gettext failed. Plugin needs fixing."
+ fi
+ fi
+}
+
+vdr-plugin_copy_source_tree() {
+ pushd . >/dev/null
+ cp -r "${S}" "${T}"/source-tree
+ cd "${T}"/source-tree
+ cp "${WORKDIR}"/Makefile.before Makefile
+ sed -i Makefile \
+ -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
+ -e 's:^CXXFLAGS:#CXXFLAGS:' \
+ -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
+ -e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
+ popd >/dev/null
+}
+
+vdr-plugin_install_source_tree() {
+ einfo "Installing sources"
+ destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
+ insinto "${destdir}-${PV}"
+ doins -r "${T}"/source-tree/*
+
+ dosym "${VDRPLUGIN}-${PV}" "${destdir}"
+}
+
+vdr-plugin_print_enable_command() {
+ elog
+ elog "To activate this vdr-plugin execute the following command:"
+ elog "\teselect vdr-plugin enable ${PN#vdr-}"
+ elog
+}
+
+
+## exported functions
+
vdr-plugin_pkg_setup() {
# -fPIC is needed for shared objects on some platforms (amd64 and others)
append-flags -fPIC
@@ -176,8 +316,8 @@
APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
- einfo "Building ${PF} against vdr-${VDRVERSION}"
- einfo "APIVERSION: ${APIVERSION}"
+ einfo "Compiling against"
+ einfo "\tvdr-${VDRVERSION} [API version ${APIVERSION}]"
}
vdr-plugin_src_unpack() {
@@ -199,136 +339,24 @@
unpack)
base_src_unpack
;;
- patchmakefile)
- if ! cd "${S}"; then
- ewarn "There seems to be no plugin-directory with the name ${S##*/}"
- ewarn "Perhaps you find one among these:"
- cd "${WORKDIR}"
- ewarn "$(/bin/ls -1 "${WORKDIR}")"
- die "Could not change to plugin-source-directory!"
- fi
-
- einfo "Patching Makefile"
- [[ -e Makefile ]] || die "Makefile of plugin can not be found!"
- cp Makefile "${WORKDIR}"/Makefile.before
-
- sed -i Makefile \
- -e '1i\#Makefile was patched by vdr-plugin.eclass'
-
- ebegin " Setting Pathes"
- sed -i Makefile \
- -e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
- -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
- -e "s:^LIBDIR.*$:LIBDIR = ${S}:" \
- -e "s:^TMPDIR.*$:TMPDIR = ${T}:" \
- -e 's:-I$(VDRDIR)/include -I$(DVBDIR)/include:-I$(DVBDIR)/include -I$(VDRDIR)/include:' \
- -e 's:-I$(VDRDIR)/include:-I'"${VDR_INCLUDE_DIR%vdr}"':' \
- -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):'
- eend $?
-
- ebegin " Converting to APIVERSION"
- sed -i Makefile \
- -e 's:^APIVERSION = :APIVERSION ?= :' \
- -e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \
- -e '2i\APIVERSION = '"${APIVERSION}"
- eend $?
-
- ebegin " Correcting Compile-Flags"
- # Do not overwrite CXXFLAGS, add LDFLAGS if missing
- sed -i Makefile \
- -e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
- -e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
- eend $?
-
- ebegin " Disabling file stripping"
- sed -i Makefile \
- -e '/@.*strip/d' \
- -e '/strip \$(LIBDIR)\/\$@/d' \
- -e '/^STRIP =/d' \
- -e '/@.*\$(STRIP)/d'
- eend $?
-
- # Use a file instead of an variable as single-stepping via ebuild
- # destroys environment.
- touch "${WORKDIR}"/.vdr-plugin_makefile_patched
- ;;
add_local_patch)
- cd "${S}"
- 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
+ cd "${S}" || die "Could not change to plugin-source-directory!"
+ vdr_add_local_patch
+ ;;
+ patchmakefile)
+ cd "${S}" || die "Could not change to plugin-source-directory!"
+ vdr_patchmakefile
;;
i18n)
- cd "${S}"
- if [[ ${USE_GETTEXT} = 0 ]]; then
- # Remove i18n Target if using older vdr
- sed -i Makefile \
- -e '/^all:/s/ i18n//'
- elif [[ ${USE_GETTEXT} = 1 && ! -d po && ${NO_GETTEXT_HACK} != 1 ]]; then
- einfo "Plugin is not yet changed for new translation system."
- einfo "Auto converting translations to gettext"
-
- local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
- if [[ ! -x ${i18n_tool} ]]; then
- eerror "Missing ${i18n_tool}"
- eerror "Please re-emerge vdr"
- die "Missing ${i18n_tool}"
- fi
-
- # call i18n-to-gettext tool
- # take all texts missing tr call into special file
- "${i18n_tool}" 2>/dev/null \
- |sed -e '/^"/!d' \
- -e '/^""$/d' \
- -e 's/\(.*\)/trNOOP(\1)/' \
- > dummy-translations-trNOOP.c
-
- # if there were untranslated texts just run it again
- # now the missing calls are listed in
- # dummy-translations-trNOOP.c
- if [[ -s dummy-translations-trNOOP.c ]]; then
- "${i18n_tool}" &>/dev/null
- fi
-
- # now use the modified Makefile
- if [[ -f Makefile.new ]]; then
- mv Makefile.new Makefile
- else
- ewarn "Conversion to gettext failed. Plugin needs fixing."
- fi
- fi
+ cd "${S}" || die "Could not change to plugin-source-directory!"
+ vdr_i18n
+ ;;
esac
shift
done
}
-vdr-plugin_copy_source_tree() {
- pushd . >/dev/null
- cp -r "${S}" "${T}"/source-tree
- cd "${T}"/source-tree
- cp "${WORKDIR}"/Makefile.before Makefile
- sed -i Makefile \
- -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
- -e 's:^CXXFLAGS:#CXXFLAGS:' \
- -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
- -e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
- popd >/dev/null
-}
-
-vdr-plugin_install_source_tree() {
- einfo "Installing sources"
- destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
- insinto "${destdir}-${PV}"
- doins -r "${T}"/source-tree/*
-
- dosym "${VDRPLUGIN}-${PV}" "${destdir}"
-}
-
vdr-plugin_src_compile() {
[ -z "$1" ] && vdr-plugin_src_compile prepare compile
@@ -419,13 +447,6 @@
create_plugindb_file
}
-vdr-plugin_print_enable_command() {
- elog
- elog "To activate this vdr-plugin execute the following command:"
- elog "\teselect vdr-plugin enable ${PN#vdr-}"
- elog
-}
-
vdr-plugin_pkg_postinst() {
vdr-plugin_print_enable_command
@@ -440,58 +461,9 @@
delete_orphan_plugindb_file
}
-vdr-plugin_pkg_config_legacy() {
- elog "Using old interface to gentoo-vdr-scripts-0.3.7"
- if [[ -z "${INSTALLPLUGIN}" ]]; then
- INSTALLPLUGIN="${VDRPLUGIN}"
- fi
-
- active=0
- # First test if plugin is already inside PLUGINS
- local conf=/etc/conf.d/vdr.plugins
- exec 3<${conf}
- while read -u 3 line; do
- [[ ${line} == "" ]] && continue
- [[ ${line:0:1} == "#" ]] && continue
- set -- ${line}
- [[ ${1} == ${INSTALLPLUGIN} ]] && active=1
- done
- exec 3<&-
-
- if [[ $active == 0 ]]; then
- elog "Adding ${INSTALLPLUGIN} to active plugins."
-
- # The pure edit process.
- echo "${INSTALLPLUGIN}" >> "${conf}"
- else
- elog "${INSTALLPLUGIN} already activated"
- echo
- read -p "Do you want to deactivate ${INSTALLPLUGIN} (yes/no) " answer
- if [[ "${answer}" != "yes" ]]; then
- elog "aborted"
- return
- fi
- elog "Removing ${INSTALLPLUGIN} from active plugins."
-
- # The pure edit process
- sed -i "${conf}" -e "/^[[:space:]]*${INSTALLPLUGIN}[[:space:]]*\$/d"
- fi
-}
-
vdr-plugin_pkg_config() {
ewarn "emerge --config ${PN} is no longer supported"
vdr-plugin_print_enable_command
}
-fix_vdr_libsi_include()
-{
- einfo "Fixing include of libsi-headers"
- local f
- for f; do
- sed -i "${f}" \
- -e '/#include/s:"\(.*libsi.*\)":<\1>:' \
- -e '/#include/s:<.*\(libsi/.*\)>:<vdr/\1>:'
- done
-}
-
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_postrm pkg_config
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-03-22 18:04 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-03-22 18:04 UTC (permalink / raw
To: gentoo-commits
zzam 08/03/22 18:04:51
Modified: vdr-plugin.eclass
Log:
Modified eclass to minimize Makefile changes regarding CXXFLAGS. No longer support emerge --config. Clean up i18n conversion messages.
Revision Changes Path
1.54 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.53&r2=1.54
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- vdr-plugin.eclass 13 Feb 2008 19:44:44 -0000 1.53
+++ vdr-plugin.eclass 22 Mar 2008 18:04:51 -0000 1.54
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.53 2008/02/13 19:44:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.54 2008/03/22 18:04:51 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -234,8 +234,9 @@
eend $?
ebegin " Correcting Compile-Flags"
+ # Do not overwrite CXXFLAGS, add LDFLAGS if missing
sed -i Makefile \
- -e 's:^CXXFLAGS:#CXXFLAGS:' \
+ -e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \
-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
eend $?
@@ -268,7 +269,8 @@
sed -i Makefile \
-e '/^all:/s/ i18n//'
elif [[ ${USE_GETTEXT} = 1 && ! -d po && ${NO_GETTEXT_HACK} != 1 ]]; then
- einfo "Converting translations to gettext"
+ einfo "Plugin is not yet changed for new translation system."
+ einfo "Auto converting translations to gettext"
local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
if [[ ! -x ${i18n_tool} ]]; then
@@ -293,7 +295,11 @@
fi
# now use the modified Makefile
- mv Makefile.new Makefile
+ if [[ -f Makefile.new ]]; then
+ mv Makefile.new Makefile
+ else
+ ewarn "Conversion to gettext failed. Plugin needs fixing."
+ fi
fi
esac
@@ -414,7 +420,6 @@
}
vdr-plugin_print_enable_command() {
- ewarn "emerge --config ${PN} is deprecated"
elog
elog "To activate this vdr-plugin execute the following command:"
elog "\teselect vdr-plugin enable ${PN#vdr-}"
@@ -474,10 +479,8 @@
}
vdr-plugin_pkg_config() {
+ ewarn "emerge --config ${PN} is no longer supported"
vdr-plugin_print_enable_command
-
- einfo "Calling this now"
- eselect vdr-plugin enable "${PN#vdr-}"
}
fix_vdr_libsi_include()
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2008-02-13 19:44 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-02-13 19:44 UTC (permalink / raw
To: gentoo-commits
zzam 08/02/13 19:44:45
Modified: vdr-plugin.eclass
Log:
Fixed quoting.
Revision Changes Path
1.53 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.52&r2=1.53
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- vdr-plugin.eclass 12 Dec 2007 17:43:50 -0000 1.52
+++ vdr-plugin.eclass 13 Feb 2008 19:44:44 -0000 1.53
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.52 2007/12/12 17:43:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.53 2008/02/13 19:44:44 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -249,7 +249,7 @@
# Use a file instead of an variable as single-stepping via ebuild
# destroys environment.
- touch ${WORKDIR}/.vdr-plugin_makefile_patched
+ touch "${WORKDIR}"/.vdr-plugin_makefile_patched
;;
add_local_patch)
cd "${S}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2007-12-12 17:43 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2007-12-12 17:43 UTC (permalink / raw
To: gentoo-commits
zzam 07/12/12 17:43:50
Modified: vdr-plugin.eclass
Log:
Changed code to not trigger portage read-only variable cleanup.
Revision Changes Path
1.52 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.51&r2=1.52
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- vdr-plugin.eclass 8 Oct 2007 14:58:14 -0000 1.51
+++ vdr-plugin.eclass 12 Dec 2007 17:43:50 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.51 2007/10/08 14:58:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.52 2007/12/12 17:43:50 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -86,12 +86,20 @@
local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
local DB_FILE="${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
insinto "${NEW_VDRPLUGINDB_DIR}"
- cat <<-EOT > "${D}/${DB_FILE}"
- VDRPLUGIN_DB=1
- CREATOR=ECLASS
- EBUILD=${CATEGORY}/${PN}
- EBUILD_V=${PVR}
- EOT
+
+# BUG: portage-2.1.4_rc9 will delete the EBUILD= line, so we cannot use this code.
+# cat <<-EOT > "${D}/${DB_FILE}"
+# VDRPLUGIN_DB=1
+# CREATOR=ECLASS
+# EBUILD=${CATEGORY}/${PN}
+# EBUILD_V=${PVR}
+# EOT
+ {
+ echo "VDRPLUGIN_DB=1"
+ echo "CREATOR=ECLASS"
+ echo "EBUILD=${CATEGORY}/${PN}"
+ echo "EBUILD_V=${PVR}"
+ } > "${D}/${DB_FILE}"
}
# Delete files created outside of vdr-plugin.eclass
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2007-10-08 14:58 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2007-10-08 14:58 UTC (permalink / raw
To: gentoo-commits
zzam 07/10/08 14:58:15
Modified: vdr-plugin.eclass
Log:
Depend on either gentoo-vdr-scripts-0.4.2 or vdrplugin-rebuild, as the latter will disappear soon.
Revision Changes Path
1.51 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.50&r2=1.51
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- vdr-plugin.eclass 5 Oct 2007 13:56:49 -0000 1.50
+++ vdr-plugin.eclass 8 Oct 2007 14:58:14 -0000 1.51
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.50 2007/10/05 13:56:49 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.51 2007/10/08 14:58:14 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -74,7 +74,7 @@
# depend on headers for DVB-driver
DEPEND=">=media-tv/gentoo-vdr-scripts-0.3.8
- >=media-tv/vdrplugin-rebuild-0.2
+ || ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=media-tv/vdrplugin-rebuild-0.2 )
>=app-admin/eselect-vdr-0.0.2
media-tv/linuxtv-dvb-headers"
@@ -98,7 +98,7 @@
# vdrplugin-rebuild.ebuild converted plugindb and files are
# not deleted by portage itself - should only be needed as
# long as not every system has switched over to
-# vdrplugin-rebuild-0.2
+# vdrplugin-rebuild-0.2 / gentoo-vdr-scripts-0.4.2
delete_orphan_plugindb_file() {
#elog Testing for orphaned plugindb file
local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
@ 2007-10-05 13:56 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 26+ messages in thread
From: Matthias Schwarzott (zzam) @ 2007-10-05 13:56 UTC (permalink / raw
To: gentoo-commits
zzam 07/10/05 13:56:49
Modified: vdr-plugin.eclass
Log:
General cleanup of eclass: No longer support older versions of vdrplugin-rebuild and gentoo-vdr-scripts. Now use eselect-vdr to enable plugins. Small quoting cleanup.
Revision Changes Path
1.50 eclass/vdr-plugin.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.49&r2=1.50
Index: vdr-plugin.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- vdr-plugin.eclass 16 Aug 2007 17:59:21 -0000 1.49
+++ vdr-plugin.eclass 5 Oct 2007 13:56:49 -0000 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.49 2007/08/16 17:59:21 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.50 2007/10/05 13:56:49 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -73,41 +73,20 @@
S="${WORKDIR}/${VDRPLUGIN}-${PV}"
# depend on headers for DVB-driver
-RDEPEND=">=media-tv/gentoo-vdr-scripts-0.3.4-r1"
-DEPEND="media-tv/linuxtv-dvb-headers"
+DEPEND=">=media-tv/gentoo-vdr-scripts-0.3.8
+ >=media-tv/vdrplugin-rebuild-0.2
+ >=app-admin/eselect-vdr-0.0.2
+ media-tv/linuxtv-dvb-headers"
-# this code is from linux-mod.eclass
-update_vdrplugindb() {
- local VDRPLUGINDB_DIR=${ROOT}/var/lib/vdrplugin-rebuild/
-
- if [[ ! -f ${VDRPLUGINDB_DIR}/vdrplugindb ]]; then
- [[ ! -d ${VDRPLUGINDB_DIR} ]] && mkdir -p ${VDRPLUGINDB_DIR}
- touch ${VDRPLUGINDB_DIR}/vdrplugindb
- fi
- if [[ -z $(grep ${CATEGORY}/${PN}-${PVR} ${VDRPLUGINDB_DIR}/vdrplugindb) ]]; then
- einfo "Adding plugin to vdrplugindb."
- echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${VDRPLUGINDB_DIR}/vdrplugindb
- fi
-}
-
-remove_vdrplugindb() {
- local VDRPLUGINDB_DIR=${ROOT}/var/lib/vdrplugin-rebuild/
-
- if [[ -n $(grep ${CATEGORY}/${PN}-${PVR} ${VDRPLUGINDB_DIR}/vdrplugindb) ]]; then
- einfo "Removing ${CATEGORY}/${PN}-${PVR} from vdrplugindb."
- sed -ie "/.*${CATEGORY}\/${P}.*/d" ${VDRPLUGINDB_DIR}/vdrplugindb
- fi
-}
-
# New method of storing plugindb
# Called from src_install
# file maintained by normal portage-methods
create_plugindb_file() {
local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
- local DB_FILE=${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}
- insinto ${NEW_VDRPLUGINDB_DIR}
- cat <<-EOT > ${D}/${DB_FILE}
+ local DB_FILE="${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
+ insinto "${NEW_VDRPLUGINDB_DIR}"
+ cat <<-EOT > "${D}/${DB_FILE}"
VDRPLUGIN_DB=1
CREATOR=ECLASS
EBUILD=${CATEGORY}/${PN}
@@ -123,20 +102,20 @@
delete_orphan_plugindb_file() {
#elog Testing for orphaned plugindb file
local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
- local DB_FILE=${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}
+ local DB_FILE="${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}"
# file exists
[[ -f ${DB_FILE} ]] || return
# will portage handle the file itself
- if grep -q CREATOR=ECLASS ${DB_FILE}; then
+ if grep -q CREATOR=ECLASS "${DB_FILE}"; then
#elog file owned by eclass - don't touch it
return
fi
elog "Removing orphaned plugindb-file."
elog "\t#rm ${DB_FILE}"
- rm ${DB_FILE}
+ rm "${DB_FILE}"
}
@@ -145,14 +124,14 @@
# Danger: Not using $ROOT here, as compile will also not use it !!!
# If vdr in $ROOT and / differ, plugins will not run anyway
- insinto ${VDR_CHECKSUM_DIR}
+ insinto "${VDR_CHECKSUM_DIR}"
if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
- newins ${VDR_CHECKSUM_DIR}/header-md5-vdr header-md5-${PN}
+ newins "${VDR_CHECKSUM_DIR}/header-md5-vdr header-md5-${PN}"
else
if type -p md5sum >/dev/null 2>&1; then
- cd ${S}
+ cd "${S}"
(
- cd ${VDR_INCLUDE_DIR}
+ cd "${VDR_INCLUDE_DIR}"
md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
) > header-md5-${PN}
doins header-md5-${PN}
@@ -185,8 +164,8 @@
USE_GETTEXT=0
fi
- VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/config.h)
- APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/config.h)
+ VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
+ APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h)
[[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
einfo "Building ${PF} against vdr-${VDRVERSION}"
@@ -213,11 +192,11 @@
base_src_unpack
;;
patchmakefile)
- if ! cd ${S}; then
+ if ! cd "${S}"; then
ewarn "There seems to be no plugin-directory with the name ${S##*/}"
ewarn "Perhaps you find one among these:"
cd "${WORKDIR}"
- ewarn "$(/bin/ls -1 ${WORKDIR})"
+ ewarn "$(/bin/ls -1 "${WORKDIR}")"
die "Could not change to plugin-source-directory!"
fi
@@ -265,17 +244,17 @@
touch ${WORKDIR}/.vdr-plugin_makefile_patched
;;
add_local_patch)
- cd ${S}
+ cd "${S}"
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
+ for LOCALPATCH in "${VDR_LOCAL_PATCHES_DIR}/${PN}/${PV}"/*.{diff,patch}; do
test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
done
fi
;;
i18n)
- cd ${S}
+ cd "${S}"
if [[ ${USE_GETTEXT} = 0 ]]; then
# Remove i18n Target if using older vdr
sed -i Makefile \
@@ -283,7 +262,7 @@
elif [[ ${USE_GETTEXT} = 1 && ! -d po && ${NO_GETTEXT_HACK} != 1 ]]; then
einfo "Converting translations to gettext"
- local i18n_tool=/usr/share/vdr/bin/i18n-to-gettext.pl
+ local i18n_tool="${ROOT}/usr/share/vdr/bin/i18n-to-gettext.pl"
if [[ ! -x ${i18n_tool} ]]; then
eerror "Missing ${i18n_tool}"
eerror "Please re-emerge vdr"
@@ -292,7 +271,7 @@
# call i18n-to-gettext tool
# take all texts missing tr call into special file
- ${i18n_tool} 2>/dev/null \
+ "${i18n_tool}" 2>/dev/null \
|sed -e '/^"/!d' \
-e '/^""$/d' \
-e 's/\(.*\)/trNOOP(\1)/' \
@@ -302,7 +281,7 @@
# now the missing calls are listed in
# dummy-translations-trNOOP.c
if [[ -s dummy-translations-trNOOP.c ]]; then
- ${i18n_tool} &>/dev/null
+ "${i18n_tool}" &>/dev/null
fi
# now use the modified Makefile
@@ -316,8 +295,8 @@
vdr-plugin_copy_source_tree() {
pushd . >/dev/null
- cp -r ${S} ${T}/source-tree
- cd ${T}/source-tree
+ cp -r "${S}" "${T}"/source-tree
+ cd "${T}"/source-tree
cp "${WORKDIR}"/Makefile.before Makefile
sed -i Makefile \
-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
@@ -329,11 +308,11 @@
vdr-plugin_install_source_tree() {
einfo "Installing sources"
- destdir=${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}
- insinto ${destdir}-${PV}
- doins -r ${T}/source-tree/*
+ destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}"
+ insinto "${destdir}-${PV}"
+ doins -r "${T}"/source-tree/*
- dosym ${VDRPLUGIN}-${PV} ${destdir}
+ dosym "${VDRPLUGIN}-${PV}" "${destdir}"
}
vdr-plugin_src_compile() {
@@ -354,7 +333,7 @@
eerror "Please report this at bugs.gentoo.org."
die "vdr-plugin_src_unpack not called!"
fi
- cd ${S}
+ cd "${S}"
emake ${BUILD_PARAMS} \
${VDRPLUGIN_MAKE_TARGET:-all} \
@@ -372,20 +351,20 @@
cd "${WORKDIR}"
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- local mname=${P}-Makefile
- cp "${S}"/Makefile ${mname}.patched
- cp Makefile.before ${mname}.before
+ local mname="${P}-Makefile"
+ cp "${S}"/Makefile "${mname}.patched"
+ cp Makefile.before "${mname}.before"
- diff -u ${mname}.before ${mname}.patched > ${mname}.diff
+ diff -u "${mname}.before" "${mname}.patched" > "${mname}.diff"
insinto "/usr/share/vdr/maintainer-data/makefile-changes"
- doins ${mname}.diff
+ doins "${mname}.diff"
insinto "/usr/share/vdr/maintainer-data/makefile-before"
- doins ${mname}.before
+ doins "${mname}.before"
insinto "/usr/share/vdr/maintainer-data/makefile-patched"
- doins ${mname}.patched
+ doins "${mname}.patched"
fi
@@ -426,99 +405,30 @@
create_plugindb_file
}
-vdr-plugin_pkg_postinst() {
- if has_version "<=media-tv/vdrplugin-rebuild-0.1"; then
- update_vdrplugindb
- fi
- elog
- elog "The vdr plugin ${VDRPLUGIN} has now been installed."
- elog "To activate execute the following command:"
+vdr-plugin_print_enable_command() {
+ ewarn "emerge --config ${PN} is deprecated"
elog
- elog " emerge --config ${PN}"
+ elog "To activate this vdr-plugin execute the following command:"
+ elog "\teselect vdr-plugin enable ${PN#vdr-}"
elog
+}
+
+vdr-plugin_pkg_postinst() {
+ vdr-plugin_print_enable_command
+
if [[ -n "${VDR_CONFD_FILE}" ]]; then
- elog "And have a look at the config-file"
- elog "/etc/conf.d/vdr.${VDRPLUGIN}"
+ elog "Please have a look at the config-file"
+ elog "\t/etc/conf.d/vdr.${VDRPLUGIN}"
elog
fi
}
vdr-plugin_pkg_postrm() {
- if has_version "<=media-tv/vdrplugin-rebuild-0.1"; then
- remove_vdrplugindb
- fi
delete_orphan_plugindb_file
}
-vdr-plugin_pkg_config_final() {
- diff ${conf_orig} ${conf}
- rm ${conf_orig}
-}
-
-vdr-plugin_pkg_config_old() {
- elog "Using interface of gentoo-vdr-scripts-0.3.6 and older"
- if [[ -z "${INSTALLPLUGIN}" ]]; then
- INSTALLPLUGIN="${VDRPLUGIN}"
- fi
- # First test if plugin is already inside PLUGINS
- local conf=/etc/conf.d/vdr
- conf_orig=${conf}.before_emerge_config
- cp ${conf} ${conf_orig}
-
- elog "Reading ${conf}"
- if ! grep -q "^PLUGINS=" ${conf}; then
- local LINE=$(sed ${conf} -n -e '/^#.*PLUGINS=/=' | tail -n 1)
- if [[ -n "${LINE}" ]]; then
- sed -e ${LINE}'a PLUGINS=""' -i ${conf}
- else
- echo 'PLUGINS=""' >> ${conf}
- fi
- unset LINE
- fi
-
- unset PLUGINS
- PLUGINS=$(source /etc/conf.d/vdr; echo ${PLUGINS})
-
- active=0
- for p in ${PLUGINS}; do
- if [[ "${p}" == "${INSTALLPLUGIN}" ]]; then
- active=1
- break;
- fi
- done
-
- if [[ "${active}" == "1" ]]; then
- elog "${INSTALLPLUGIN} already activated"
- echo
- read -p "Do you want to deactivate ${INSTALLPLUGIN} (yes/no) " answer
- if [[ "${answer}" != "yes" ]]; then
- elog "aborted"
- return
- fi
- elog "Removing ${INSTALLPLUGIN} from active plugins."
- local LINE=$(sed ${conf} -n -e '/^PLUGINS=.*\<'${INSTALLPLUGIN}'\>/=' | tail -n 1)
- sed -i ${conf} -e ${LINE}'s/\<'${INSTALLPLUGIN}'\>//' \
- -e ${LINE}'s/ \( \)*/ /g' \
- -e ${LINE}'s/ "/"/g' \
- -e ${LINE}'s/" /"/g'
-
- vdr-plugin_pkg_config_final
- return
- fi
-
-
- elog "Adding ${INSTALLPLUGIN} to active plugins."
- local LINE=$(sed ${conf} -n -e '/^PLUGINS=/=' | tail -n 1)
- sed -i ${conf} -e ${LINE}'s/^PLUGINS=" *\(.*\)"/PLUGINS="\1 '${INSTALLPLUGIN}'"/' \
- -e ${LINE}'s/ \( \)*/ /g' \
- -e ${LINE}'s/ "/"/g' \
- -e ${LINE}'s/" /"/g'
-
- vdr-plugin_pkg_config_final
-}
-
-vdr-plugin_pkg_config_new() {
- elog "Using interface introduced with gentoo-vdr-scripts-0.3.7"
+vdr-plugin_pkg_config_legacy() {
+ elog "Using old interface to gentoo-vdr-scripts-0.3.7"
if [[ -z "${INSTALLPLUGIN}" ]]; then
INSTALLPLUGIN="${VDRPLUGIN}"
fi
@@ -556,11 +466,10 @@
}
vdr-plugin_pkg_config() {
- if has_version ">media-tv/gentoo-vdr-scripts-0.3.6"; then
- vdr-plugin_pkg_config_new
- else
- vdr-plugin_pkg_config_old
- fi
+ vdr-plugin_print_enable_command
+
+ einfo "Calling this now"
+ eselect vdr-plugin enable "${PN#vdr-}"
}
fix_vdr_libsi_include()
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2011-12-31 1:02 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-24 16:43 [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass Matthias Schwarzott (zzam)
-- strict thread matches above, loose matches on Subject: below --
2011-12-31 1:01 Joerg Bornkessel (hd_brummy)
2011-10-24 19:54 Joerg Bornkessel (hd_brummy)
2011-03-13 19:06 Joerg Bornkessel (hd_brummy)
2011-01-28 17:07 Joerg Bornkessel (hd_brummy)
2009-10-11 11:49 Markus Meier (maekke)
2009-10-08 8:12 Matthias Schwarzott (zzam)
2009-03-24 21:10 Matthias Schwarzott (zzam)
2009-03-06 9:09 Matthias Schwarzott (zzam)
2009-02-24 0:26 Matthias Schwarzott (zzam)
2009-02-23 23:46 Matthias Schwarzott (zzam)
2008-07-03 11:18 Matthias Schwarzott (zzam)
2008-06-25 21:35 Matthias Schwarzott (zzam)
2008-06-02 5:15 Matthias Schwarzott (zzam)
2008-05-16 13:52 Matthias Schwarzott (zzam)
2008-05-15 14:03 Matthias Schwarzott (zzam)
2008-04-23 13:56 Matthias Schwarzott (zzam)
2008-04-22 11:04 Matthias Schwarzott (zzam)
2008-04-21 2:56 Matthias Schwarzott (zzam)
2008-04-21 2:45 Matthias Schwarzott (zzam)
2008-04-13 16:26 Matthias Schwarzott (zzam)
2008-03-22 18:04 Matthias Schwarzott (zzam)
2008-02-13 19:44 Matthias Schwarzott (zzam)
2007-12-12 17:43 Matthias Schwarzott (zzam)
2007-10-08 14:58 Matthias Schwarzott (zzam)
2007-10-05 13:56 Matthias Schwarzott (zzam)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox