gentoo auto-resync : 21:11:2022 - 01:03:25

4 files changed, 129 insertions, 29 deletions

diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 4668997b5167..5d0ecd8097f5 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -1,4 +1,4 @@
-AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762
+AUX odt2txt-0.5-makefile.patch 2804 BLAKE2B ba5737bac3a9d01c5d31375de772402ee1cc024e8b0674d6fc9d8b63945977a5c059e85b33fcfa87fdc4fed2a975f3bc439f8678f162b48328a5ec959a31394f SHA512 507fdd6f8663874b970b7833d7d15d6903b8e3193489c6b092158a4d6ad0d3bae794571e4f17c79861ee22afddbf79f9d40c2e4e465f6cdd4bee72b67650d0af
 DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
-EBUILD odt2txt-0.5.ebuild 734 BLAKE2B 0eecccd2bd9659fbe7b3e499560b5a094784a914d9d7834ba3737353d3db6cca1969373efce774b31628e7c218d28ab6714d7f742b7b2faeefb81ef478360e94 SHA512 90d8025c398a7b0ec014eebe9fc4ee8c8aabc0dbbac99579fa01d9a494947057a552262a89387b319d2697b3cfa6ad79b2414651a11114cf24a33235cb662be1
+EBUILD odt2txt-0.5-r1.ebuild 709 BLAKE2B 66c0d895fa3ceb46b54be47955eb814ea34c2479126ea303d6690974f75f94ee6fbe910f43ad3bcdf0e03d6e7b6acdcca70b8490e218077fd9f3571e435f3094 SHA512 8dc2504218f5d99dcb0b47331a6274f9fb25be3c4ed5e4aea4714ba80f7728c704be4d521bd1f98b574ed3983fa57c5a58b923dfa41cf7cd30dcf6cf559718e7
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch
deleted file mode 100644
index 05957269888e..000000000000
--- a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur odt2txt-0.4/Makefile odt2txt-0.4/Makefile
---- odt2txt-0.4/Makefile	2008-06-23 23:32:28 +0400
-+++ odt2txt-0.4/Makefile	2010-05-24 15:39:16 +0400
-@@ -56,6 +56,9 @@
- 	CFLAGS += -I$(ZLIB_DIR)
- 	LIBS = $(ZLIB_DIR)/libz.a
- endif
-+ifeq ($(UNAME_S),Darwin)
-+	LIBS += -liconv
-+endif
- ifeq ($(UNAME_O),Cygwin)
- 	CFLAGS += -DICONV_CHAR="const char"
- 	LIBS += -liconv
-
diff --git a/app-text/odt2txt/files/odt2txt-0.5-makefile.patch b/app-text/odt2txt/files/odt2txt-0.5-makefile.patch
new file mode 100644
index 000000000000..b87814f3ff58
--- /dev/null
+++ b/app-text/odt2txt/files/odt2txt-0.5-makefile.patch
@@ -0,0 +1,116 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,28 +2,22 @@
+ UNAME_S := $(shell uname -s 2>/dev/null || echo unknown)
+ UNAME_O := $(shell uname -o 2>/dev/null || echo unknown)
+ 
+-ifdef DEBUG
+-CFLAGS = -O0 -g -Wextra -DMEMDEBUG -DSTRBUF_CHECK
+-#LDFLAGS = -lefence
+-LDFLAGS += -g
+-else
+-CFLAGS = -O2
+-endif
+-
+ ifdef NO_ICONV
+-CFLAGS += -DNO_ICONV
++CPPFLAGS += -DNO_ICONV
+ endif
+ 
+-LIBS = -lz
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags zlib)
++LDLIBS += $(shell $(PKG_CONFIG) --libs zlib)
++
+ ZIP_OBJS =
+ ifdef HAVE_LIBZIP
+-	CFLAGS += -DHAVE_LIBZIP
+-	LIBS += -lzip
++	CPPFLAGS += -DHAVE_LIBZIP
++	LDLIBS += -lzip
+ else
+ 	ZIP_OBJS = kunzip/fileio.o kunzip/zipfile.o
+ endif
+ 
+-OBJ = odt2txt.o regex.o mem.o strbuf.o $(ZIP_OBJS)
++OBJ = regex.o mem.o strbuf.o $(ZIP_OBJS)
+ TEST_OBJ = t/test-strbuf.o t/test-regex.o
+ ALL_OBJ = $(OBJ) $(TEST_OBJ)
+ 
+@@ -37,50 +31,44 @@
+ MAN1DIR = $(MANDIR)/man1
+ 
+ ifeq ($(UNAME_S),FreeBSD)
+-	CFLAGS += -DICONV_CHAR="const char" -I/usr/local/include
++	CPPFLAGS += -DICONV_CHAR="const char"
+ 	LDFLAGS += -L/usr/local/lib
+-	LIBS += -liconv
++	LDLIBS += -liconv
+ endif
+ ifeq ($(UNAME_S),OpenBSD)
+-	CFLAGS += -DICONV_CHAR="const char" -I/usr/local/include
++	CPPFLAGS += -DICONV_CHAR="const char"
+ 	LDFLAGS += -L/usr/local/lib
+-	LIBS += -liconv
++	LDLIBS += -liconv
+ endif
+ ifeq ($(UNAME_S),Darwin)
+-       CFLAGS += -I/opt/local/include
+-       LDFLAGS += -L/opt/local/lib
+-       LIBS += -liconv
++       LDLIBS += -liconv
+ endif
+ ifeq ($(UNAME_S),NetBSD)
+-	CFLAGS += -DICONV_CHAR="const char"
++	CPPFLAGS += -DICONV_CHAR="const char"
+ endif
+ ifeq ($(UNAME_S),SunOS)
+-	ifeq ($(CC),cc)
+-		ifdef DEBUG
+-			CFLAGS = -v -g -DMEMDEBUG -DSTRBUF_CHECK
+-		else
+-			CFLAGS = -xO3
+-		endif
+-	endif
+-	CFLAGS += -DICONV_CHAR="const char"
++	CPPFLAGS += -DICONV_CHAR="const char"
+ endif
+ ifeq ($(UNAME_S),HP-UX)
+-	CFLAGS += -I$(ZLIB_DIR)
+-	LIBS = $(ZLIB_DIR)/libz.a
++	CPPFLAGS += -I$(ZLIB_DIR)
++	LDLIBS += $(ZLIB_DIR)/libz.a
++endif
++ifeq ($(UNAME_S),Darwin)
++	LDLIBS += -liconv
+ endif
+ ifeq ($(UNAME_O),Cygwin)
+-	CFLAGS += -DICONV_CHAR="const char"
+-	LIBS += -liconv
++	CPPFLAGS += -DICONV_CHAR="const char"
++	LDLIBS += -liconv
+ 	EXT = .exe
+ endif
+ ifneq ($(MINGW32),)
+-	CFLAGS += -DICONV_CHAR="const char" -I$(REGEX_DIR) -I$(ZLIB_DIR)
+-	LIBS = $(REGEX_DIR)/regex.o
++	CPPFLAGS += -DICONV_CHAR="const char" -I$(REGEX_DIR) -I$(ZLIB_DIR)
++	LDLIBS += $(REGEX_DIR)/regex.o
+ 	ifdef STATIC
+-		LIBS += $(wildcard $(ICONV_DIR)/lib/.libs/*.o)
+-		LIBS += $(ZLIB_DIR)/zlib.a
++		LDLIBS += $(wildcard $(ICONV_DIR)/lib/.libs/*.o)
++		LDLIBS += $(ZLIB_DIR)/zlib.a
+ 	else
+-		LIBS += -liconv
++		LDLIBS += -liconv
+ 	endif
+ 	EXT = .exe
+ endif
+@@ -89,7 +77,6 @@
+ MAN = odt2txt.1
+ 
+ $(BIN): $(OBJ)
+-	$(CC) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
+ 
+ t/test-strbuf: t/test-strbuf.o strbuf.o mem.o
+ t/test-regex: t/test-regex.o regex.o strbuf.o mem.o
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5-r1.ebuild
index e736a365e9a1..70a3b4a55b3e 100644
--- a/app-text/odt2txt/odt2txt-0.5.ebuild
+++ b/app-text/odt2txt/odt2txt-0.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,23 +12,21 @@ SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc64 ~sparc x86"
-IUSE=""
 
 RDEPEND="
 	!app-office/unoconv
 	sys-libs/zlib
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}
-	sys-apps/groff
-"
-PATCHES="${FILESDIR}/${P}-darwin_iconv.patch"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	virtual/libiconv"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/groff"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}"/usr
 	doman odt2txt.1
 }