| 1 |
commit: 3b027f1548261c8296c0964529204b66f8577494 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 20 11:41:52 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 20 11:42:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b027f15 |
| 7 |
|
| 8 |
net-dialup/mgetty: Drop USE=doc, fix parallel make |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
Fixes: https://bugs.gentoo.org/299421 |
| 12 |
|
| 13 |
net-dialup/mgetty/mgetty-1.2.1.ebuild | 37 +++++++++++++---------------------- |
| 14 |
1 file changed, 14 insertions(+), 23 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-dialup/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild |
| 17 |
index a62a5460aee..722dd95e2c0 100644 |
| 18 |
--- a/net-dialup/mgetty/mgetty-1.2.1.ebuild |
| 19 |
+++ b/net-dialup/mgetty/mgetty-1.2.1.ebuild |
| 20 |
@@ -9,7 +9,6 @@ HOMEPAGE="http://mgetty.greenie.net/" |
| 21 |
SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.2/${P}.tar.gz" |
| 22 |
|
| 23 |
DEPEND=" |
| 24 |
- doc? ( virtual/latex-base virtual/texi2dvi ) |
| 25 |
>=sys-apps/sed-4 |
| 26 |
sys-apps/groff |
| 27 |
dev-lang/perl |
| 28 |
@@ -27,7 +26,7 @@ RDEPEND="${DEPEND} |
| 29 |
SLOT="0" |
| 30 |
LICENSE="GPL-2" |
| 31 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
| 32 |
-IUSE="doc +fax fidonet" |
| 33 |
+IUSE="+fax fidonet" |
| 34 |
|
| 35 |
pkg_setup() { |
| 36 |
enewgroup fax |
| 37 |
@@ -55,12 +54,6 @@ src_prepare() { |
| 38 |
|
| 39 |
sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \ |
| 40 |
-i doc/Makefile || die 'first sed on doc/Makefile failed' |
| 41 |
- if use doc; then |
| 42 |
- sed -i \ |
| 43 |
- -e "s/^doc-all:/doc-all: mgetty.ps/" \ |
| 44 |
- -e "s/^all:/all: doc-all/" \ |
| 45 |
- doc/Makefile || die 'second sed on doc/Makefile failed' |
| 46 |
- fi |
| 47 |
|
| 48 |
sed -i \ |
| 49 |
-e 's:^CC=:CC?=:g' \ |
| 50 |
@@ -75,6 +68,8 @@ src_prepare() { |
| 51 |
|
| 52 |
src_configure() { |
| 53 |
tc-export AR CC RANLIB |
| 54 |
+ use fidonet && append-cppflags "-DFIDO" |
| 55 |
+ append-cppflags "-DAUTO_PPP" |
| 56 |
|
| 57 |
sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \ |
| 58 |
-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \ |
| 59 |
@@ -89,21 +84,21 @@ src_configure() { |
| 60 |
} |
| 61 |
|
| 62 |
src_compile() { |
| 63 |
- use fidonet && append-cppflags "-DFIDO" |
| 64 |
- append-cppflags "-DAUTO_PPP" |
| 65 |
- # bug #299421 |
| 66 |
- VARTEXFONTS="${T}"/fonts emake -j1 prefix=/usr \ |
| 67 |
- CONFDIR=/etc/mgetty+sendfax \ |
| 68 |
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
| 69 |
- LDFLAGS="${LDFLAGS}" \ |
| 70 |
- all vgetty |
| 71 |
+ local target |
| 72 |
+ for target in mgetty sedscript all vgetty;do |
| 73 |
+ VARTEXFONTS="${T}"/fonts emake prefix=/usr \ |
| 74 |
+ CONFDIR=/etc/mgetty+sendfax \ |
| 75 |
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
| 76 |
+ LDFLAGS="${LDFLAGS}" \ |
| 77 |
+ ${target} |
| 78 |
+ done |
| 79 |
} |
| 80 |
|
| 81 |
src_install () { |
| 82 |
# parallelization issue: vgetty-install target fails if install target |
| 83 |
# isn't finished |
| 84 |
- local targets |
| 85 |
- for targets in install "vgetty-install install-callback"; do |
| 86 |
+ local target |
| 87 |
+ for target in install "vgetty-install install-callback"; do |
| 88 |
emake prefix="${D}/usr" \ |
| 89 |
INFODIR="${D}/usr/share/info" \ |
| 90 |
CONFDIR="${D}/etc/mgetty+sendfax" \ |
| 91 |
@@ -117,7 +112,7 @@ src_install () { |
| 92 |
PHONE_GROUP=fax \ |
| 93 |
PHONE_PERMS=755 \ |
| 94 |
spool="${D}/var/spool" \ |
| 95 |
- ${targets} |
| 96 |
+ ${target} |
| 97 |
done |
| 98 |
|
| 99 |
keepdir /var/log/mgetty |
| 100 |
@@ -136,10 +131,6 @@ src_install () { |
| 101 |
docinto vgetty |
| 102 |
dodoc voice/{Readme,Announce,ChangeLog,Credits} |
| 103 |
|
| 104 |
- if use doc; then |
| 105 |
- dodoc doc/mgetty.ps |
| 106 |
- fi |
| 107 |
- |
| 108 |
docinto vgetty/doc |
| 109 |
dodoc voice/doc/* |
Archives