From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/heirloom-devtools/
Date: Tue, 4 Apr 2017 12:05:19 +0000 (UTC) [thread overview]
Message-ID: <1491307507.6bdcdc31ed91e397ad8d8cca4ffac2b4b4619e3a.pacho@gentoo> (raw)
commit: 6bdcdc31ed91e397ad8d8cca4ffac2b4b4619e3a
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 4 11:50:19 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> 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
}
next reply other threads:[~2017-04-04 12:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-04 12:05 Pacho Ramos [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-17 9:24 [gentoo-commits] repo/gentoo:master commit in: sys-devel/heirloom-devtools/ Pacho Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491307507.6bdcdc31ed91e397ad8d8cca4ffac2b4b4619e3a.pacho@gentoo \
--to=pacho@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox