1 |
commit: 80cc0bc12678d0f8bb2271989f222e8fad97d852 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 17 22:04:28 2023 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 17 22:04:28 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cc0bc1 |
7 |
|
8 |
vdr-plugin-2.eclass: remove EAPI 5 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
eclass/vdr-plugin-2.eclass | 69 +++++++++++++++++----------------------------- |
13 |
1 file changed, 26 insertions(+), 43 deletions(-) |
14 |
|
15 |
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass |
16 |
index 546dbb803bf1..a56b1d41c882 100644 |
17 |
--- a/eclass/vdr-plugin-2.eclass |
18 |
+++ b/eclass/vdr-plugin-2.eclass |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2022 Gentoo Authors |
21 |
+# Copyright 1999-2023 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
# @ECLASS: vdr-plugin-2.eclass |
25 |
@@ -9,7 +9,7 @@ |
26 |
# Joerg Bornkessel <hd_brummy@g.o> |
27 |
# Christian Ruppert <idl0r@g.o> |
28 |
# (undisclosed contributors) |
29 |
-# @SUPPORTED_EAPIS: 5 6 7 8 |
30 |
+# @SUPPORTED_EAPIS: 6 7 8 |
31 |
# @BLURB: common vdr plugin ebuild functions |
32 |
# @DESCRIPTION: |
33 |
# Eclass for easing maintenance of vdr plugin ebuilds |
34 |
@@ -60,29 +60,16 @@ |
35 |
# PO_SUBDIR="bla foo/bla" |
36 |
# @CODE |
37 |
|
38 |
-# Applying your own local/user patches: |
39 |
-# This is done by using the |
40 |
-# (EAPI = 5) epatch_user() function of the eutils.eclass, |
41 |
-# (EAPI = 6,7) eapply_user function integrated in EAPI = 6. |
42 |
-# Simply add your patches into one of these directories: |
43 |
-# /etc/portage/patches/<CATEGORY>/<PF|P|PN>/ |
44 |
-# Quote: where the first of these three directories to exist will be the one to |
45 |
-# use, ignoring any more general directories which might exist as well. |
46 |
-# |
47 |
-# For more details about it please take a look at the eutils.class. |
48 |
- |
49 |
-[[ ${EAPI} == [5] ]] && inherit multilib |
50 |
-[[ ${EAPI} == [56] ]] && inherit eutils |
51 |
-inherit flag-o-matic strip-linguas toolchain-funcs unpacker |
52 |
- |
53 |
case ${EAPI} in |
54 |
- 5|6|7|8) |
55 |
- ;; |
56 |
- *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" |
57 |
- ;; |
58 |
+ 6|7|8) ;; |
59 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
60 |
esac |
61 |
|
62 |
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config |
63 |
+if [[ -z ${_VDR_PLUGIN_2_ECLASS} ]]; then |
64 |
+_VDR_PLUGIN_2_ECLASS=1 |
65 |
+ |
66 |
+[[ ${EAPI} == 6 ]] && inherit eutils |
67 |
+inherit flag-o-matic strip-linguas toolchain-funcs unpacker |
68 |
|
69 |
# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes |
70 |
VDRPLUGIN="${PN/#vdrplugin-/}" |
71 |
@@ -96,12 +83,16 @@ S="${WORKDIR}/${VDRPLUGIN}-${PV}" |
72 |
|
73 |
# depend on headers for DVB-driver and vdr-scripts |
74 |
case ${EAPI} in |
75 |
- 5|6) DEPEND="media-tv/gentoo-vdr-scripts |
76 |
- virtual/linuxtv-dvb-headers |
77 |
- virtual/pkgconfig" ;; |
78 |
- *) BDEPEND="virtual/pkgconfig" |
79 |
- DEPEND="media-tv/gentoo-vdr-scripts |
80 |
- virtual/linuxtv-dvb-headers" ;; |
81 |
+ 6) |
82 |
+ DEPEND="media-tv/gentoo-vdr-scripts |
83 |
+ virtual/linuxtv-dvb-headers |
84 |
+ virtual/pkgconfig" |
85 |
+ ;; |
86 |
+ *) |
87 |
+ BDEPEND="virtual/pkgconfig" |
88 |
+ DEPEND="media-tv/gentoo-vdr-scripts |
89 |
+ virtual/linuxtv-dvb-headers" |
90 |
+ ;; |
91 |
esac |
92 |
RDEPEND="media-tv/gentoo-vdr-scripts |
93 |
app-eselect/eselect-vdr" |
94 |
@@ -467,11 +458,7 @@ vdr-plugin-2_src_util() { |
95 |
;; |
96 |
add_local_patch) |
97 |
cd "${S}" || die "Could not change to plugin-source-directory (src_util)" |
98 |
- if [[ ${EAPI} != [5] ]]; then |
99 |
- eapply_user |
100 |
- else |
101 |
- epatch_user |
102 |
- fi |
103 |
+ eapply_user |
104 |
;; |
105 |
patchmakefile) |
106 |
cd "${S}" || die "Could not change to plugin-source-directory (src_util)" |
107 |
@@ -514,8 +501,7 @@ vdr-plugin-2_src_prepare() { |
108 |
die "vdr-plugin-2_src_prepare not called!" |
109 |
fi |
110 |
|
111 |
- [[ ${EAPI} == [5] ]] && [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" |
112 |
- [[ ${EAPI} != [5] ]] && [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" |
113 |
+ [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" |
114 |
|
115 |
debug-print "$FUNCNAME: applying user patches" |
116 |
|
117 |
@@ -626,14 +612,7 @@ vdr-plugin-2_src_install() { |
118 |
vdr_create_header_checksum_file ${vdr_plugin_list} |
119 |
vdr_create_plugindb_file ${vdr_plugin_list} |
120 |
|
121 |
- if [[ ${EAPI} != [45] ]]; then |
122 |
- einstalldocs |
123 |
- else |
124 |
- local docfile |
125 |
- for docfile in README* HISTORY CHANGELOG; do |
126 |
- [[ -f ${docfile} ]] && dodoc ${docfile} |
127 |
- done |
128 |
- fi |
129 |
+ einstalldocs |
130 |
|
131 |
# if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it |
132 |
[[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd |
133 |
@@ -668,3 +647,7 @@ vdr-plugin-2_pkg_postrm() { |
134 |
vdr-plugin-2_pkg_config() { |
135 |
: |
136 |
} |
137 |
+ |
138 |
+fi |
139 |
+ |
140 |
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config |