diff options
| author |   David Seifert <soap@gentoo.org> | 2020-02-10 01:17:58 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2020-02-10 01:17:58 +0100 |
| commit | 1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90 (patch) | |
| tree | a10ad28940fd6c346bd8076ca187dc4d8fe6f8a3 /dev-libs | |
| parent | dev-java/tomcat-servlet-api: dropped 9.0.7 (diff) | |
| download | gentoo-1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90.tar.gz gentoo-1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90.tar.bz2 gentoo-1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90.zip | |
dev-libs/libg15render: Port to EAPI 7
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch | 22 | ||||
| -rw-r--r-- | dev-libs/libg15render/libg15render-1.2-r2.ebuild | 30 |
2 files changed, 33 insertions, 19 deletions
diff --git a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch index 83df9fa4f0fa..313d2ef5b6e2 100644 --- a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch +++ b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch @@ -1,5 +1,5 @@ ---- libg15render-1.2/configure.in -+++ libg15render-1.2/configure.in +--- a/configure.in ++++ b/configure.in @@ -13,19 +13,20 @@ AC_PROG_LIBTOOL @@ -33,3 +33,21 @@ # Checks for libraries. AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"])) +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,3 @@ +-LLIBDIR=@LIBDIR@ +-AM_CFLAGS=@CFLAGS@ + lib_LTLIBRARIES = libg15render.la + libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c font_6x4.c font_7x5.c font_8x8.c + libg15render_la_LIBADD = @FTLIB@ +@@ -7,8 +5,7 @@ + include_HEADERS= libg15render.h + EXTRA_DIST = debian Doxyfile libg15render.3 + man3_MANS = $(top_srcdir)/libg15render.3 +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) +-doc_DATA = AUTHORS ChangeLog COPYING NEWS README ++doc_DATA = AUTHORS ChangeLog NEWS README + + dist-hook: + rm -rf `find $(distdir)/debian -name .svn` diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild index 816da20255ea..1082ceb99bf4 100644 --- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild +++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -12,19 +12,18 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" - IUSE="truetype" RDEPEND=" dev-libs/libg15 - truetype? ( media-libs/freetype ) -" -DEPEND="${RDEPEND} + truetype? ( media-libs/freetype )" +DEPEND="${RDEPEND}" +BDEPEND=" truetype? ( virtual/pkgconfig )" PATCHES=( - "${FILESDIR}/${P}-pixel-c.patch" - "${FILESDIR}/${P}-freetype_pkgconfig.patch" + "${FILESDIR}"/${P}-pixel-c.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch ) src_prepare() { @@ -34,17 +33,14 @@ src_prepare() { } src_configure() { - local myeconfargs=( - --disable-static - $(use_enable truetype ttf ) - ) - econf "${myeconfargs[@]}" + econf \ + --disable-static \ + $(use_enable truetype ttf) } src_install() { - emake DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} install - rm "${ED%/}/usr/share/doc/${PF}/COPYING" + default - find "${ED}" -name '*.la' -delete || die + # no static archives + find "${D}" -name '*.la' -delete || die } |