From d4bd68de73b01718c25f236e9a2b4c308d308d8b Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 1 Mar 2007 17:31:44 +0000 Subject: [PATCH] Prevent collisions with media-sound/mp3blaster, bug #148293 Package-Manager: portage-2.1.2-r12 --- media-sound/splay/ChangeLog | 5 ++++- media-sound/splay/Manifest | 26 ++++++++++++++++++-------- media-sound/splay/splay-0.9.5.2.ebuild | 21 ++++++++++++++++++--- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/media-sound/splay/ChangeLog b/media-sound/splay/ChangeLog index 15b3814a990e..78ae402a17e0 100644 --- a/media-sound/splay/ChangeLog +++ b/media-sound/splay/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/splay # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.13 2007/02/22 01:25:42 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.14 2007/03/01 17:31:44 aballier Exp $ + + 01 Mar 2007; Alexis Ballier splay-0.9.5.2.ebuild: + Prevent collisions with media-sound/mp3blaster, bug #148293 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest index 036ff151d134..bc45d051f248 100644 --- a/media-sound/splay/Manifest +++ b/media-sound/splay/Manifest @@ -1,16 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX splay-0.9.5.2-external-id3lib.diff 618 RMD160 34fcd4c882585f6015b538193d486c46653e763d SHA1 060fae06b2495cbbc268462a36aff136534d3763 SHA256 45323b85ed9a78b84a8fc116ade959942f9065384a14a45209cfb872507e4316 MD5 79fd2bcd5390d2bf54d6e7fabd2fc367 files/splay-0.9.5.2-external-id3lib.diff 618 RMD160 34fcd4c882585f6015b538193d486c46653e763d files/splay-0.9.5.2-external-id3lib.diff 618 SHA256 45323b85ed9a78b84a8fc116ade959942f9065384a14a45209cfb872507e4316 files/splay-0.9.5.2-external-id3lib.diff 618 DIST splay-0.9.5.2.tar.gz 105510 RMD160 a79d0b429b3e73793c51ad071804e6d6362a6ad4 SHA1 a0638c96b8c9a38da026c957979fe3ec3c560f14 SHA256 38266b7620e8dde9ca39ace245ded4d9fadc3ea9e35772190fcfe90efe8d39bd -EBUILD splay-0.9.5.2.ebuild 936 RMD160 6ae0dfb6b723af0c3e6c0112a97edd8c818e42d9 SHA1 439fd4573598afe1d88982aa5bfef1f66cd5d734 SHA256 12ef83a40c582ed9dcdc25f357655c674681e0389621ee6dde22a82e0de6d9a3 -MD5 521b208de7c550ccfedb4c08659f75bc splay-0.9.5.2.ebuild 936 -RMD160 6ae0dfb6b723af0c3e6c0112a97edd8c818e42d9 splay-0.9.5.2.ebuild 936 -SHA256 12ef83a40c582ed9dcdc25f357655c674681e0389621ee6dde22a82e0de6d9a3 splay-0.9.5.2.ebuild 936 -MISC ChangeLog 1277 RMD160 e1d3cc05707b5da73b32f53d04eacef6cbf5eebb SHA1 2db14dfa35e5a5a95f7d414d8acd5bf26e9e8e86 SHA256 2268628b8d1ec39ec93870ae5b6172e699f3a0e9ccc3343c1e13575f04e52a36 -MD5 6f73bf0dfd0539c28626b7105587195b ChangeLog 1277 -RMD160 e1d3cc05707b5da73b32f53d04eacef6cbf5eebb ChangeLog 1277 -SHA256 2268628b8d1ec39ec93870ae5b6172e699f3a0e9ccc3343c1e13575f04e52a36 ChangeLog 1277 +EBUILD splay-0.9.5.2.ebuild 1468 RMD160 5db453fe15d1e953825df9752ae7c46f53e4d671 SHA1 38147f8f85750ee0649ed32c0c37793209410429 SHA256 54396d35c3d3b23cebd65c43a96f001ed6cebaa23eb027d8d3b38161078786ae +MD5 265ba5ec0f7276c2fbd27f011cdd2a0c splay-0.9.5.2.ebuild 1468 +RMD160 5db453fe15d1e953825df9752ae7c46f53e4d671 splay-0.9.5.2.ebuild 1468 +SHA256 54396d35c3d3b23cebd65c43a96f001ed6cebaa23eb027d8d3b38161078786ae splay-0.9.5.2.ebuild 1468 +MISC ChangeLog 1417 RMD160 cad2a94aa3f5f729b26873f898d84358d1d60af3 SHA1 2a28bd1f9d80a7a512bb222820467b69e6a04ddf SHA256 3e14f60e86d0612307ed9df380b00db7e8f024142331ac67a3201aab3d402b8f +MD5 fce91293c66b1732fd6a33688be6c5d5 ChangeLog 1417 +RMD160 cad2a94aa3f5f729b26873f898d84358d1d60af3 ChangeLog 1417 +SHA256 3e14f60e86d0612307ed9df380b00db7e8f024142331ac67a3201aab3d402b8f ChangeLog 1417 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 @@ -18,3 +21,10 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata MD5 6c62326d4c0eb39c5b156dfa6d7a63a6 files/digest-splay-0.9.5.2 241 RMD160 b8eabd579ad459f248a133ff8c622e2d592d4aec files/digest-splay-0.9.5.2 241 SHA256 d14bd2be770fef027c180a7a94969b2d1e7355fd53eca901849766e04ec9b2c1 files/digest-splay-0.9.5.2 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF5w4GvFcC4BYPU0oRAqyQAJ0bYoWyy6O1m+k07HOULatswQIq2QCeNJGG +pC/aKKJPqO+DWi7MsN/xchQ= +=Rvre +-----END PGP SIGNATURE----- diff --git a/media-sound/splay/splay-0.9.5.2.ebuild b/media-sound/splay/splay-0.9.5.2.ebuild index 5937bb57f9b1..659617563f4a 100644 --- a/media-sound/splay/splay-0.9.5.2.ebuild +++ b/media-sound/splay/splay-0.9.5.2.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/splay/splay-0.9.5.2.ebuild,v 1.15 2006/03/07 15:53:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/splay-0.9.5.2.ebuild,v 1.16 2007/03/01 17:31:44 aballier Exp $ inherit eutils @@ -21,6 +21,11 @@ src_unpack() { } src_compile() { + # Prevent collisions with media-sound/mp3blaster + # bug #148293 + mv "apps/splay.1" "apps/osplay.1" || die "moving man failed" + sed -i "s/splay.1/osplay.1/" apps/Makefile.in\ + || die "sedding makefile failed" # Force compilation to omit X support according to BUG #5856 # even when qt is present on the system. export ac_cv_lib_qt_main=no @@ -30,6 +35,16 @@ src_compile() { src_install() { # Specify man-page to prevent xsplay.1 from being installed - einstall man_MANS=splay.1 || die "einstall failed" + einstall man_MANS=osplay.1 || die "einstall failed" + #rename splay so that it does not collide with media-sound/mp3blaster + # bug #148293 + mv "${D}/usr/bin/splay" "${D}/usr/bin/osplay"\ + || die "moving splay executable failed" + dodoc AUTHORS ChangeLog README README.LIB NEWS } + +pkg_postinst() { + elog "Please note that splay has been renamed to osplay" + elog "in order to prevent collisions with media-sound/mp3blaster" +} -- 2.26.2