From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E07C8138351 for ; Mon, 10 Feb 2020 00:18:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5EB3E08BB; Mon, 10 Feb 2020 00:18:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 963E3E08BB for ; Mon, 10 Feb 2020 00:18:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45FA934E958 for ; Mon, 10 Feb 2020 00:18:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0CC5116 for ; Mon, 10 Feb 2020 00:18:36 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1581293878.1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch dev-libs/libg15render/libg15render-1.2-r2.ebuild X-VCS-Directories: dev-libs/libg15render/files/ dev-libs/libg15render/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90 X-VCS-Branch: master Date: Mon, 10 Feb 2020 00:18:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22a7f311-3d43-43dd-a4a4-85bb75682fb7 X-Archives-Hash: 6484fb4dc9aa204d1eb880cc6141406d commit: 1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:17:58 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:17:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1668cfaa dev-libs/libg15render: Port to EAPI 7 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> .../libg15render-1.2-freetype_pkgconfig.patch | 22 ++++++++++++++-- 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 83df9fa4f0f..313d2ef5b6e 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 816da20255e..1082ceb99bf 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 }