Install splay bin and man as splay_mp3blaster to prevent collisions with media-sound...

Package-Manager: portage-2.1.2-r12

diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog
index 998476a44a3ccf0c89105e1ee00a794cbd860ee1..f2b91e2acf773103090563946b518bd71b1ef1b9 100644 (file)
--- a/media-sound/mp3blaster/ChangeLog
+++ b/media-sound/mp3blaster/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mp3blaster
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.27 2006/12/11 19:41:57 beandog Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.28 2007/03/01 18:54:46 aballier Exp $
+
+  01 Mar 2007; Alexis Ballier <aballier@gentoo.org> mp3blaster-3.2.0.ebuild,
+  mp3blaster-3.2.3.ebuild:
+  Install splay bin and man as splay_mp3blaster to prevent collisions with
+  media-sound/splay
 
 *mp3blaster-3.2.3 (11 Dec 2006)
 

diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index 429277176f86598228351ef0c8f9a13559e12da6..840e58665688bc422d2a24590d15bc9ac8e21bf3 100644 (file)
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST mp3blaster-3.2.0.tar.gz 312991 RMD160 462c75e27c91ac7473103bd0e08882bea3d0db8d SHA1 edc4538ad233270dd4b17066c5d2267708f1b5e0 SHA256 723b4674980e378efe07e097cf909894852054dd52d44f3d6f948d847c940815
 DIST mp3blaster-3.2.3.tar.gz 333477 RMD160 e899b6beb79e6483390aa9a65471db76ea17c759 SHA1 33d0b4281b3547517045a5cf5e39372f2995d43c SHA256 6dae6f0a018010fbf65985eb03684c3da8ef5024edfc80cace22162377c96f2d
-EBUILD mp3blaster-3.2.0.ebuild 1424 RMD160 d32b543999fe0c5cce5fe8fadc797e0787e6dcf7 SHA1 965259c588090b536000218e56aa03fff4fc07d3 SHA256 40a0526ae17af0b6c66a884beee8665760a40eb6828c20e64d4c7995641c2a62
-MD5 581f36ebb984dbf448b836c22c0d45e0 mp3blaster-3.2.0.ebuild 1424
-RMD160 d32b543999fe0c5cce5fe8fadc797e0787e6dcf7 mp3blaster-3.2.0.ebuild 1424
-SHA256 40a0526ae17af0b6c66a884beee8665760a40eb6828c20e64d4c7995641c2a62 mp3blaster-3.2.0.ebuild 1424
-EBUILD mp3blaster-3.2.3.ebuild 1164 RMD160 d62296065faa70c9a045c3afaa502f32c7a09c39 SHA1 a3b7c26ae9fa4c6042dda2f927703118970a6555 SHA256 085871f3e89257d708e56e28142aca01f84f5184566146a4a68f76fd86068800
-MD5 e40f53aeaa2007d147a4190a6f02db0e mp3blaster-3.2.3.ebuild 1164
-RMD160 d62296065faa70c9a045c3afaa502f32c7a09c39 mp3blaster-3.2.3.ebuild 1164
-SHA256 085871f3e89257d708e56e28142aca01f84f5184566146a4a68f76fd86068800 mp3blaster-3.2.3.ebuild 1164
-MISC ChangeLog 3828 RMD160 f28d487468465b5f79481974c80348f4f3e28487 SHA1 5b5c653f2ffc3dc2cc192c4d94e154bc6635a17a SHA256 af4b0cbae1dc4518893277c45d22924fa1e0558d61d52672df198718b5e195d2
-MD5 7297e44ee55c1ceaddc05483ee53631c ChangeLog 3828
-RMD160 f28d487468465b5f79481974c80348f4f3e28487 ChangeLog 3828
-SHA256 af4b0cbae1dc4518893277c45d22924fa1e0558d61d52672df198718b5e195d2 ChangeLog 3828
+EBUILD mp3blaster-3.2.0.ebuild 1782 RMD160 d876df9828a40c1f1de361b7b466f68f8306e84b SHA1 fccff7d6215df3cc7e05521d42347132bf0d35c9 SHA256 2d9bcc7d07ea90f203df3ccb158c4a121985c8309232496bb3a30a3a580e41d5
+MD5 ccb2b9344fe60ddd94d2d3bd849b7b00 mp3blaster-3.2.0.ebuild 1782
+RMD160 d876df9828a40c1f1de361b7b466f68f8306e84b mp3blaster-3.2.0.ebuild 1782
+SHA256 2d9bcc7d07ea90f203df3ccb158c4a121985c8309232496bb3a30a3a580e41d5 mp3blaster-3.2.0.ebuild 1782
+EBUILD mp3blaster-3.2.3.ebuild 1520 RMD160 c871cba5c69e3f40b8a7b243b9e0e9562a146871 SHA1 0f950e218ba1c728b2553bbddf76f72a4a51c34f SHA256 6b2d28b7feea8fe8210c4720c9b690a23fe4737c19397211c7e32a629d1d2f4a
+MD5 c35c0aa9ebe617047150cf3b9213546d mp3blaster-3.2.3.ebuild 1520
+RMD160 c871cba5c69e3f40b8a7b243b9e0e9562a146871 mp3blaster-3.2.3.ebuild 1520
+SHA256 6b2d28b7feea8fe8210c4720c9b690a23fe4737c19397211c7e32a629d1d2f4a mp3blaster-3.2.3.ebuild 1520
+MISC ChangeLog 4029 RMD160 348b481e6ffafe05da48ed358747a4cbfd26d7ed SHA1 3029730d2ec0ba93c60aec920210d250cb957d1c SHA256 d161bca53aaaf4380a0c2094ed8fc5df41c5542eac6c0da2adbd1a0457713955
+MD5 8b4b41f5b415eacb930eb8cbff42ba6b ChangeLog 4029
+RMD160 348b481e6ffafe05da48ed358747a4cbfd26d7ed ChangeLog 4029
+SHA256 d161bca53aaaf4380a0c2094ed8fc5df41c5542eac6c0da2adbd1a0457713955 ChangeLog 4029
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -22,3 +25,10 @@ SHA256 7bc737d5812d0bbdc32f7b3b503c34605e9b19f415caa48f15945377fbd398db files/di
 MD5 87556a0902d642f44f32e98f0f6fd7e0 files/digest-mp3blaster-3.2.3 250
 RMD160 f7f31cac1403f456e190d6d7a36ee2e09f2bf114 files/digest-mp3blaster-3.2.3 250
 SHA256 d3b88b27fe0396ab7d869ac13623e9649213db898bc4c423663fb4d954ec56a7 files/digest-mp3blaster-3.2.3 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF5yF9vFcC4BYPU0oRAnDnAJ9ViwQjJwz8mJ9wOjN/ienOtw57agCfVXIo
