1 |
commit: 6bdcdc31ed91e397ad8d8cca4ffac2b4b4619e3a |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 4 11:50:19 2017 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 4 12:05:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bdcdc31 |
7 |
|
8 |
sys-devel/heirloom-devtools: Fix gcc6 support, bug #594090 by Peter Levine, also adapt to eapi6 and not show elog messages always. |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
...1.ebuild => heirloom-devtools-070527-r2.ebuild} | 34 ++++++++++++---------- |
13 |
.../heirloom-devtools-999999.ebuild | 23 ++++++++------- |
14 |
2 files changed, 32 insertions(+), 25 deletions(-) |
15 |
|
16 |
diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild |
17 |
similarity index 65% |
18 |
rename from sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild |
19 |
rename to sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild |
20 |
index 6b417392c6b..53ff1997977 100644 |
21 |
--- a/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild |
22 |
+++ b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild |
23 |
@@ -1,9 +1,8 @@ |
24 |
-# Copyright 1999-2013 Gentoo Foundation |
25 |
+# Copyright 1999-2017 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
-EAPI=4 |
29 |
- |
30 |
-inherit eutils flag-o-matic toolchain-funcs |
31 |
+EAPI=6 |
32 |
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs |
33 |
|
34 |
DESCRIPTION="Original UNIX development tools" |
35 |
HOMEPAGE="http://heirloom.sourceforge.net/devtools.html" |
36 |
@@ -17,8 +16,21 @@ IUSE="" |
37 |
DEPEND="app-shells/heirloom-sh" |
38 |
RDEPEND="${DEPEND}" |
39 |
|
40 |
-src_prepare() { |
41 |
+PATCHES=( |
42 |
+ "${FILESDIR}/${P}-solaris.patch" |
43 |
+ "${FILESDIR}/${P}-64-bit.patch" |
44 |
+ "${FILESDIR}/${P}-gcc6.patch" |
45 |
+) |
46 |
|
47 |
+DOC_CONTENTS=" |
48 |
+ You may want to add /usr/5bin or /usr/ucb to \$PATH |
49 |
+ to enable using the apps of heirloom toolchest by default. |
50 |
+ Man pages are installed in /usr/share/man/5man/ |
51 |
+ You may need to set \$MANPATH to access them. |
52 |
+" |
53 |
+ |
54 |
+src_prepare() { |
55 |
+ default |
56 |
sed -i \ |
57 |
-e 's:^\(SHELL =\) \(.*\):\1 /bin/jsh:' \ |
58 |
-e 's:^\(POSIX_SHELL =\) \(.*\):\1 /bin/sh:' \ |
59 |
@@ -32,12 +44,6 @@ src_prepare() { |
60 |
./mk.config |
61 |
|
62 |
echo "CC=$(tc-getCC)" >> "./mk.config" |
63 |
- |
64 |
- epatch "${FILESDIR}/${P}-solaris.patch" |
65 |
- epatch "${FILESDIR}/${P}-64-bit.patch" |
66 |
- |
67 |
- epatch_user |
68 |
- |
69 |
} |
70 |
|
71 |
src_compile() { |
72 |
@@ -46,11 +52,9 @@ src_compile() { |
73 |
|
74 |
src_install() { |
75 |
emake ROOT="${D}" install |
76 |
+ readme.gentoo_create_doc |
77 |
} |
78 |
|
79 |
pkg_postinst() { |
80 |
- elog "You may want to add /usr/5bin or /usr/ucb to \$PATH" |
81 |
- elog "to enable using the apps of heirloom toolchest by default." |
82 |
- elog "Man pages are installed in /usr/share/man/5man/" |
83 |
- elog "You may need to set \$MANPATH to access them." |
84 |
+ readme.gentoo_print_elog |
85 |
} |
86 |
|
87 |
diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild |
88 |
index 1299aaabeff..1d97661d245 100644 |
89 |
--- a/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild |
90 |
+++ b/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild |
91 |
@@ -1,9 +1,8 @@ |
92 |
-# Copyright 1999-2013 Gentoo Foundation |
93 |
+# Copyright 1999-2017 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
|
96 |
-EAPI=4 |
97 |
- |
98 |
-inherit cvs flag-o-matic toolchain-funcs |
99 |
+EAPI=6 |
100 |
+inherit cvs flag-o-matic readme.gentoo-r1 toolchain-funcs |
101 |
|
102 |
ECVS_AUTH="pserver" |
103 |
ECVS_USER="anonymous" |
104 |
@@ -24,10 +23,17 @@ IUSE="" |
105 |
DEPEND="app-shells/heirloom-sh" |
106 |
RDEPEND="${DEPEND}" |
107 |
|
108 |
+DOC_CONTENTS=" |
109 |
+ You may want to add /usr/5bin or /usr/ucb to \$PATH |
110 |
+ to enable using the apps of heirloom toolchest by default. |
111 |
+ Man pages are installed in /usr/share/man/5man/ |
112 |
+ You may need to set \$MANPATH to access them. |
113 |
+" |
114 |
+ |
115 |
S="${WORKDIR}/${PN}" |
116 |
|
117 |
src_prepare() { |
118 |
- |
119 |
+ default |
120 |
sed -i \ |
121 |
-e 's:^\(SHELL =\) \(.*\):\1 /bin/jsh:' \ |
122 |
-e 's:^\(POSIX_SHELL =\) \(.*\):\1 /bin/sh:' \ |
123 |
@@ -41,7 +47,6 @@ src_prepare() { |
124 |
./mk.config |
125 |
|
126 |
echo "CC=$(tc-getCC)" >> "./mk.config" |
127 |
- |
128 |
} |
129 |
|
130 |
src_compile() { |
131 |
@@ -50,11 +55,9 @@ src_compile() { |
132 |
|
133 |
src_install() { |
134 |
emake ROOT="${D}" install |
135 |
+ readme.gentoo_create_doc |
136 |
} |
137 |
|
138 |
pkg_postinst() { |
139 |
- elog "You may want to add /usr/5bin or /usr/ucb to \$PATH" |
140 |
- elog "to enable using the apps of heirloom toolchest by default." |
141 |
- elog "Man pages are installed in /usr/share/man/5man/" |
142 |
- elog "You may need to set \$MANPATH to access them." |
143 |
+ readme.gentoo_print_elog |
144 |
} |