diff options
| -rw-r--r-- | app-misc/g15mpd/files/g15mpd-1.0.0-docdir.patch | 11 | ||||
| -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 } |