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 63ABD139696 for ; Tue, 4 Apr 2017 12:05:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78BEFE0D0E; Tue, 4 Apr 2017 12:05:23 +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 47A26E0D0E for ; Tue, 4 Apr 2017 12:05:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6DB2933BF43 for ; Tue, 4 Apr 2017 12:05:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54ADD73F1 for ; Tue, 4 Apr 2017 12:05:19 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1491307507.6bdcdc31ed91e397ad8d8cca4ffac2b4b4619e3a.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/heirloom-devtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild X-VCS-Directories: sys-devel/heirloom-devtools/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 6bdcdc31ed91e397ad8d8cca4ffac2b4b4619e3a X-VCS-Branch: master Date: Tue, 4 Apr 2017 12:05:19 +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: bb2d4bde-885d-4e1c-8b4c-545d3e540482 X-Archives-Hash: 02e63545280bc0493b5921cbff39b309 commit: 6bdcdc31ed91e397ad8d8cca4ffac2b4b4619e3a Author: Pacho Ramos gentoo org> AuthorDate: Tue Apr 4 11:50:19 2017 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Tue Apr 4 12:05:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bdcdc31 sys-devel/heirloom-devtools: Fix gcc6 support, bug #594090 by Peter Levine, also adapt to eapi6 and not show elog messages always. Package-Manager: Portage-2.3.5, Repoman-2.3.2 ...1.ebuild => heirloom-devtools-070527-r2.ebuild} | 34 ++++++++++++---------- .../heirloom-devtools-999999.ebuild | 23 ++++++++------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild similarity index 65% rename from sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild rename to sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild index 6b417392c6b..53ff1997977 100644 --- a/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild +++ b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit eutils flag-o-matic toolchain-funcs +EAPI=6 +inherit flag-o-matic readme.gentoo-r1 toolchain-funcs DESCRIPTION="Original UNIX development tools" HOMEPAGE="http://heirloom.sourceforge.net/devtools.html" @@ -17,8 +16,21 @@ IUSE="" DEPEND="app-shells/heirloom-sh" RDEPEND="${DEPEND}" -src_prepare() { +PATCHES=( + "${FILESDIR}/${P}-solaris.patch" + "${FILESDIR}/${P}-64-bit.patch" + "${FILESDIR}/${P}-gcc6.patch" +) +DOC_CONTENTS=" + You may want to add /usr/5bin or /usr/ucb to \$PATH + to enable using the apps of heirloom toolchest by default. + Man pages are installed in /usr/share/man/5man/ + You may need to set \$MANPATH to access them. +" + +src_prepare() { + default sed -i \ -e 's:^\(SHELL =\) \(.*\):\1 /bin/jsh:' \ -e 's:^\(POSIX_SHELL =\) \(.*\):\1 /bin/sh:' \ @@ -32,12 +44,6 @@ src_prepare() { ./mk.config echo "CC=$(tc-getCC)" >> "./mk.config" - - epatch "${FILESDIR}/${P}-solaris.patch" - epatch "${FILESDIR}/${P}-64-bit.patch" - - epatch_user - } src_compile() { @@ -46,11 +52,9 @@ src_compile() { src_install() { emake ROOT="${D}" install + readme.gentoo_create_doc } pkg_postinst() { - elog "You may want to add /usr/5bin or /usr/ucb to \$PATH" - elog "to enable using the apps of heirloom toolchest by default." - elog "Man pages are installed in /usr/share/man/5man/" - elog "You may need to set \$MANPATH to access them." + readme.gentoo_print_elog } diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild index 1299aaabeff..1d97661d245 100644 --- a/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild +++ b/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit cvs flag-o-matic toolchain-funcs +EAPI=6 +inherit cvs flag-o-matic readme.gentoo-r1 toolchain-funcs ECVS_AUTH="pserver" ECVS_USER="anonymous" @@ -24,10 +23,17 @@ IUSE="" DEPEND="app-shells/heirloom-sh" RDEPEND="${DEPEND}" +DOC_CONTENTS=" + You may want to add /usr/5bin or /usr/ucb to \$PATH + to enable using the apps of heirloom toolchest by default. + Man pages are installed in /usr/share/man/5man/ + You may need to set \$MANPATH to access them. +" + S="${WORKDIR}/${PN}" src_prepare() { - + default sed -i \ -e 's:^\(SHELL =\) \(.*\):\1 /bin/jsh:' \ -e 's:^\(POSIX_SHELL =\) \(.*\):\1 /bin/sh:' \ @@ -41,7 +47,6 @@ src_prepare() { ./mk.config echo "CC=$(tc-getCC)" >> "./mk.config" - } src_compile() { @@ -50,11 +55,9 @@ src_compile() { src_install() { emake ROOT="${D}" install + readme.gentoo_create_doc } pkg_postinst() { - elog "You may want to add /usr/5bin or /usr/ucb to \$PATH" - elog "to enable using the apps of heirloom toolchest by default." - elog "Man pages are installed in /usr/share/man/5man/" - elog "You may need to set \$MANPATH to access them." + readme.gentoo_print_elog }