media-sound/gmusicbrowser: migrate to EAPI=6 & git-r3 eclass (for 9999)

utilize 'doc' USE flag in stable version like in 9999,
fix double-slashing
Closes: https://github.com/gentoo/gentoo/pull/2661

Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r2.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r2.ebuild
index 8f43b04791448255bb4cee7d54954046858f4c88..3566bb3321c321855d43aa1ade3f6f6af95790b6 100644 (file)
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r2.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit fdo-mime gnome2-utils
 
@@ -13,7 +13,7 @@ SRC_URI="http://${PN}.org/download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus extras gstreamer libnotify mplayer"
+IUSE="dbus doc extras gstreamer libnotify mplayer"
 
 GSTREAMER_DEPEND="
        dev-perl/GStreamer
@@ -41,12 +41,12 @@ DEPEND="sys-devel/gettext"
 
 src_install() {
        emake \
-               DOCS="AUTHORS NEWS README" \
                DESTDIR="${D}" \
-               iconsdir="${D}/usr/share/icons/hicolor" \
+               iconsdir="${D%/}/usr/share/icons/hicolor" \
                install
 
-       dohtml layout_doc.html
+       use doc && local HTML_DOCS=( layout_doc.html )
+       einstalldocs
 }
 
 pkg_preinst() {

diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index d83ca18de9f94cea02651f5bf01c7996a83453af..6837cdab1c7cd881b35e57d6d9dd7fc5b6e6f8c8 100644 (file)
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils fdo-mime git-2 gnome2-utils
+inherit eutils fdo-mime git-r3 gnome2-utils
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="http://gmusicbrowser.org/"
@@ -46,12 +46,12 @@ src_compile() {
 
 src_install() {
        emake \
-               DOCS="AUTHORS NEWS README" \
                DESTDIR="${D}" \
-               iconsdir="${D}/usr/share/icons/hicolor" \
+               iconsdir="${D%/}/usr/share/icons/hicolor" \
                install
 
-       use doc && dohtml layout_doc.html
+       use doc && local HTML_DOCS=( layout_doc.html )
+       einstalldocs
 }
 
 pkg_preinst() {