diff options
Diffstat (limited to 'app-misc/g15mpd')
-rw-r--r-- | app-misc/g15mpd/Manifest | 3 | ||||
-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 |
3 files changed, 26 insertions, 8 deletions
diff --git a/app-misc/g15mpd/Manifest b/app-misc/g15mpd/Manifest index 3cb54f72c312..6084c4072f4e 100644 --- a/app-misc/g15mpd/Manifest +++ b/app-misc/g15mpd/Manifest @@ -1,5 +1,6 @@ AUX g15mpd-1.0.0-cflags-and-lib-fix.patch 746 BLAKE2B 9fce8bbfc245b8fafc638f31feca90dfa1939f6722c0ad31a8aec175c7f4ed9f755ca325e9309175d790a77012c76bd6cec7df29b0b13345ea0143aaa406c928 SHA512 79b24ec54f55741f7fb5a5a22a547e515b909e69253418de434c032179ed2a2f4e9397eabcc13de460d8c9219b3aeeafce387ba84cff17a79778ee151465b7c2 +AUX g15mpd-1.0.0-docdir.patch 301 BLAKE2B 6d174cbb9707c46495d66ae1a9651b989051f37346d4164c22108087c3b4b654a7d9cc8ed618cf7965db71fe2d01218999ef2affe8265e5f6ca516af5c6b4b8b SHA512 638599adf9d17961250703e5eb0e192cdf6d15b08cbf729c64c4ad8aead98cc800db8b61a3c659cb38338331d18231092381cacdcb29d7be33f4b2dbe601c7fb AUX g15mpd-1.0.0-libmpd.patch 1460 BLAKE2B 360dd9412aecf2b805145263b9d021484eca3dfb966eec8b44857f263a5b5fbb31d17dfcec276d531c76ef4c1d1e4cdf32d598771b3c414df8bd2660bb6ea5b7 SHA512 240c82b84c4eba2095e6fcfd0e7da7fb54197afa600dcd0ce92b3eacc9f8907e69ac64e44dfa5314a29bc4db793f9e21f8efd44589c0a3c226426cd52445945e DIST g15mpd-1.0.0.tar.bz2 220482 BLAKE2B 82103773005566764bab5e8b583633a14b5103887ac7e4c3571cfc85064e483943189e6b4b76e8f3f3b7383d327b29a19b281f23364d3bcc18b10ef44de1e9b5 SHA512 509b634c8ba1f3b9efd0d7af47b553671efe3526c9acd44b292bf5883b1016cfbf18dec69c8bb5b3a35853e76b9b4fe7a51cd2a33acf4c755d2824dc793fa0ca -EBUILD g15mpd-1.0.0-r1.ebuild 793 BLAKE2B 2c68b3700cfb372e3787a6d1ca9070907cf0ea1313a7e1413502e43959b011251f904657f7df861243c553db02d810db90a7bffbc54cdaee65208c64c27091e2 SHA512 69d7c474440a80f52fa92929671c80d51e4e35e21649c818ed1fd713da95ce1c3af8bfcca0f93eb2542302bf9ec5c46ed7ee42cf2e63816bc26fd4fc45d50b9c +EBUILD g15mpd-1.0.0-r2.ebuild 834 BLAKE2B cfea98d8e5d68031159a685a18ba47848b9f5a72044f80326b5def307fcaa4a7dacf0979fd21c10b5425f07d8dfe27a366b0583e65939ad1ee187de85e9b01e6 SHA512 74617887c870236e3eba3380a0a0669492cb3f53f85f8e2365dac06fec9319accf844cd198a3c4d5e4524543fed7157b22c1b7e940cfabd45704718801b6216c MISC metadata.xml 246 BLAKE2B a95774ec5f588845ea4765db8b51d75fe0b71c04129ddfba9706afca19ebf4fcefa5bcee0c71b295d270de24e8942142d2af9449a46b7407cfc24a5797fb6885 SHA512 b9fd89855ed25a0b766566521a33295c6d3f4469ba31da9fed2d4f133d3c56b1a59e7c4cc66171ebf6c8a9137ccded19a942072f80dcded8b7efcf0912fdfce1 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 } |