From 58f439125f892913dfa517d79405232a7de96da8 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 1 Mar 2007 18:08:18 +0000 Subject: [PATCH] Reverting renaming, it breaks cplay, thanks to drac for pointing that quickly Package-Manager: portage-2.1.2-r12 --- media-sound/splay/ChangeLog | 5 ++++- media-sound/splay/Manifest | 22 +++++++++++----------- media-sound/splay/splay-0.9.5.2.ebuild | 19 ++----------------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/media-sound/splay/ChangeLog b/media-sound/splay/ChangeLog index 78ae402a17e0..2288500ebf48 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.14 2007/03/01 17:31:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.15 2007/03/01 18:08:18 aballier Exp $ + + 01 Mar 2007; Alexis Ballier splay-0.9.5.2.ebuild: + Reverting renaming, it breaks cplay, thanks to drac for pointing that quickly 01 Mar 2007; Alexis Ballier splay-0.9.5.2.ebuild: Prevent collisions with media-sound/mp3blaster, bug #148293 diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest index bc45d051f248..872e23dfbf07 100644 --- a/media-sound/splay/Manifest +++ b/media-sound/splay/Manifest @@ -6,14 +6,14 @@ MD5 79fd2bcd5390d2bf54d6e7fabd2fc367 files/splay-0.9.5.2-external-id3lib.diff 61 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 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 +EBUILD splay-0.9.5.2.ebuild 935 RMD160 46015c08eeac590f6eb7ef95034e7f4448eaf68c SHA1 1e58c075f29524f6ed6dfdf38f14b5c770266965 SHA256 86b5016fc48559d46c2d8a44b2fd12ed8e65e4336bb9cd18838d1b2e5231d6c8 +MD5 6bc79f6e37578da0ef4fa4e293eee1ac splay-0.9.5.2.ebuild 935 +RMD160 46015c08eeac590f6eb7ef95034e7f4448eaf68c splay-0.9.5.2.ebuild 935 +SHA256 86b5016fc48559d46c2d8a44b2fd12ed8e65e4336bb9cd18838d1b2e5231d6c8 splay-0.9.5.2.ebuild 935 +MISC ChangeLog 1572 RMD160 c6268f410df79c3f640e3a9402fafeb3a20344dd SHA1 d867389080cba90cf429b8632a326d24aeff9fee SHA256 db7033d6eeac55e16d7d59e9b4d52af3fa1f82077ca0242545464e9404c65e79 +MD5 0bdebdf83cf05d5432fa15bdcb023575 ChangeLog 1572 +RMD160 c6268f410df79c3f640e3a9402fafeb3a20344dd ChangeLog 1572 +SHA256 db7033d6eeac55e16d7d59e9b4d52af3fa1f82077ca0242545464e9404c65e79 ChangeLog 1572 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 @@ -24,7 +24,7 @@ SHA256 d14bd2be770fef027c180a7a94969b2d1e7355fd53eca901849766e04ec9b2c1 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF5w4GvFcC4BYPU0oRAqyQAJ0bYoWyy6O1m+k07HOULatswQIq2QCeNJGG -pC/aKKJPqO+DWi7MsN/xchQ= -=Rvre +iD8DBQFF5xaXvFcC4BYPU0oRApklAJ9F37jMF9lWe+bdIBjaPzi2Po8xlQCgtGyn +qLSn7nBNQmuNvvoRSwxMKoQ= +=nETX -----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 659617563f4a..a5b25533f8d7 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-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.16 2007/03/01 17:31:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/splay-0.9.5.2.ebuild,v 1.17 2007/03/01 18:08:18 aballier Exp $ inherit eutils @@ -21,11 +21,6 @@ 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 @@ -35,16 +30,6 @@ src_compile() { src_install() { # Specify man-page to prevent xsplay.1 from being installed - 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" - + einstall man_MANS=splay.1 || die "einstall 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