Gentoo Archives: gentoo-dev

From: Joerg Bornkessel <hd_brummy@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [RFC] vdr-plugin-2.eclass, EAPI 4 removal
Date: Sat, 22 Feb 2020 16:38:08
Message-Id: 5ad4520c-029f-784f-bafc-d23674051901@gentoo.org
1 Nothing spezial, yust drop the EAPI=4 Support
2 No packages in media-plugins/vdr-* in the maintree and vdr-devel overlay
3 depend on this anymore.
4 + small cleanup
5
6 <snipp>
7 --- vdr-plugin-2.eclass.orig 2020-02-15 13:50:22.364761113 +0100
8 +++ vdr-plugin-2.eclass 2020-02-15 13:57:25.458761113 +0100
9 @@ -78,7 +78,7 @@
10
11 # Applying your own local/user patches:
12 # This is done by using the
13 -# (EAPI = 4,5) epatch_user() function of the eutils.eclass,
14 +# (EAPI = 5) epatch_user() function of the eutils.eclass,
15 # (EAPI = 6,7) eapply_user function integrated in EAPI = 6.
16 # Simply add your patches into one of these directories:
17 # /etc/portage/patches/<CATEGORY>/<PF|P|PN>/
18 @@ -87,12 +87,12 @@
19 #
20 # For more details about it please take a look at the eutils.class.
21
22 -[[ ${EAPI} == [45] ]] && inherit multilib
23 -[[ ${EAPI} == [456] ]] && inherit eutils
24 +[[ ${EAPI} == [5] ]] && inherit multilib
25 +[[ ${EAPI} == [56] ]] && inherit eutils
26 inherit flag-o-matic toolchain-funcs unpacker
27
28 case ${EAPI:-0} in
29 - 4|5|6|7)
30 + 5|6|7)
31 ;;
32 *) die "EAPI ${EAPI} unsupported."
33 ;;
34 @@ -355,10 +355,7 @@
35
36 # Plugins need to be compiled with position independent code,
37 otherwise linking
38 # VDR against it will fail
39 - # depricated if fi, as we have only >=vdr-2 in the tree, fix me later...
40 - if has_version ">=media-video/vdr-1.7.13"; then
41 - append-cxxflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
42 -D_LARGEFILE64_SOURCE
43 - fi
44 + append-cxxflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
45 -D_LARGEFILE64_SOURCE
46
47 # Where should the plugins live in the filesystem
48 VDR_PLUGIN_DIR=$(pkg-config --variable=libdir vdr)
49 @@ -418,7 +415,7 @@
50 ;;
51 add_local_patch)
52 cd "${S}" || die "Could not change to
53 plugin-source-directory (src_util)"
54 - if [[ ${EAPI} != [45] ]]; then
55 + if [[ ${EAPI} != [5] ]]; then
56 eapply_user
57 else
58 epatch_user
59 @@ -465,8 +462,8 @@
60 die "vdr-plugin-2_src_prepare not called!"
61 fi
62
63 - [[ ${EAPI} == [45] ]] && [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
64 - [[ ${EAPI} != [45] ]] && [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
65 + [[ ${EAPI} == [5] ]] && [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
66 + [[ ${EAPI} != [5] ]] && [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
67
68 debug-print "$FUNCNAME: applying user patches"
69
70 </snapp>
71 --
72 Joerg Bornkessel <hd_brummy@g.o>
73 GnuPG Key: 0x93EB5F4DAA5832A1
74 Fingerprint: 0E0A A1EE 1DF4 41D7 A3F5 21C2 93EB 5F4D AA58 32A1

Attachments

File name MIME type
signature.asc application/pgp-signature