1 |
hd_brummy 13/03/05 09:09:17 |
2 |
|
3 |
Modified: ChangeLog vdr-plugin-2.eclass |
4 |
Log: |
5 |
vdr-plugin-2.eclass, adapted to the new plugin makefile handling; cleanup for unusede function 'delete_orphan_plugindb_file'; more unneeded source cleanup |
6 |
|
7 |
Revision Changes Path |
8 |
1.714 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.714&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.714&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.713&r2=1.714 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.713 |
18 |
retrieving revision 1.714 |
19 |
diff -u -r1.713 -r1.714 |
20 |
--- ChangeLog 4 Mar 2013 19:31:01 -0000 1.713 |
21 |
+++ ChangeLog 5 Mar 2013 09:09:17 -0000 1.714 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.713 2013/03/04 19:31:01 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.714 2013/03/05 09:09:17 hd_brummy Exp $ |
27 |
+ |
28 |
+ 05 Mar 2013; Joerg Bornkessel <hd_brummy@g.o> vdr-plugin-2.eclass: |
29 |
+ vdr-plugin-2.eclass, adapted to the new plugin makefile handling; cleanup for |
30 |
+ unusede function 'delete_orphan_plugindb_file'; more unneeded source cleanup |
31 |
|
32 |
04 Mar 2013; Michał Górny <mgorny@g.o> multilib-build.eclass: |
33 |
Introduce multilib_for_best_impl(). |
34 |
|
35 |
|
36 |
|
37 |
1.22 eclass/vdr-plugin-2.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.22&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?rev=1.22&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vdr-plugin-2.eclass?r1=1.21&r2=1.22 |
42 |
|
43 |
Index: vdr-plugin-2.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v |
46 |
retrieving revision 1.21 |
47 |
retrieving revision 1.22 |
48 |
diff -u -r1.21 -r1.22 |
49 |
--- vdr-plugin-2.eclass 27 Jan 2013 13:32:44 -0000 1.21 |
50 |
+++ vdr-plugin-2.eclass 5 Mar 2013 09:09:17 -0000 1.22 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2013 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.21 2013/01/27 13:32:44 hd_brummy Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.22 2013/03/05 09:09:17 hd_brummy Exp $ |
56 |
|
57 |
# @ECLASS: vdr-plugin-2.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -104,31 +104,6 @@ |
60 |
} > "${D}/${DB_FILE}" |
61 |
} |
62 |
|
63 |
-# Delete files created outside of vdr-plugin-2.eclass |
64 |
-# vdrplugin-rebuild.ebuild converted plugindb and files are |
65 |
-# not deleted by portage itself - should only be needed as |
66 |
-# long as not every system has switched over to |
67 |
-# vdrplugin-rebuild-0.2 / gentoo-vdr-scripts-0.4.2 |
68 |
-delete_orphan_plugindb_file() { |
69 |
- #elog Testing for orphaned plugindb file |
70 |
- local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/ |
71 |
- local DB_FILE="${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}" |
72 |
- |
73 |
- # file exists |
74 |
- [[ -f ${DB_FILE} ]] || return |
75 |
- |
76 |
- # will portage handle the file itself |
77 |
- if grep -q CREATOR=ECLASS "${DB_FILE}"; then |
78 |
- #elog file owned by eclass - don't touch it |
79 |
- return |
80 |
- fi |
81 |
- |
82 |
- elog "Removing orphaned plugindb-file." |
83 |
- elog "\t#rm ${DB_FILE}" |
84 |
- rm "${DB_FILE}" |
85 |
-} |
86 |
- |
87 |
- |
88 |
create_header_checksum_file() { |
89 |
# Danger: Not using $ROOT here, as compile will also not use it !!! |
90 |
# If vdr in $ROOT and / differ, plugins will not run anyway |
91 |
@@ -212,12 +187,6 @@ |
92 |
-e '/^CXXFLAGS[[:space:]]*=/s/=/?=/' \ |
93 |
-e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:' |
94 |
|
95 |
- # Do not use {C,CXX}FLAGS from pkg-config vdr.pc, >=media-video/vdr-1.7.34 |
96 |
- # we do not have the chance to overwrite it with *.eclass |
97 |
- sed -e "/^export[[:space:]]*CFLAGS[[:space:]]*=/s/=/?=/" \ |
98 |
- -e "/^export[[:space:]]*CXXFLAGS[[:space:]]*=/s/=/?=/" \ |
99 |
- -i Makefile |
100 |
- |
101 |
# Disabling file stripping, the package manager takes care of it |
102 |
sed -i Makefile \ |
103 |
-e '/@.*strip/d' \ |
104 |
@@ -248,7 +217,7 @@ |
105 |
} |
106 |
|
107 |
detect_po_dir() { |
108 |
-# Some plugins have po/ in a subdir |
109 |
+# Some plugins have /po in a subdir |
110 |
# set PO_SUBDIR in .ebuild |
111 |
# i.e media-plugins/vdr-streamdev |
112 |
# PO_SUBDIR="client server" |
113 |
@@ -258,18 +227,12 @@ |
114 |
local f |
115 |
|
116 |
pofile_dir=( ${po_dir} ${po_subdir[*]} ) |
117 |
- |
118 |
- # maintainer check |
119 |
- if [[ ! -d ${pofile_dir[*]} ]]; then |
120 |
- dev_check "po dir not found? May be in subdir? \n" |
121 |
- fi |
122 |
} |
123 |
|
124 |
linguas_support() { |
125 |
# Patching Makefile for linguas support. |
126 |
# Only locales, enabled through the LINGUAS (make.conf) variable will be |
127 |
# "compiled" and installed. |
128 |
-# |
129 |
|
130 |
einfo "Patching for Linguas support" |
131 |
einfo "available Languages for ${P} are:" |
132 |
@@ -277,7 +240,6 @@ |
133 |
detect_po_dir |
134 |
|
135 |
for f in ${pofile_dir[*]}; do |
136 |
- |
137 |
PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) |
138 |
einfo "LINGUAS=\"${PLUGIN_LINGUAS}\"" |
139 |
|
140 |
@@ -342,31 +304,6 @@ |
141 |
} |
142 |
# end new vdr-plugin-2.eclass content |
143 |
|
144 |
-# ToDo: we don't support included plugins from vdr source for install in this way !!! |
145 |
-# obsolet, remove it, later... |
146 |
-#vdr-plugin-2_copy_source_tree() { |
147 |
-# pushd . >/dev/null |
148 |
-# cp -r "${S}" "${T}"/source-tree |
149 |
-# cd "${T}"/source-tree |
150 |
-# cp "${WORKDIR}"/Makefile.before Makefile |
151 |
-# # TODO: Fix this, maybe no longer needed |
152 |
-# sed -i Makefile \ |
153 |
-# -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \ |
154 |
-# -e 's:^CXXFLAGS:#CXXFLAGS:' \ |
155 |
-# -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \ |
156 |
-# -e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):' |
157 |
-# popd >/dev/null |
158 |
-#} |
159 |
- |
160 |
-#vdr-plugin-2_install_source_tree() { |
161 |
-# einfo "Installing sources" |
162 |
-# destdir="${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}" |
163 |
-# insinto "${destdir}-${PV}" |
164 |
-# doins -r "${T}"/source-tree/* |
165 |
-# |
166 |
-# dosym "${VDRPLUGIN}-${PV}" "${destdir}" |
167 |
-#} |
168 |
- |
169 |
vdr-plugin-2_print_enable_command() { |
170 |
local p_name c=0 l="" |
171 |
for p_name in ${vdr_plugin_list}; do |
172 |
@@ -524,14 +461,10 @@ |
173 |
} |
174 |
|
175 |
vdr-plugin-2_src_compile() { |
176 |
- [ -z "$1" ] && vdr-plugin-2_src_compile copy_source compile |
177 |
+ [ -z "$1" ] && vdr-plugin-2_src_compile compile |
178 |
|
179 |
while [ "$1" ]; do |
180 |
case "$1" in |
181 |
- copy_source) |
182 |
- [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_copy_source_tree |
183 |
- dev_check "ToDo: obsoleted handling, vdr-plugin-2_copy_source_tree" |
184 |
- ;; |
185 |
compile) |
186 |
if [[ ! -f ${WORKDIR}/.vdr-plugin_makefile_patched ]]; then |
187 |
eerror "Wrong use of vdr-plugin-2.eclass." |
188 |
@@ -567,8 +500,6 @@ |
189 |
die "vdr-plugin-2_src_install not called!" |
190 |
fi |
191 |
|
192 |
-# ToDo: obsolet, remove it, later... |
193 |
-# [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin-2_install_source_tree |
194 |
cd "${WORKDIR}" |
195 |
|
196 |
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then |
197 |
@@ -598,14 +529,12 @@ |
198 |
einstall ${BUILD_PARAMS} \ |
199 |
${BUILD_TARGETS} \ |
200 |
TMPDIR="${T}" \ |
201 |
- LOCDIR="${TMP_LOCALE_DIR}" \ |
202 |
- LIBDIR="${S}" \ |
203 |
DESTDIR="${D}" \ |
204 |
|| die "einstall (makefile target) failed" |
205 |
- fi |
206 |
- |
207 |
- insinto "${VDR_PLUGIN_DIR}" |
208 |
- doins libvdr-*.so.* |
209 |
+ else |
210 |
+ insinto "${VDR_PLUGIN_DIR}" |
211 |
+ doins libvdr-*.so.* |
212 |
+ fi |
213 |
|
214 |
if [[ -d ${TMP_LOCALE_DIR} ]]; then |
215 |
einfo "Installing locales" |
216 |
@@ -618,7 +547,7 @@ |
217 |
done |
218 |
fi |
219 |
|
220 |
- cd "${S}" |
221 |
+ cd "${D}/usr/$(get_libdir)/vdr/plugins" |
222 |
|
223 |
# create list of all created plugin libs |
224 |
vdr_plugin_list="" |
225 |
@@ -629,6 +558,8 @@ |
226 |
vdr_plugin_list="${vdr_plugin_list} ${p_name}" |
227 |
done |
228 |
|
229 |
+ cd "${S}" |
230 |
+ |
231 |
create_header_checksum_file ${vdr_plugin_list} |
232 |
create_plugindb_file ${vdr_plugin_list} |
233 |
|
234 |
@@ -664,7 +595,7 @@ |
235 |
} |
236 |
|
237 |
vdr-plugin-2_pkg_postrm() { |
238 |
- delete_orphan_plugindb_file |
239 |
+: |
240 |
} |
241 |
|
242 |
vdr-plugin-2_pkg_config() { |