Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/htmlinc/, app-text/htmlinc/files/
Date: Sun, 18 Aug 2019 13:07:11
Message-Id: 1566133560.7bae4800cb2b3a040db34a29b3f380786a8ffca5.soap@gentoo
1 commit: 7bae4800cb2b3a040db34a29b3f380786a8ffca5
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 18 13:04:30 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 18 13:06:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bae4800
7
8 app-text/htmlinc: Port to EAPI 7
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 app-text/htmlinc/Manifest | 2 +-
14 .../files/htmlinc-1.0_beta1-fix-build-system.patch | 33 ++++++++++++++++++++++
15 app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild | 31 ++++++++------------
16 3 files changed, 46 insertions(+), 20 deletions(-)
17
18 diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
19 index 142fe80d71d..625afb5d3f7 100644
20 --- a/app-text/htmlinc/Manifest
21 +++ b/app-text/htmlinc/Manifest
22 @@ -1 +1 @@
23 -DIST htmlinc.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
24 +DIST htmlinc-1.0_beta1.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
25
26 diff --git a/app-text/htmlinc/files/htmlinc-1.0_beta1-fix-build-system.patch b/app-text/htmlinc/files/htmlinc-1.0_beta1-fix-build-system.patch
27 new file mode 100644
28 index 00000000000..3d0fff8d86f
29 --- /dev/null
30 +++ b/app-text/htmlinc/files/htmlinc-1.0_beta1-fix-build-system.patch
31 @@ -0,0 +1,33 @@
32 +--- a/Makefile
33 ++++ b/Makefile
34 +@@ -1,28 +1,9 @@
35 +-CC=g++
36 +-INSTDIR=/usr/local/bin
37 +-CFLAGS=-Wall
38 +-STRINGLIB=bytevector.o stringlist.o
39 +-
40 +-htmlinc :htmlinc.o
41 +- $(CC) $(STRINGLIB) htmlinc.o -o htmlinc $(CFLAGS)
42 +-
43 +-htmlinc.o: htmlinc.cc stringlist.o bytevector.o
44 +- $(CC) -c htmlinc.cc $(CFLAGS)
45 ++htmlinc: bytevector.o stringlist.o
46 +
47 + headers: text2h
48 + text2h help <help.txt >help.h
49 +
50 +-text2h: text2h.o bytevector.o stringlist.o
51 +- $(CC) $(STRINGLIB) text2h.o -o text2h $(CFLAGS)
52 +-
53 +-text2h.o: text2h.cc
54 +- $(CC) -c text2h.cc $(CFLAGS)
55 +-
56 +-bytevector.o: bytevector.h bytevector.cc
57 +- ${CC} -c bytevector.cc $(CFLAGS)
58 +-
59 +-stringlist.o: bytevector.o stringlist.h stringlist.cc
60 +- $(CC) -c stringlist.cc $(CFLAGS)
61 ++text2h: bytevector.o stringlist.o
62 +
63 + clean:
64 + rm *.o text2h htmlinc
65
66 diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
67 index 694412759ce..a2d1afc5050 100644
68 --- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
69 +++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
70 @@ -1,37 +1,30 @@
71 # Copyright 1999-2019 Gentoo Authors
72 # Distributed under the terms of the GNU General Public License v2
73
74 -EAPI=5
75 +EAPI=7
76
77 -inherit eutils toolchain-funcs
78 +inherit flag-o-matic toolchain-funcs
79
80 DESCRIPTION="HTML Include System by Ulli Meybohm"
81 HOMEPAGE="http://www.meybohm.de/"
82 -SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
83 +SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
84
85 LICENSE="GPL-2"
86 SLOT="0"
87 KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
88 -IUSE=""
89
90 -S=${WORKDIR}/htmlinc
91 +S="${WORKDIR}/${PN}"
92 +PATCHES=(
93 + "${FILESDIR}"/${PN}-gcc3-gentoo.patch
94 + "${FILESDIR}"/${P}-fix-build-system.patch
95 +)
96
97 -src_prepare() {
98 - epatch "${FILESDIR}"/htmlinc-gcc3-gentoo.patch
99 - sed -i Makefile \
100 - -e 's| -o | $(LDFLAGS)&|g' \
101 - || die "sed Makefile"
102 -}
103 -
104 -src_compile() {
105 - # This is C++ not C source
106 - emake \
107 - CC=$(tc-getCXX) \
108 - CFLAGS="${CXXFLAGS} -Wall" \
109 - LDFLAGS="${LDFLAGS}"
110 +src_configure() {
111 + tc-export CXX
112 + append-cxxflags -Wall
113 }
114
115 src_install() {
116 dobin htmlinc
117 - dodoc README
118 + einstalldocs
119 }