From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 9 Jan 2012 18:44:24 +0000 (+0000)
Subject: Rework the documentation installation entirely
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bdcf583ad7fe4c7209e2080571dd22f899d0f7bd;p=gentoo.git

Rework the documentation installation entirely

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
---

diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog
index c7d73b7ff540..cf8d245218fa 100644
--- a/media-sound/mp3blaster/ChangeLog
+++ b/media-sound/mp3blaster/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for media-sound/mp3blaster
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.53 2012/01/09 18:33:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.54 2012/01/09 18:44:24 ssuominen Exp $
 
   09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   mp3blaster-3.2.5-r1.ebuild:
-  Move /usr/share/mp3blaster/charmap/README to default documentation directory
-  as README.charmap
+  Move all documentation except commands.txt to the default documentation
+  directory; commands.txt is used at runtime (by src/main.cc)
 
 *mp3blaster-3.2.5-r1 (09 Jan 2012)
 
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index 5ab8d44f9769..bf3df0d9b71e 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -4,18 +4,18 @@ Hash: SHA1
 AUX mp3blaster-3.2.5-gcc44.patch 325 RMD160 5c803f8a5b39a968c27d34564d3eb240f2a02008 SHA1 933055e11482bf6c7083d13edf99dce9a2bd145e SHA256 6ea92fc75f7d3582ca0f65caba3953aa2070655c21639cb935611fddbd3349c8
 DIST mp3blaster-3.2.5.tar.gz 329407 RMD160 8aca362a6212a93cad26e428480b233766b1888b SHA1 6a0fc892e0739a409735e85b18089c0e25fcc577 SHA256 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29
 DIST mp3blaster_3.2.5-3.debian.tar.gz 11000 RMD160 e8b7f243f815e2ac47ccca5a2411c47db166ec1c SHA1 6239417fb78f61fbf2939e0725f0ba6afb18bca0 SHA256 e4d424aeccde6ccd219270f4e4f0bf8f70b97e13075447b6d6d069110ed092c9
-EBUILD mp3blaster-3.2.5-r1.ebuild 1664 RMD160 c17c380064e13828e302801915c657e7b0254a1d SHA1 700e906d833ecd11f4e3ef112fae9a577aaf1020 SHA256 af6239be7c79c599740bb7fe710ac192bbe7038b3b3ed77daa07c81ce4efa75b
+EBUILD mp3blaster-3.2.5-r1.ebuild 1725 RMD160 a44e2ac9058617b624986d6db9c38bcfd8027c71 SHA1 42f4ca8c4b00d8650eb8d986b9b9fc19b6d5f008 SHA256 df63fa628a12c40e99d0392b6af14333969ec5bd4a539c242fdd1be2d9af0f0e
 EBUILD mp3blaster-3.2.5.ebuild 1445 RMD160 4e99aff91253e95a82dd63508ee551bd4fa3e6c5 SHA1 3ff3810f5c8e467172926a71e5de7ba345bcc5a2 SHA256 b7a4df516f65b189363a0b71404ed61c0a816812a021fd561cb4103d218e4a7c
-MISC ChangeLog 7489 RMD160 7c06c11c5530c77966e9fae3052d2626467a3e2d SHA1 80d5baeba1701a9e5405d929a4da3e2fe338715f SHA256 9bf3c629cd9ad569206a6be827fcd792e85e22d148e74a352e2524d3cd5b489e
+MISC ChangeLog 7526 RMD160 876e59ea88539f9ccdf41b068846dc70699c70c5 SHA1 3ad8ef3056591ef0701284ef6a0f224d140c1693 SHA256 20d0404ac1433594775e7e014a7e7a053957d67f75f470c6b022d5f48711d452
 MISC metadata.xml 249 RMD160 053e31dbee7ebb042316ebe35284efda8a99ecf1 SHA1 00c981a528eff3ed991c5fd2e3f1ac0018fe82d2 SHA256 e31b65ec4e3e20698e1a4f52154b6fb1e9524c27b695547426ec369864612e03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPCzK9AAoJEEdUh39IaPFNO68H/0gGR/EFHmTG259Z6/1NkcfU
-nTJSrrktCVz8Frth04dYGdlrrgXcq7w9Io37025T8BlBDWnifc18C1OupeoGDqiT
-bGD2RuR+DmCIGK8zLg5VhK1ir+BIN2lsuaYSAWKuEGO0KnLfjIuIZZVZbghncSU/
-0CGF8dOHpUqVBNcB200wxom50h2LNNB+A0JKzqRdihhuf0zA8/Fd7o6H3I+CeBQh
-U8XeK7nRoYAIiy1u+1EnMh18HNL6XHtYprQ59Z1uOPa2n/TuLOSE7jmh6IeCwHdp
-hAeywjyGigCYmo4cj4GCa33EO4HYenrSNzeugTTfbjmonqYcyS0vshu4GkygvYY=
-=qegE
+iQEcBAEBAgAGBQJPCzU1AAoJEEdUh39IaPFNKzgH/0DgqQ6cq9b0oePXpVfuaKLy
+6WriJxoHhcB3FXqFb7k7cwaXypvUXsY/kE9ti84cCrpeCpDLzNRPxmv2CqauP1Nq
+07lnj8PjHz5nEjaK0E8juYFOBLT691ib8T13HIuxvA+cSRryDZKDsSGQW706DGvn
+CVxRLL9KQtRfuINhz8iWBljjl0RIOmUIkeiXeZRCh4GYhxs+xIKVK/hhlchmnkp/
+ZoXT8Qil9olDY4KkGugMDxKx8BGGfFWuVeWCCzkSfmycHNQ8+MU9I5r7sOsASkbV
++4bxZGXdEAkXXQPqAtsr5/AMLM9I1jbW/bO33yJUPF1dKruEiPXYwrZEuLihTyQ=
+=MUa/
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
index 82211670b3f0..3c9914f152a7 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild,v 1.2 2012/01/09 18:33:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild,v 1.3 2012/01/09 18:44:24 ssuominen Exp $
 
 EAPI=4
 inherit eutils
@@ -52,8 +52,8 @@ src_configure() {
 src_install() {
 	default
 
-	mv -vf "${ED}"usr/share/${PN}/charmap/README \
-		"${ED}"usr/share/doc/${PF}/README.charmap || die
+	# relocate everything except commands.txt because it's used by src/main.cc
+	mv -vf "${ED}"usr/share/${PN}/{charmap,sample.*} "${ED}"usr/share/doc/${PF} || die
 
 	# file collision with media-sound/splay
 	mv -vf "${ED}"usr/bin/splay{,_mp3blaster} || die