commit: 95ede46929a434fcb2c37a455e5bbe4488be55f3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 9 11:20:27 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep 9 12:29:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ede469
app-misc/g15composer: EAPI-7 revbump
- Fixed docdir
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-misc/g15composer/files/g15composer-3.2-docdir.patch | 11 +++++++++++
.../{g15composer-3.2.ebuild => g15composer-3.2-r1.ebuild} | 13 ++++++-------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/app-misc/g15composer/files/g15composer-3.2-docdir.patch
b/app-misc/g15composer/files/g15composer-3.2-docdir.patch
new file mode 100644
index 00000000000..cd81cde5de4
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.2-docdir.patch
@@ -0,0 +1,11 @@
+--- g15composer-3.2/Makefile.am
++++ g15composer-3.2/Makefile.am
+@@ -3,7 +3,7 @@
+ EXTRA_DIST = g15composer.l g15composer.y debian examples doc
+ noinst_HEADERS = g15composer.h g15c_logo.h
+ man1_MANS = $(top_srcdir)/doc/g15composer.1
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = AUTHORS ChangeLog COPYING NEWS README
+
+ g15composer.tab.c: g15composer.lex.c g15composer.y g15composer.h
diff --git a/app-misc/g15composer/g15composer-3.2.ebuild
b/app-misc/g15composer/g15composer-3.2-r1.ebuild
similarity index 83%
rename from app-misc/g15composer/g15composer-3.2.ebuild
rename to app-misc/g15composer/g15composer-3.2-r1.ebuild
index 03f3cb42bbf..9c316e0abb2 100644
--- a/app-misc/g15composer/g15composer-3.2.ebuild
+++ b/app-misc/g15composer/g15composer-3.2-r1.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
@@ -16,13 +16,12 @@ IUSE="truetype examples"
DEPEND="app-misc/g15daemon
>=dev-libs/libg15render-1.2[truetype?]
- truetype? (
- media-libs/freetype
- virtual/pkgconfig
- )"
+ truetype? ( media-libs/freetype )"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-3.2-freetype_pkgconfig.patch
+ "${FILESDIR}/${P}-freetype_pkgconfig.patch"
+ "${FILESDIR}/${P}-docdir.patch"
)
src_prepare() {
