summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-09-09 13:43:58 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-09-09 14:29:24 +0200
commit52836328f72fd85de4ae9162658537a681213c58 (patch)
treeef703003a01a6cfbe3f470ac435b6a703ee32cab /app-misc/g15mpd
parentapp-misc/g15message: EAPI-7 revbump (diff)
downloadgentoo-52836328f72fd85de4ae9162658537a681213c58.tar.gz
gentoo-52836328f72fd85de4ae9162658537a681213c58.tar.bz2
gentoo-52836328f72fd85de4ae9162658537a681213c58.zip
app-misc/g15mpd: EAPI-7 revbump
- Fixed docdir Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-misc/g15mpd')
-rw-r--r--app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch11
-rw-r--r--app-misc/g15mpd/g15mpd-1.0.0-r2.ebuild (renamed from app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild)20
2 files changed, 24 insertions, 7 deletions
diff --git a/app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch b/app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch
new file mode 100644
index 000000000000..8ee294226797
--- /dev/null
+++ b/app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch
@@ -0,0 +1,11 @@
+--- g15mpd-1.0.0/Makefile.am
++++ g15mpd-1.0.0/Makefile.am
+@@ -3,7 +3,7 @@
+ METASOURCES = AUTO
+ bin_PROGRAMS = g15mpd
+
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = README ChangeLog AUTHORS NEWS COPYING
+
+ LIBS = -lg15daemon_client -lg15render -lX11 -lXtst -lmpd
diff --git a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild b/app-misc/g15mpd/g15mpd-1.0.0-r2.ebuild
index b7c7430f5385..e80010f84b49 100644
--- a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
+++ b/app-misc/g15mpd/g15mpd-1.0.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
DESCRIPTION="MPD (music player daemon) plugin to G15daemon"
HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -25,13 +25,19 @@ RDEPEND="
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+PATCHES=(
+ "${FILESDIR}/${P}-libmpd.patch"
+ "${FILESDIR}/${P}-cflags-and-lib-fix.patch"
+ "${FILESDIR}/${P}-docdir.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-libmpd.patch
- epatch "${FILESDIR}/${PN}-1.0.0-cflags-and-lib-fix.patch"
+ default
+ mv configure.{in,ac} || die
eautoreconf
}
src_install() {
- emake DESTDIR="${D}" install
- rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
+ default
+ rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS} || die
}