From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6D4D139694 for ; Mon, 10 Apr 2017 01:01:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06D1EE0DDB; Mon, 10 Apr 2017 01:01:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF8F5E0DDB for ; Mon, 10 Apr 2017 01:01:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CBC3341586 for ; Mon, 10 Apr 2017 01:01:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7873973F3 for ; Mon, 10 Apr 2017 01:01:40 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1491786075.bd72168fbd11f8bd055b92a75aa9e73f14eb5b7a.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/wayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/wayland/wayland-9999.ebuild X-VCS-Directories: dev-libs/wayland/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: bd72168fbd11f8bd055b92a75aa9e73f14eb5b7a X-VCS-Branch: master Date: Mon, 10 Apr 2017 01:01:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 78470309-2c56-4a39-b467-f5a76a2553c8 X-Archives-Hash: b28773084d53f56ccdaffb51ca03a712 commit: bd72168fbd11f8bd055b92a75aa9e73f14eb5b7a Author: Mart Raudsepp gentoo org> AuthorDate: Sun Apr 9 23:27:41 2017 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Apr 10 01:01:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd72168f dev-libs/wayland-9999: Port to EAPI-6 Also try to address socket path 108 byte limit restriction caused test failures by cutting down the XDG_RUNTIME_DIR subdir length. Wayland tests used to create a wayland-tests/ subdir under it, but since before 1.13.0 it creates a wayland-tests-RANDOM/ subdir (RANDOM is 6 random characters), which makes tests fail on socket path length even with PORTAGE_TMPDIR=/tmp, let alone /var/tmp. I think shortening the subdir from "runtime-dir" to "xdr" makes it fit in both cases, unless we are dealing with a 1.xx.y-r1 revision, in which case /var/tmp might fail. dev-libs/wayland/wayland-9999.ebuild | 44 +++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild index cb4da40703c..2863cc6657e 100644 --- a/dev-libs/wayland/wayland-9999.ebuild +++ b/dev-libs/wayland/wayland-9999.ebuild @@ -1,23 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}" GIT_ECLASS="git-r3" - EXPERIMENTAL="true" - AUTOTOOLS_AUTORECONF=1 fi -inherit autotools-multilib toolchain-funcs $GIT_ECLASS +inherit autotools libtool ltprune multilib-minimal toolchain-funcs $GIT_ECLASS DESCRIPTION="Wayland protocol libraries" HOMEPAGE="https://wayland.freedesktop.org/" if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" - KEYWORDS="" + SRC_URI="" else SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" @@ -39,22 +37,36 @@ DEPEND="${RDEPEND} ) virtual/pkgconfig" +src_prepare() { + default + [[ $PV = 9999* ]] && eautoreconf || elibtoolize +} + multilib_src_configure() { - local myeconfargs=( - $(multilib_native_use_enable doc documentation) - $(multilib_native_enable dtd-validation) - ) + local myconf if tc-is-cross-compiler ; then - myeconfargs+=( --with-host-scanner ) + myconf+=' --with-host-scanner ' fi - autotools-utils_src_configure + ECONF_SOURCE="${S}" econf \ + --disable-static \ + $(multilib_native_use_enable doc documentation) \ + $(multilib_native_enable dtd-validation) \ + ${myconf} +} + +multilib_src_install_all() { + prune_libtool_files + einstalldocs } src_test() { - export XDG_RUNTIME_DIR="${T}/runtime-dir" + # We set it on purpose to only a short subdir name, as socket paths are + # created in there, which are 108 byte limited. With this it hopefully + # barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr + export XDG_RUNTIME_DIR="${T}"/xdr mkdir "${XDG_RUNTIME_DIR}" || die chmod 0700 "${XDG_RUNTIME_DIR}" || die - autotools-multilib_src_test + multilib-minimal_src_test }