* [gentoo-commits] repo/gentoo:master commit in: app-text/odt2txt/, app-text/odt2txt/files/
@ 2018-04-09 17:54 Jonas Stein
0 siblings, 0 replies; 2+ messages in thread
From: Jonas Stein @ 2018-04-09 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 78d1f199c40ba158a02b055b79e07d66d708397f
Author: Labbe Corentin <clabbe.montjoie <AT> gmail <DOT> com>
AuthorDate: Mon Apr 9 10:26:58 2018 +0000
Commit: Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 17:51:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d1f199
app-text/odt2txt: bump to 0.5
Closes: https://bugs.gentoo.org/651548
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-text/odt2txt/Manifest | 1 +
.../odt2txt/files/odt2txt-0.5-darwin_iconv.patch | 14 +++++++++
app-text/odt2txt/odt2txt-0.5.ebuild | 34 ++++++++++++++++++++++
3 files changed, 49 insertions(+)
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 4c212d52dc4..f8855f7a053 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -1 +1,2 @@
DIST odt2txt-0.4.tar.gz 23997 BLAKE2B ffa2ac915c1c239cfa7a498fa1597a2462bc7ecd2fb08a90ab50f21a60dbde8abffa52f4b4c40591732f7d497f08774555b36d880214a7708f2c05b692a18908 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4
+DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
diff --git a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch
new file mode 100644
index 00000000000..05957269888
--- /dev/null
+++ b/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch
@@ -0,0 +1,14 @@
+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/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
new file mode 100644
index 00000000000..71f794e3cdf
--- /dev/null
+++ b/app-text/odt2txt/odt2txt-0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A simple converter from OpenDocument Text to plain text"
+HOMEPAGE="http://stosberg.net/odt2txt/"
+SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86 ~x86-macos"
+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}"
+}
+
+src_install() {
+ emake install DESTDIR="${D}" PREFIX=/usr
+ doman odt2txt.1
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/odt2txt/, app-text/odt2txt/files/
@ 2022-11-20 23:56 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2022-11-20 23:56 UTC (permalink / raw
To: gentoo-commits
commit: e0b7668889d663e53fb4baa5aa8074a56c8be10f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 23:55:51 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 23:55:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b76688
app-text/odt2txt: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../odt2txt/files/odt2txt-0.5-darwin_iconv.patch | 14 ---
app-text/odt2txt/files/odt2txt-0.5-makefile.patch | 116 +++++++++++++++++++++
.../{odt2txt-0.5.ebuild => odt2txt-0.5-r1.ebuild} | 24 ++---
3 files changed, 127 insertions(+), 27 deletions(-)
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
similarity index 62%
rename from app-text/odt2txt/odt2txt-0.5.ebuild
rename to 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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-20 23:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-09 17:54 [gentoo-commits] repo/gentoo:master commit in: app-text/odt2txt/, app-text/odt2txt/files/ Jonas Stein
-- strict thread matches above, loose matches on Subject: below --
2022-11-20 23:56 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox