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 051F1139085 for ; Thu, 5 Jan 2017 06:50:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F33EE0DA6; Thu, 5 Jan 2017 06:50:08 +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 08BC4E0D91 for ; Thu, 5 Jan 2017 06:50:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E733341229 for ; Thu, 5 Jan 2017 06:50:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD2CE261E for ; Thu, 5 Jan 2017 06:50:01 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1483598997.c124f951eb937f27d87363fd1e1f9b980c17812e.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/amiwm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/amiwm/amiwm-0.21_p2.ebuild X-VCS-Directories: x11-wm/amiwm/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c124f951eb937f27d87363fd1e1f9b980c17812e X-VCS-Branch: master Date: Thu, 5 Jan 2017 06:50:01 +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: 498ca708-31d1-4480-a128-e3e8f062903e X-Archives-Hash: c7f087dc6076012f836b6ca89e8224dd commit: c124f951eb937f27d87363fd1e1f9b980c17812e Author: Lars Wendler gentoo org> AuthorDate: Thu Jan 5 06:49:41 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jan 5 06:49:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c124f951 x11-wm/amiwm: Bumped to EAPI-6 Removed stripping from Makefile.in Fixed bad symlink in Makefile.in Package-Manager: Portage-2.3.3, Repoman-2.3.1 x11-wm/amiwm/amiwm-0.21_p2.ebuild | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/x11-wm/amiwm/amiwm-0.21_p2.ebuild b/x11-wm/amiwm/amiwm-0.21_p2.ebuild index 462fed4..a875e17 100644 --- a/x11-wm/amiwm/amiwm-0.21_p2.ebuild +++ b/x11-wm/amiwm/amiwm-0.21_p2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 inherit eutils multilib toolchain-funcs @@ -29,18 +29,24 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto x11-proto/xextproto" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${P}-gentoo.diff" + "${FILESDIR}/${P}-implicts.patch" + "${FILESDIR}/${P}-flex-2.6.3-fix.patch" +) pkg_setup() { tc-export CC } src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.diff \ - "${FILESDIR}"/${P}-implicts.patch \ - "${FILESDIR}"/${P}-flex-2.6.3-fix.patch - sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \ - Makefile.in || die + default + sed -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \ + -e '/^STRIPFLAG/s@-s@@' \ + -e '/$(LN_S)/s@$(DESTDIR)$(AMIWM_HOME)@../..$(AMIWM_HOME)@' \ + -i Makefile.in || die sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die cat <<- EOF > "${T}"/amiwm @@ -50,9 +56,8 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die - - dodoc README* + local DOCS=( README* ) + default exeinto /etc/X11/Sessions doexe "${T}"/amiwm