| 1 |
commit: 95ede46929a434fcb2c37a455e5bbe4488be55f3 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 9 11:20:27 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 9 12:29:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ede469 |
| 7 |
|
| 8 |
app-misc/g15composer: EAPI-7 revbump |
| 9 |
|
| 10 |
- Fixed docdir |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
app-misc/g15composer/files/g15composer-3.2-docdir.patch | 11 +++++++++++ |
| 16 |
.../{g15composer-3.2.ebuild => g15composer-3.2-r1.ebuild} | 13 ++++++------- |
| 17 |
2 files changed, 17 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-misc/g15composer/files/g15composer-3.2-docdir.patch b/app-misc/g15composer/files/g15composer-3.2-docdir.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..cd81cde5de4 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-misc/g15composer/files/g15composer-3.2-docdir.patch |
| 24 |
@@ -0,0 +1,11 @@ |
| 25 |
+--- g15composer-3.2/Makefile.am |
| 26 |
++++ g15composer-3.2/Makefile.am |
| 27 |
+@@ -3,7 +3,7 @@ |
| 28 |
+ EXTRA_DIST = g15composer.l g15composer.y debian examples doc |
| 29 |
+ noinst_HEADERS = g15composer.h g15c_logo.h |
| 30 |
+ man1_MANS = $(top_srcdir)/doc/g15composer.1 |
| 31 |
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) |
| 32 |
++docdir = @docdir@ |
| 33 |
+ doc_DATA = AUTHORS ChangeLog COPYING NEWS README |
| 34 |
+ |
| 35 |
+ g15composer.tab.c: g15composer.lex.c g15composer.y g15composer.h |
| 36 |
|
| 37 |
diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2-r1.ebuild |
| 38 |
similarity index 83% |
| 39 |
rename from app-misc/g15composer/g15composer-3.2.ebuild |
| 40 |
rename to app-misc/g15composer/g15composer-3.2-r1.ebuild |
| 41 |
index 03f3cb42bbf..9c316e0abb2 100644 |
| 42 |
--- a/app-misc/g15composer/g15composer-3.2.ebuild |
| 43 |
+++ b/app-misc/g15composer/g15composer-3.2-r1.ebuild |
| 44 |
@@ -1,7 +1,7 @@ |
| 45 |
-# Copyright 1999-2018 Gentoo Foundation |
| 46 |
+# Copyright 1999-2020 Gentoo Authors |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
-EAPI=6 |
| 50 |
+EAPI=7 |
| 51 |
|
| 52 |
inherit autotools |
| 53 |
|
| 54 |
@@ -16,13 +16,12 @@ IUSE="truetype examples" |
| 55 |
|
| 56 |
DEPEND="app-misc/g15daemon |
| 57 |
>=dev-libs/libg15render-1.2[truetype?] |
| 58 |
- truetype? ( |
| 59 |
- media-libs/freetype |
| 60 |
- virtual/pkgconfig |
| 61 |
- )" |
| 62 |
+ truetype? ( media-libs/freetype )" |
| 63 |
+BDEPEND="virtual/pkgconfig" |
| 64 |
|
| 65 |
PATCHES=( |
| 66 |
- "${FILESDIR}"/${PN}-3.2-freetype_pkgconfig.patch |
| 67 |
+ "${FILESDIR}/${P}-freetype_pkgconfig.patch" |
| 68 |
+ "${FILESDIR}/${P}-docdir.patch" |
| 69 |
) |
| 70 |
|
| 71 |
src_prepare() { |
Archives