1 |
commit: bd72168fbd11f8bd055b92a75aa9e73f14eb5b7a |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 9 23:27:41 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 10 01:01:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd72168f |
7 |
|
8 |
dev-libs/wayland-9999: Port to EAPI-6 |
9 |
|
10 |
Also try to address socket path 108 byte limit restriction caused test |
11 |
failures by cutting down the XDG_RUNTIME_DIR subdir length. |
12 |
Wayland tests used to create a wayland-tests/ subdir under it, but since |
13 |
before 1.13.0 it creates a wayland-tests-RANDOM/ subdir (RANDOM is 6 |
14 |
random characters), which makes tests fail on socket path length even with |
15 |
PORTAGE_TMPDIR=/tmp, let alone /var/tmp. |
16 |
I think shortening the subdir from "runtime-dir" to "xdr" makes it fit |
17 |
in both cases, unless we are dealing with a 1.xx.y-r1 revision, in which |
18 |
case /var/tmp might fail. |
19 |
|
20 |
dev-libs/wayland/wayland-9999.ebuild | 44 +++++++++++++++++++++++------------- |
21 |
1 file changed, 28 insertions(+), 16 deletions(-) |
22 |
|
23 |
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild |
24 |
index cb4da40703c..2863cc6657e 100644 |
25 |
--- a/dev-libs/wayland/wayland-9999.ebuild |
26 |
+++ b/dev-libs/wayland/wayland-9999.ebuild |
27 |
@@ -1,23 +1,21 @@ |
28 |
-# Copyright 1999-2016 Gentoo Foundation |
29 |
+# Copyright 1999-2017 Gentoo Foundation |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
|
32 |
-EAPI=5 |
33 |
+EAPI=6 |
34 |
+ |
35 |
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" |
36 |
|
37 |
if [[ ${PV} = 9999* ]]; then |
38 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}" |
39 |
GIT_ECLASS="git-r3" |
40 |
- EXPERIMENTAL="true" |
41 |
- AUTOTOOLS_AUTORECONF=1 |
42 |
fi |
43 |
|
44 |
-inherit autotools-multilib toolchain-funcs $GIT_ECLASS |
45 |
+inherit autotools libtool ltprune multilib-minimal toolchain-funcs $GIT_ECLASS |
46 |
|
47 |
DESCRIPTION="Wayland protocol libraries" |
48 |
HOMEPAGE="https://wayland.freedesktop.org/" |
49 |
|
50 |
if [[ $PV = 9999* ]]; then |
51 |
- SRC_URI="${SRC_PATCHES}" |
52 |
- KEYWORDS="" |
53 |
+ SRC_URI="" |
54 |
else |
55 |
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" |
56 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
57 |
@@ -39,22 +37,36 @@ DEPEND="${RDEPEND} |
58 |
) |
59 |
virtual/pkgconfig" |
60 |
|
61 |
+src_prepare() { |
62 |
+ default |
63 |
+ [[ $PV = 9999* ]] && eautoreconf || elibtoolize |
64 |
+} |
65 |
+ |
66 |
multilib_src_configure() { |
67 |
- local myeconfargs=( |
68 |
- $(multilib_native_use_enable doc documentation) |
69 |
- $(multilib_native_enable dtd-validation) |
70 |
- ) |
71 |
+ local myconf |
72 |
if tc-is-cross-compiler ; then |
73 |
- myeconfargs+=( --with-host-scanner ) |
74 |
+ myconf+=' --with-host-scanner ' |
75 |
fi |
76 |
|
77 |
- autotools-utils_src_configure |
78 |
+ ECONF_SOURCE="${S}" econf \ |
79 |
+ --disable-static \ |
80 |
+ $(multilib_native_use_enable doc documentation) \ |
81 |
+ $(multilib_native_enable dtd-validation) \ |
82 |
+ ${myconf} |
83 |
+} |
84 |
+ |
85 |
+multilib_src_install_all() { |
86 |
+ prune_libtool_files |
87 |
+ einstalldocs |
88 |
} |
89 |
|
90 |
src_test() { |
91 |
- export XDG_RUNTIME_DIR="${T}/runtime-dir" |
92 |
+ # We set it on purpose to only a short subdir name, as socket paths are |
93 |
+ # created in there, which are 108 byte limited. With this it hopefully |
94 |
+ # barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr |
95 |
+ export XDG_RUNTIME_DIR="${T}"/xdr |
96 |
mkdir "${XDG_RUNTIME_DIR}" || die |
97 |
chmod 0700 "${XDG_RUNTIME_DIR}" || die |
98 |
|
99 |
- autotools-multilib_src_test |
100 |
+ multilib-minimal_src_test |
101 |
} |