[gentoo-commits] repo/gentoo:master commit in: app-text/xml2doc/, app-text/xml2doc/files/

[David Seifert]

commit:     c447ada00e666dae75b0730511ccf3741b2230c9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 21:51:00 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 21:51:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c447ada0

app-text/xml2doc: Port to EAPI 7

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../xml2doc/files/xml2doc-20030510-makefile.patch  | 100 +++++++++++++++++++++
 app-text/xml2doc/xml2doc-20030510-r1.ebuild        |  39 +++-----
 2 files changed, 114 insertions(+), 25 deletions(-)

diff --git a/app-text/xml2doc/files/xml2doc-20030510-makefile.patch b/app-text/xml2doc/files/xml2doc-20030510-makefile.patch
new file mode 100644
index 00000000000..1023352d0a7
--- /dev/null
+++ b/app-text/xml2doc/files/xml2doc-20030510-makefile.patch
@@ -0,0 +1,100 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -9,19 +9,16 @@
+ DEBUG=@DEBUG@
+ PREFIX=@PREFIX@
+ 
+-CC=gcc
+ OBJ=main.o defs.o parse.o parse_include.o parse_info.o parse_img.o parse_t.o parse_page.o parse_default.o parse_bookmark.o parse_add.o parse_list.o parse_sep.o output_t.o output_doc.o output_img.o output_info.o output_page.o output_sep.o output_list.o parm.o
+ IPATH=-I/usr/pkg/include/libxml2 -I/usr/include/libxml2 -I. -I/usr/pkg/include -I/usr/local/include
+ LPATH=-L/usr/pkg/lib -L/usr/local/lib
+ CFLAGS+=-Wall -c $(IPATH) $(I_PDF)\
+ 	-DVERSION=\"$(VERSION)\" $(DEBUG)\
+-	-fno-asm -funroll-all-loops -fstrength-reduce -frerun-loop-opt \
+ 	-x c -fshort-enums
+ LFLAGS=-lxml2 $(L_PDF) $(LPATH)
+ BIN=xml2doc
+ 
+-all:
+-	@printf "\e[32mUse make in the parent directory :)\e[0m\n"
++all: build
+ 
+ install: build
+ 	@printf "\e[32mInstalling binaries...\e[0m\n"
+@@ -34,75 +31,49 @@
+ 
+ build: $(OBJ)
+ 	@printf "\n\e[32mLinking objects...\e[0m\n"
+-	$(CC) $(LFLAGS) $(OBJ) -o $(BIN)
+-	@if ( test -z "$(DEBUG)" ); then \
+-	     echo "Stripping symbols..."; \
+-	     strip -s $(BIN); \
+-	 fi
+-	@printf "\n\n\e[32mCompilation process done.\e[0m\n"
++	$(CC) $(LDFLAGS) $(L_PDF) $^ -lxml2 -o $(BIN)
+ 
+ main.o: main.c main.h
+-	$(CC) $(CFLAGS) main.c
+ 
+ parm.o: parm.c parm.h
+-	$(CC) $(CFLAGS) parm.c
+ 
+ output_doc.o: output_doc.c output.h
+-	$(CC) $(CFLAGS) output_doc.c
+ 
+ output_img.o: output_img.c output.h
+-	$(CC) $(CFLAGS) output_img.c
+ 
+ output_info.o: output_info.c output.h
+-	$(CC) $(CFLAGS) output_info.c
+ 
+ output_page.o: output_page.c output.h
+-	$(CC) $(CFLAGS) output_page.c
+ 
+ output_sep.o: output_sep.c output.h
+-	$(CC) $(CFLAGS) output_sep.c
+ 
+ output_list.o: output_list.c output.h
+-	$(CC) $(CFLAGS) output_list.c
+ 
+ output_t.o: output_t.c output.h
+-	$(CC) $(CFLAGS) output_t.c
+ 
+ parse_add.o: parse_add.c defs.h
+-	$(CC) $(CFLAGS) parse_add.c
+ 
+ parse_sep.o: parse_sep.c defs.h
+-	$(CC) $(CFLAGS) parse_sep.c
+ 
+ defs.o: defs.c defs.h
+-	$(CC) $(CFLAGS) defs.c
+ 
+ parse.o: parse.c defs.h
+-	$(CC) $(CFLAGS) parse.c
+ 
+ parse_include.o: parse_include.c defs.h
+-	$(CC) $(CFLAGS) parse_include.c
+ 
+ parse_info.o: parse_info.c defs.h
+-	$(CC) $(CFLAGS) parse_info.c
+ 
+ parse_img.o: parse_img.c defs.h
+-	$(CC) $(CFLAGS) parse_img.c
+ 
+ parse_t.o: parse_t.c defs.h
+-	$(CC) $(CFLAGS) parse_t.c
+ 
+ parse_page.o: parse_page.c defs.h
+-	$(CC) $(CFLAGS) parse_page.c
+ 
+ parse_default.o: parse_default.c defs.h
+-	$(CC) $(CFLAGS) parse_default.c
+ 
+ parse_bookmark.o: parse_bookmark.c defs.h
+-	$(CC) $(CFLAGS) parse_bookmark.c
+ 
+ parse_list.o: parse_list.c defs.h
+-	$(CC) $(CFLAGS) parse_list.c
+ 
+ clean:
+ 	rm -rf $(OBJ) $(BIN) *.o a.out *~ DEADJOE .*.swp *.txt *.pdf *.html *.xml

diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
index 481bd3d247e..3c962351552 100644
--- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -1,59 +1,48 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)"
-
 HOMEPAGE="http://xml2doc.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
-IUSE=""
 SLOT="0"
-
 KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 
-DEPEND=">=dev-libs/libxml2-2.5"
+DEPEND="dev-libs/libxml2:2"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# Fix pointer-related bug detected by a QA notice.
-	epatch "${FILESDIR}/${PN}-pointer_fix.patch"
+S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	# Fix pointer-related bug detected by a QA notice
+	"${FILESDIR}"/${PN}-pointer_fix.patch
 	# Don't strip symbols from binary (bug #152266)
-	sed -i -e '/^\s*strip/d' \
-		-e 's/^\t$(CC) $(LFLAGS).*/\t$(LINK.o) $(L_PDF) $^ -lxml2 -o $(BIN)/' \
-		-e '/^\t$(CC) $(CFLAGS) /d' \
-		src/Makefile.in
-}
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
 src_configure() {
+	tc-export CC
 	econf --disable-pdf
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	default
 
-	cd "${S}/doc"
+	cd doc || die
 	"${S}"/src/xml2doc -oM manpage.xml xml2doc.1 || die
 }
 
 src_install() {
-	# xml2doc's make install is unfortunately broken
-
-	# binary
 	dobin src/xml2doc
 
-	# documentation
-	dodoc BUGS README TODO
+	einstalldocs
 	docinto examples
 	dodoc examples/*.{xml,png}
 
-	# manpage
 	doman doc/xml2doc.1
 }