diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-03-01 18:08:18 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-03-01 18:08:18 +0000 |
| commit | 4db692ec822dddaef6fcd3d04812eb0a4e77ac78 (patch) | |
| tree | 7a59ebe7e5adb9de41890179e0c9e00f2c5128f7 | |
| parent | stable x86; bug 168836 (diff) | |
| download | gentoo-2-4db692ec822dddaef6fcd3d04812eb0a4e77ac78.tar.gz gentoo-2-4db692ec822dddaef6fcd3d04812eb0a4e77ac78.tar.bz2 gentoo-2-4db692ec822dddaef6fcd3d04812eb0a4e77ac78.zip | |
Reverting renaming, it breaks cplay, thanks to drac for pointing that quickly
(Portage version: 2.1.2-r12)
| -rw-r--r-- | media-sound/splay/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/splay/splay-0.9.5.2.ebuild | 19 |
2 files changed, 6 insertions, 18 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 <aballier@gentoo.org> splay-0.9.5.2.ebuild: + Reverting renaming, it breaks cplay, thanks to drac for pointing that quickly 01 Mar 2007; Alexis Ballier <aballier@gentoo.org> splay-0.9.5.2.ebuild: Prevent collisions with media-sound/mp3blaster, bug #148293 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" -} |