| 1 |
commit: 2eed6d0c8a9ac7cfd384f5670caf428457ee333b |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Mar 3 04:47:08 2020 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Mar 3 04:47:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2eed6d0c |
| 7 |
|
| 8 |
app-text/noweb: style changes, || die, DOCS array |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.91, Repoman-2.3.20 |
| 11 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 12 |
|
| 13 |
app-text/noweb/noweb-2.12.ebuild | 43 +++++++++++++++++++++++++++------------- |
| 14 |
1 file changed, 29 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-text/noweb/noweb-2.12.ebuild b/app-text/noweb/noweb-2.12.ebuild |
| 17 |
index 53246f6..4194164 100644 |
| 18 |
--- a/app-text/noweb/noweb-2.12.ebuild |
| 19 |
+++ b/app-text/noweb/noweb-2.12.ebuild |
| 20 |
@@ -28,6 +28,8 @@ DEPEND=" |
| 21 |
" |
| 22 |
RDEPEND="${DEPEND}" |
| 23 |
|
| 24 |
+DOCS=( CHANGES README ) |
| 25 |
+ |
| 26 |
S="${WORKDIR}/${PN}-${MYPV}" |
| 27 |
|
| 28 |
SITEFILE="50${PN}-gentoo.el" |
| 29 |
@@ -40,19 +42,19 @@ src_prepare() { |
| 30 |
# diff -u d/ c/ |
| 31 |
|
| 32 |
# dont run texhash... |
| 33 |
- sed -i -e "s/texhash/true/" src/Makefile |
| 34 |
+ sed -i -e "s/texhash/true/" src/Makefile || die |
| 35 |
# dont strip... |
| 36 |
- sed -i -e "s/strip/true/" src/Makefile |
| 37 |
+ sed -i -e "s/strip/true/" src/Makefile || die |
| 38 |
|
| 39 |
- sed -i -e "s/CC=gcc -ansi -pedantic -O -Wall -Werror//" src/Makefile |
| 40 |
- sed -i -e "s/CFLAGS=//" src/Makefile |
| 41 |
- sed -i -e "s/CC=gcc -ansi -pedantic -O -Wall -Werror//" src/c/Makefile |
| 42 |
- sed -i -e "s/CFLAGS=//" src/c/Makefile |
| 43 |
+ sed -i -e "s/CC=gcc -ansi -pedantic -O -Wall -Werror//" src/Makefile || die |
| 44 |
+ sed -i -e "s/CFLAGS=//" src/Makefile || die |
| 45 |
+ sed -i -e "s/CC=gcc -ansi -pedantic -O -Wall -Werror//" src/c/Makefile || die |
| 46 |
+ sed -i -e "s/CFLAGS=//" src/c/Makefile || die |
| 47 |
|
| 48 |
eapply "${FILESDIR}/${P}-recmake.patch" |
| 49 |
|
| 50 |
- sed -i -e "s/CC = cc//" contrib/norman/numarkup/Makefile |
| 51 |
- sed -i -e "s/CFLAGS = -O//" contrib/norman/numarkup/Makefile |
| 52 |
+ sed -i -e "s/CC = cc//" contrib/norman/numarkup/Makefile || die |
| 53 |
+ sed -i -e "s/CFLAGS = -O//" contrib/norman/numarkup/Makefile || die |
| 54 |
|
| 55 |
eapply "${FILESDIR}/${P}-ldflags.patch" |
| 56 |
eapply_user |
| 57 |
@@ -61,13 +63,27 @@ src_prepare() { |
| 58 |
src_compile() { |
| 59 |
# noweb tries to use notangle and noweb; see bug #50429 |
| 60 |
cd "${S}/src/c" |
| 61 |
- ( emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" ) || die |
| 62 |
+ |
| 63 |
+ emake ICONC="icont" \ |
| 64 |
+ CC="$(tc-getCC)" \ |
| 65 |
+ CFLAGS="${CFLAGS}" \ |
| 66 |
+ LIBSRC="icon" || die |
| 67 |
+ |
| 68 |
export PATH="${PATH}:${T}" |
| 69 |
cd "${S}/src" |
| 70 |
- ( emake ICONC="icont" CC="$(tc-getCC)" BIN="${T}" LIB="${T}" LIBSRC="icon" install-code ) \ |
| 71 |
- || die "make temporal install failed." |
| 72 |
|
| 73 |
- ( emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" ) || die "make failed" |
| 74 |
+ emake ICONC="icont" \ |
| 75 |
+ CC="$(tc-getCC)" \ |
| 76 |
+ BIN="${T}" \ |
| 77 |
+ LIB="${T}" \ |
| 78 |
+ LIBSRC="icon" \ |
| 79 |
+ install-code || die "make temporal install failed." |
| 80 |
+ |
| 81 |
+ emake ICONC="icont" \ |
| 82 |
+ CC="$(tc-getCC)" \ |
| 83 |
+ CFLAGS="${CFLAGS}" \ |
| 84 |
+ LIBSRC="icon" || die "make failed" |
| 85 |
+ |
| 86 |
# Set awk to awk not nawk |
| 87 |
./awkname awk |
| 88 |
|
| 89 |
@@ -84,6 +100,7 @@ src_install () { |
| 90 |
dodir "/usr/libexec/${PN}" |
| 91 |
dodir /usr/share/man |
| 92 |
dodir /usr/share/texmf-site/tex/inputs |
| 93 |
+ |
| 94 |
emake ICONC="icont" \ |
| 95 |
BIN="${ED}/usr/bin" \ |
| 96 |
LIBSRC="icon" \ |
| 97 |
@@ -101,8 +118,6 @@ src_install () { |
| 98 |
doins -r examples/. |
| 99 |
fi |
| 100 |
|
| 101 |
- dodoc CHANGES README |
| 102 |
- |
| 103 |
if use emacs; then |
| 104 |
elisp-install "${PN}" "${S}"/src/elisp/noweb-mode.{el,elc} \ |
| 105 |
|| die "elisp-install failed" |
Archives