Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: vdr-plugin.eclass
Date: Thu, 08 Oct 2009 08:12:57
Message-Id: E1Mvo7H-0004nM-2k@stork.gentoo.org
1 zzam 09/10/08 08:12:51
2
3 Modified: vdr-plugin.eclass
4 Log:
5 Improve disable file stripping. Be less verbose. Update example ebuild code.
6
7 Revision Changes Path
8 1.70 eclass/vdr-plugin.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.70&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?rev=1.70&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vdr-plugin.eclass?r1=1.69&r2=1.70
13
14 Index: vdr-plugin.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v
17 retrieving revision 1.69
18 retrieving revision 1.70
19 diff -u -r1.69 -r1.70
20 --- vdr-plugin.eclass 24 Mar 2009 21:10:13 -0000 1.69
21 +++ vdr-plugin.eclass 8 Oct 2009 08:12:50 -0000 1.70
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2005 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.69 2009/03/24 21:10:13 zzam Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.70 2009/10/08 08:12:50 zzam Exp $
27 #
28 # Author:
29 # Matthias Schwarzott <zzam@g.o>
30 @@ -11,8 +11,9 @@
31 # eclass to create ebuilds for vdr plugins
32 #
33
34 -# Example ebuild (vdr-femon):
35 +# Example ebuild (basic version without patching):
36 #
37 +# EAPI="2"
38 # inherit vdr-plugin
39 # IUSE=""
40 # SLOT="0"
41 @@ -21,10 +22,17 @@
42 # SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${P}.tgz"
43 # LICENSE="GPL-2"
44 # KEYWORDS="~x86"
45 -# DEPEND=">=media-video/vdr-1.3.27"
46 +# DEPEND=">=media-video/vdr-1.6.0"
47 #
48 #
49
50 +# For patching you should modify src_prepare phase:
51 +#
52 +# src_prepare() {
53 +# epatch "${FILESDIR}"/${P}-xxx.patch
54 +# vdr-plugin_src_prepare
55 +# }
56 +
57 # Installation of a config file for the plugin
58 #
59 # If ${VDR_CONFD_FILE} is set install this file
60 @@ -165,7 +173,7 @@
61
62 fix_vdr_libsi_include()
63 {
64 - einfo "Fixing include of libsi-headers"
65 + #einfo "Fixing include of libsi-headers"
66 local f
67 for f; do
68 sed -i "${f}" \
69 @@ -195,7 +203,6 @@
70 # Set VDRINCDIR=/usr/include
71 # Change $(VDRDIR)/include to $(VDRINCDIR)
72
73 - ebegin " Setting paths"
74 sed -i Makefile \
75 -e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
76 -e "/^VDRDIR/a VDRINCDIR = ${VDR_INCLUDE_DIR%/vdr}" \
77 @@ -203,7 +210,6 @@
78 \
79 -e 's:-I$(DVBDIR)/include::' \
80 -e 's:-I$(DVBDIR)::'
81 - eend 0
82
83 # maybe needed for multiproto:
84 #sed -i Makefile \
85 @@ -229,7 +235,7 @@
86 sed -i Makefile \
87 -e '/@.*strip/d' \
88 -e '/strip \$(LIBDIR)\/\$@/d' \
89 - -e '/@.*\$(STRIP)/d'
90 + -e 's/STRIP.*=.*$/STRIP = true/'
91
92 # Use a file instead of a variable as single-stepping via ebuild
93 # destroys environment.
94 @@ -295,20 +301,20 @@
95 }
96
97 vdr_i18n_disable_gettext() {
98 - ebegin "Disabling gettext support in plugin"
99 + #einfo "Disabling gettext support in plugin"
100 +
101 # Remove i18n Target if using older vdr
102 sed -i Makefile \
103 -e '/^all:/s/ i18n//'
104 - eend 0
105 }
106
107 vdr_i18n() {
108 if vdr_has_gettext; then
109 - einfo "VDR has gettext support"
110 + #einfo "VDR has gettext support"
111 if plugin_has_gettext; then
112 - einfo "Plugin has gettext support, fine"
113 + #einfo "Plugin has gettext support, fine"
114 if [[ ${NO_GETTEXT_HACK} == "1" ]]; then
115 - ewarn "Please remove left over NO_GETTEXT_HACK."
116 + ewarn "Please remove unneeded NO_GETTEXT_HACK from ebuild."
117 fi
118 else
119 vdr_i18n_convert_to_gettext
120 @@ -319,7 +325,7 @@
121 fi
122 fi
123 else
124 - einfo "VDR has no gettext support"
125 + #einfo "VDR has no gettext support"
126 if plugin_has_gettext; then
127 vdr_i18n_disable_gettext
128 fi