1 |
commit: 1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 10 00:17:58 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 10 00:17:58 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1668cfaa |
7 |
|
8 |
dev-libs/libg15render: Port to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
.../libg15render-1.2-freetype_pkgconfig.patch | 22 ++++++++++++++-- |
14 |
dev-libs/libg15render/libg15render-1.2-r2.ebuild | 30 ++++++++++------------ |
15 |
2 files changed, 33 insertions(+), 19 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch |
18 |
index 83df9fa4f0f..313d2ef5b6e 100644 |
19 |
--- a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch |
20 |
+++ b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch |
21 |
@@ -1,5 +1,5 @@ |
22 |
---- libg15render-1.2/configure.in |
23 |
-+++ libg15render-1.2/configure.in |
24 |
+--- a/configure.in |
25 |
++++ b/configure.in |
26 |
@@ -13,19 +13,20 @@ |
27 |
AC_PROG_LIBTOOL |
28 |
|
29 |
@@ -33,3 +33,21 @@ |
30 |
|
31 |
# Checks for libraries. |
32 |
AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"])) |
33 |
+--- a/Makefile.am |
34 |
++++ b/Makefile.am |
35 |
+@@ -1,5 +1,3 @@ |
36 |
+-LLIBDIR=@LIBDIR@ |
37 |
+-AM_CFLAGS=@CFLAGS@ |
38 |
+ lib_LTLIBRARIES = libg15render.la |
39 |
+ libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c font_6x4.c font_7x5.c font_8x8.c |
40 |
+ libg15render_la_LIBADD = @FTLIB@ |
41 |
+@@ -7,8 +5,7 @@ |
42 |
+ include_HEADERS= libg15render.h |
43 |
+ EXTRA_DIST = debian Doxyfile libg15render.3 |
44 |
+ man3_MANS = $(top_srcdir)/libg15render.3 |
45 |
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) |
46 |
+-doc_DATA = AUTHORS ChangeLog COPYING NEWS README |
47 |
++doc_DATA = AUTHORS ChangeLog NEWS README |
48 |
+ |
49 |
+ dist-hook: |
50 |
+ rm -rf `find $(distdir)/debian -name .svn` |
51 |
|
52 |
diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild |
53 |
index 816da20255e..1082ceb99bf 100644 |
54 |
--- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild |
55 |
+++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild |
56 |
@@ -1,7 +1,7 @@ |
57 |
-# Copyright 1999-2018 Gentoo Foundation |
58 |
+# Copyright 1999-2020 Gentoo Authors |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
|
61 |
-EAPI=6 |
62 |
+EAPI=7 |
63 |
|
64 |
inherit autotools |
65 |
|
66 |
@@ -12,19 +12,18 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2" |
67 |
LICENSE="GPL-2" |
68 |
SLOT="0" |
69 |
KEYWORDS="amd64 ppc ppc64 x86" |
70 |
- |
71 |
IUSE="truetype" |
72 |
|
73 |
RDEPEND=" |
74 |
dev-libs/libg15 |
75 |
- truetype? ( media-libs/freetype ) |
76 |
-" |
77 |
-DEPEND="${RDEPEND} |
78 |
+ truetype? ( media-libs/freetype )" |
79 |
+DEPEND="${RDEPEND}" |
80 |
+BDEPEND=" |
81 |
truetype? ( virtual/pkgconfig )" |
82 |
|
83 |
PATCHES=( |
84 |
- "${FILESDIR}/${P}-pixel-c.patch" |
85 |
- "${FILESDIR}/${P}-freetype_pkgconfig.patch" |
86 |
+ "${FILESDIR}"/${P}-pixel-c.patch |
87 |
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch |
88 |
) |
89 |
|
90 |
src_prepare() { |
91 |
@@ -34,17 +33,14 @@ src_prepare() { |
92 |
} |
93 |
|
94 |
src_configure() { |
95 |
- local myeconfargs=( |
96 |
- --disable-static |
97 |
- $(use_enable truetype ttf ) |
98 |
- ) |
99 |
- econf "${myeconfargs[@]}" |
100 |
+ econf \ |
101 |
+ --disable-static \ |
102 |
+ $(use_enable truetype ttf) |
103 |
} |
104 |
|
105 |
src_install() { |
106 |
- emake DESTDIR="${D}" \ |
107 |
- docdir=/usr/share/doc/${PF} install |
108 |
- rm "${ED%/}/usr/share/doc/${PF}/COPYING" |
109 |
+ default |
110 |
|
111 |
- find "${ED}" -name '*.la' -delete || die |
112 |
+ # no static archives |
113 |
+ find "${D}" -name '*.la' -delete || die |
114 |
} |