+fCGOarFaM9WoXTrzPG5XIG4=
+=gDko
+-----END PGP SIGNATURE-----

diff --git a/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
index 69e85777194f42d94c30ae84cc0a918d2b4f8520..1018004ebbd07d55ce6bf40e67468a1ec00321ac 100644 (file)
--- a/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.13 2006/11/23 17:42:23 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.14 2007/03/01 18:54:46 aballier Exp $
 
 inherit toolchain-funcs
 
@@ -32,6 +32,10 @@ src_unpack() {
 
 src_compile() {
        local myconf
+       # Prevents collisions with media-sound/splay
+       sed -i "s/splay.1/splay_mp3blaster.1/" Makefile.in\
+               || die "sedding makefile failed"
+       mv splay.1 splay_mp3blaster.1 || die "renaming splay man failed"
        ### Looks like NAS support is broken, at least with NAS 1.5 and
        ### mp3player 3.1.1 (Aug 13, agenkin@thpoon.com)
        ### Ditto nas-1.6c-r1, mp3blaster-3.2.0 (2004.06.23 - eradicator)
@@ -46,5 +50,8 @@ src_compile() {
 
 src_install() {
        make DESTDIR="${D}" install || die
+       # Prevent collisions with media-sound/splay
+       mv "${D}/usr/bin/splay" "${D}/usr/bin/splay_mp3blaster"\
+               || die "moving splay to splay_mp3blaster failed"
        dodoc ANNOUNCE AUTHORS CREDITS ChangeLog FAQ NEWS README TODO
 }

diff --git a/media-sound/mp3blaster/mp3blaster-3.2.3.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.3.ebuild
index 5eea82bf274e3ee2b943871449ce2fc3527460ec..0136543d8cb97037761385aa6d33614655b8b635 100644 (file)
--- a/media-sound/mp3blaster/mp3blaster-3.2.3.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.3.ebuild,v 1.1 2006/12/11 19:41:57 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.3.ebuild,v 1.2 2007/03/01 18:54:46 aballier Exp $
 
 inherit toolchain-funcs
 
@@ -20,6 +20,10 @@ DEPEND=">=sys-libs/ncurses-5.2
 
 src_compile() {
        local myconf
+       # Prevents collisions with media-sound/splay
+       sed -i "s/splay.1/splay_mp3blaster.1/" Makefile.in\
+               || die "sedding makefile failed"
+       mv splay.1 splay_mp3blaster.1 || die "renaming splay man failed"
        ### Looks like NAS support is broken, at least with NAS 1.5 and
        ### mp3player 3.1.1 (Aug 13, agenkin@thpoon.com)
        ### Ditto nas-1.6c-r1, mp3blaster-3.2.0 (2004.06.23 - eradicator)
@@ -33,6 +37,9 @@ src_compile() {
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die
+       emake DESTDIR="${D}" install || die
+       # Prevent collisions with media-sound/splay
+       mv "${D}/usr/bin/splay" "${D}/usr/bin/splay_mp3blaster"\
+               || die "moving splay to splay_mp3blaster failed"
        dodoc ANNOUNCE AUTHORS CREDITS ChangeLog FAQ NEWS README TODO
 }