diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:13:48 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:09:44 +0100 |
| commit | f43152692d9de4d8ab00fe7a1be8fa92951734d9 (patch) | |
| tree | a4b98f8aa7345cbe8632191ae203d78f161c0c8c /app-text | |
| parent | app-shells/hstr: respect ${PKG_CONFIG} (diff) | |
| download | gentoo-f43152692d9de4d8ab00fe7a1be8fa92951734d9.tar.gz gentoo-f43152692d9de4d8ab00fe7a1be8fa92951734d9.tar.bz2 gentoo-f43152692d9de4d8ab00fe7a1be8fa92951734d9.zip | |
app-text/paps: port to EAPI 7, clean up patches
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-text')
5 files changed, 22 insertions, 20 deletions
diff --git a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch index ec4ba8b2b180..d4bb69e39730 100644 --- a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch +++ b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch @@ -1,5 +1,5 @@ ---- paps-0.6.8/configure.in -+++ paps-0.6.8/configure.in +--- a/configure.in ++++ b/configure.in @@ -18,4 +18,6 @@ DX_INIT_DOXYGEN(libpaps, doxygen.cfg, doxygen-doc) @@ -7,8 +7,8 @@ +PKG_CHECK_MODULES([PANGO], [pangoft2]) + AC_OUTPUT(Makefile src/Makefile) ---- paps-0.6.8/src/Makefile.am -+++ paps-0.6.8/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -7,21 +7,19 @@ bin_PROGRAMS = paps paps_CFLAGS = -Wall diff --git a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch index baba74b4b8bb..449e776f5e6b 100644 --- a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch +++ b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch @@ -1,5 +1,5 @@ ---- paps-0.6.8/acinclude.m4 -+++ paps-0.6.8/acinclude.m4 +--- a/acinclude.m4 ++++ b/acinclude.m4 @@ -78,7 +78,7 @@ AC_PATH_TOOL([$1], [$2]) if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then diff --git a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch index ae334d1d28c0..2c83abf8d576 100644 --- a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch +++ b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch @@ -1,7 +1,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=566050#c2 ---- paps-0.6.8/src/paps.c -+++ paps-0.6.8/src/paps.c +--- a/src/paps.c ++++ b/src/paps.c @@ -569,11 +569,14 @@ fclose (file); diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch index ab97d22a2957..7504b66f6693 100644 --- a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch +++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch @@ -1,5 +1,5 @@ ---- paps-0.6.8/src/libpaps.c -+++ paps-0.6.8/src/libpaps.c +--- a/src/libpaps.c ++++ b/src/libpaps.c @@ -25,8 +25,9 @@ #include <pango/pango.h> diff --git a/app-text/paps/paps-0.6.8-r2.ebuild b/app-text/paps/paps-0.6.8-r2.ebuild index f244fee431b1..bf4df11e9b57 100644 --- a/app-text/paps/paps-0.6.8-r2.ebuild +++ b/app-text/paps/paps-0.6.8-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools epatch +inherit autotools DESCRIPTION="Unicode-aware text to PostScript converter" HOMEPAGE="http://paps.sourceforge.net/" @@ -12,18 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND="x11-libs/pango" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-fix-as-needed-build.patch + "${FILESDIR}"/${P}-fix-doxygen-acinclude.patch + "${FILESDIR}"/${P}-fix-freetype-include.patch + "${FILESDIR}"/${P}-fix-empty-file.patch +) src_prepare() { - epatch \ - "${FILESDIR}"/${P}-fix-as-needed-build.patch \ - "${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \ - "${FILESDIR}"/${P}-fix-freetype-include.patch \ - "${FILESDIR}"/${P}-fix-empty-file.patch + default mv configure.in configure.ac || die |