| 1 |
commit: c97dda893c1008f8cea766b64526d357eb5963c8 |
| 2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 23 16:13:46 2020 +0000 |
| 4 |
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 23 16:13:46 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97dda89 |
| 7 |
|
| 8 |
eclass/vdr-plugin-2.eclass: EAPI=4 support removed |
| 9 |
|
| 10 |
removed eapi=4 support |
| 11 |
removed unneeded vdr vdr versions test |
| 12 |
|
| 13 |
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/vdr-plugin-2.eclass | 21 +++++++++------------ |
| 16 |
1 file changed, 9 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass |
| 19 |
index 67ccb1e6ab1..ebd1e39e5af 100644 |
| 20 |
--- a/eclass/vdr-plugin-2.eclass |
| 21 |
+++ b/eclass/vdr-plugin-2.eclass |
| 22 |
@@ -9,7 +9,7 @@ |
| 23 |
# Joerg Bornkessel <hd_brummy@g.o> |
| 24 |
# Christian Ruppert <idl0r@g.o> |
| 25 |
# (undisclosed contributors) |
| 26 |
-# @SUPPORTED_EAPIS: 4 5 6 7 |
| 27 |
+# @SUPPORTED_EAPIS: 5 6 7 |
| 28 |
# @BLURB: common vdr plugin ebuild functions |
| 29 |
# @DESCRIPTION: |
| 30 |
# Eclass for easing maintenance of vdr plugin ebuilds |
| 31 |
@@ -78,7 +78,7 @@ |
| 32 |
|
| 33 |
# Applying your own local/user patches: |
| 34 |
# This is done by using the |
| 35 |
-# (EAPI = 4,5) epatch_user() function of the eutils.eclass, |
| 36 |
+# (EAPI = 5) epatch_user() function of the eutils.eclass, |
| 37 |
# (EAPI = 6,7) eapply_user function integrated in EAPI = 6. |
| 38 |
# Simply add your patches into one of these directories: |
| 39 |
# /etc/portage/patches/<CATEGORY>/<PF|P|PN>/ |
| 40 |
@@ -87,12 +87,12 @@ |
| 41 |
# |
| 42 |
# For more details about it please take a look at the eutils.class. |
| 43 |
|
| 44 |
-[[ ${EAPI} == [45] ]] && inherit multilib |
| 45 |
-[[ ${EAPI} == [456] ]] && inherit eutils |
| 46 |
+[[ ${EAPI} == [5] ]] && inherit multilib |
| 47 |
+[[ ${EAPI} == [56] ]] && inherit eutils |
| 48 |
inherit flag-o-matic toolchain-funcs unpacker |
| 49 |
|
| 50 |
case ${EAPI:-0} in |
| 51 |
- 4|5|6|7) |
| 52 |
+ 5|6|7) |
| 53 |
;; |
| 54 |
*) die "EAPI ${EAPI} unsupported." |
| 55 |
;; |
| 56 |
@@ -355,10 +355,7 @@ vdr-plugin-2_pkg_setup() { |
| 57 |
|
| 58 |
# Plugins need to be compiled with position independent code, otherwise linking |
| 59 |
# VDR against it will fail |
| 60 |
- # depricated if fi, as we have only >=vdr-2 in the tree, fix me later... |
| 61 |
- if has_version ">=media-video/vdr-1.7.13"; then |
| 62 |
- append-cxxflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |
| 63 |
- fi |
| 64 |
+ append-cxxflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |
| 65 |
|
| 66 |
# Where should the plugins live in the filesystem |
| 67 |
VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr) |
| 68 |
@@ -418,7 +415,7 @@ vdr-plugin-2_src_util() { |
| 69 |
;; |
| 70 |
add_local_patch) |
| 71 |
cd "${S}" || die "Could not change to plugin-source-directory (src_util)" |
| 72 |
- if [[ ${EAPI} != [45] ]]; then |
| 73 |
+ if [[ ${EAPI} != [5] ]]; then |
| 74 |
eapply_user |
| 75 |
else |
| 76 |
epatch_user |
| 77 |
@@ -465,8 +462,8 @@ vdr-plugin-2_src_prepare() { |
| 78 |
die "vdr-plugin-2_src_prepare not called!" |
| 79 |
fi |
| 80 |
|
| 81 |
- [[ ${EAPI} == [45] ]] && [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" |
| 82 |
- [[ ${EAPI} != [45] ]] && [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" |
| 83 |
+ [[ ${EAPI} == [5] ]] && [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" |
| 84 |
+ [[ ${EAPI} != [5] ]] && [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" |
| 85 |
|
| 86 |
debug-print "$FUNCNAME: applying user patches" |
Archives