gentoo resync : 18.08.2019

3 files changed, 48 insertions, 21 deletions

diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
index 543f273f6a2f..8b5fc2c7c37d 100644
--- a/app-text/htmlinc/Manifest
+++ b/app-text/htmlinc/Manifest
@@ -1,4 +1,5 @@
+AUX htmlinc-1.0_beta1-fix-build-system.patch 768 BLAKE2B a9da434128aeb20a2151d38353b8b7ce5eaab8fa4e4b44b9f9c79a87a55ba63cb6a344f6328b9b2c439a530aaba1b5377844946b24def2b1b0ca62c7fb52a145 SHA512 78c386be5ca30e15c786ab882800a065fa785f4ea5d3683d4a703948d642945077e00cf59f724cf7dc4a533827102883dfdcbc799752130d41bc846da83ebcfb
 AUX htmlinc-gcc3-gentoo.patch 3601 BLAKE2B d268406b773c21cd2885d3f9b5e66ad0121493152a454811b5af1bb20e8ee857777374f2424d68ae9634c74d30d6e24a8d09779059c8fe4440db390259108e23 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd
-DIST htmlinc.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
-EBUILD htmlinc-1.0_beta1-r2.ebuild 716 BLAKE2B 4a5c2b28ec3605f93fdaf48b057d9b5ced42889400233cdea1fe9c22b1306f03b8f225aa91b5db4afec389661472d3fa5135562177efa5cc92011c0ad9aab380 SHA512 fd6c9bf88ed1e4abb957de35d182f661b1f86e415afb58f59046de48319738ca28ee7d8aad9c9b916c4c85bb771e9dc0f89d749ff282a5586fb460b2ac752aae
+DIST htmlinc-1.0_beta1.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
+EBUILD htmlinc-1.0_beta1-r2.ebuild 603 BLAKE2B 39e1397f1c4c0a5cb03ef142e25574d264cc061b920f98e705b732ed29f9d72a6bf2c461df34bc361bbf20da6087f40227a626a49dc2a3a933db449dde558c14 SHA512 72fad342057ae06c1e1fa2025a04a96e37dcce8736120a37896bdf05db154f1a828041ed410bcc38bfcce1a4661d260c1a1b3d9434c5976fbd14e2cd46725218
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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
new file mode 100644
index 000000000000..3d0fff8d86f7
--- /dev/null
+++ b/app-text/htmlinc/files/htmlinc-1.0_beta1-fix-build-system.patch
@@ -0,0 +1,33 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,28 +1,9 @@
+-CC=g++
+-INSTDIR=/usr/local/bin
+-CFLAGS=-Wall
+-STRINGLIB=bytevector.o stringlist.o
+-
+-htmlinc :htmlinc.o
+-	$(CC) $(STRINGLIB) htmlinc.o -o htmlinc $(CFLAGS)
+-
+-htmlinc.o: htmlinc.cc stringlist.o bytevector.o 
+-	$(CC) -c htmlinc.cc $(CFLAGS)
++htmlinc: bytevector.o stringlist.o
+ 
+ headers: text2h 
+ 	text2h help <help.txt >help.h 
+ 
+-text2h: text2h.o bytevector.o stringlist.o 
+-	$(CC) $(STRINGLIB) text2h.o -o text2h $(CFLAGS)
+-
+-text2h.o: text2h.cc
+-	$(CC) -c text2h.cc $(CFLAGS)
+-
+-bytevector.o: bytevector.h bytevector.cc
+-	${CC} -c bytevector.cc $(CFLAGS)
+-
+-stringlist.o: bytevector.o stringlist.h stringlist.cc
+-	$(CC) -c stringlist.cc $(CFLAGS)
++text2h: bytevector.o stringlist.o
+ 
+ clean:
+ 	rm *.o text2h htmlinc
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index 694412759ced..a2d1afc50502 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -1,37 +1,30 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="HTML Include System by Ulli Meybohm"
 HOMEPAGE="http://www.meybohm.de/"
-SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
 
-S=${WORKDIR}/htmlinc
+S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gcc3-gentoo.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/htmlinc-gcc3-gentoo.patch
-	sed -i Makefile \
-		-e 's| -o | $(LDFLAGS)&|g' \
-		|| die "sed Makefile"
-}
-
-src_compile() {
-	# This is C++ not C source
-	emake \
-		CC=$(tc-getCXX) \
-		CFLAGS="${CXXFLAGS} -Wall" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CXX
+	append-cxxflags -Wall
 }
 
 src_install() {
 	dobin htmlinc
-	dodoc README
+	einstalldocs
 }