Fix 174811 and remove old 1.4 version

(Portage version: 2.1.2.2)

5 files changed, 16 insertions, 54 deletions

diff --git a/app-cdr/bashburn/ChangeLog b/app-cdr/bashburn/ChangeLog
index 1a730c75f913..323a64f0c86b 100644
--- a/app-cdr/bashburn/ChangeLog
+++ b/app-cdr/bashburn/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-cdr/bashburn
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/ChangeLog,v 1.24 2007/05/12 17:59:13 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/ChangeLog,v 1.25 2007/05/15 00:09:48 mjolnir Exp $
+
+  15 May 2007; Martin Jackson <mjolnir@gentoo.org> -bashburn-1.4.ebuild,
+  -bashburn-2.0.ebuild, +bashburn-2.0-r1.ebuild:
+  Remove obsolete version while here
+
+  15 May 2007; Martin Jackson <mjolnir@gentoo.org> -bashburn-2.0.ebuild,
+  +bashburn-2.0-r1.ebuild:
+  Fix to #178411, remove bad version
+
+*bashburn-2.0-r1 (14 May 2007)
+
+  14 May 2007;  <>  bashburn-2.0-r1.ebuild files/digest-bashburn-2.0-r1
+  # INSERT ENTRY HERE
 
 *bashburn-2.0 (12 May 2007)
 
diff --git a/app-cdr/bashburn/bashburn-1.4.ebuild b/app-cdr/bashburn/bashburn-1.4.ebuild
deleted file mode 100644
index ae20f4dc6811..000000000000
--- a/app-cdr/bashburn/bashburn-1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/bashburn-1.4.ebuild,v 1.11 2006/09/17 03:38:53 pylon Exp $
-
-
-MY_P=${P//b/B}
-DESCRIPTION="cd burning shell script"
-HOMEPAGE="http://bashburn.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7
-	virtual/mpg123
-	media-sound/lame
-	media-sound/vorbis-tools
-	media-sound/normalize
-	media-libs/flac
-	virtual/eject"
-
-RDEPEND="app-shells/bash"
-
-src_compile() {
-	echo "Skipping Compile"
-}
-
-src_install() {
-	sed -i "s:export CONFFILE=/etc/bashburnrc:export CONFFILE=/etc/bashburn/bashburnrc:g" BashBurn.sh
-	sed -i "s:ROOTDIR\:.*:ROOTDIR\: /opt/BashBurn:g" bashburnrc
-
-	dodir /etc/bashburn
-	dodir /opt/BashBurn
-	dodir /usr/bin
-
-	mv {burning,config,convert,menus,misc} ${D}/opt/BashBurn
-
-	exeinto /opt/BashBurn
-	doexe BashBurn.sh || die
-	cp bashburnrc ${D}/etc/bashburn
-	ln -sf /opt/BashBurn/BashBurn.sh ${D}/usr/bin/bashburn
-
-	dodoc README HOWTO
-}
diff --git a/app-cdr/bashburn/bashburn-2.0.ebuild b/app-cdr/bashburn/bashburn-2.0-r1.ebuild
index 829505c81796..3875570f4e8a 100644
--- a/app-cdr/bashburn/bashburn-2.0.ebuild
+++ b/app-cdr/bashburn/bashburn-2.0-r1.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/app-cdr/bashburn/bashburn-2.0.ebuild,v 1.1 2007/05/12 17:59:13 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/bashburn-2.0-r1.ebuild,v 1.1 2007/05/15 00:09:48 mjolnir Exp $
 
 MY_P=BashBurn-${PV}
 
@@ -40,7 +40,7 @@ src_install() {
 	dodir /opt/BashBurn
 	dodir /usr/bin
 
-	mv {burning,config,convert,menus,misc,lang} ${D}/opt/BashBurn
+	mv {burning,config,convert,func,menus,misc,lang} ${D}/opt/BashBurn
 
 	exeinto /opt/BashBurn
 	doexe BashBurn.sh || die
diff --git a/app-cdr/bashburn/files/digest-bashburn-1.4 b/app-cdr/bashburn/files/digest-bashburn-1.4
deleted file mode 100644
index 93b58839e48a..000000000000
--- a/app-cdr/bashburn/files/digest-bashburn-1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ec9adf09017a387f4cafb46c362bed25 BashBurn-1.4.tar.gz 38549
-RMD160 6bda42ce05a91e7b40439c1890f5fa66b09ce108 BashBurn-1.4.tar.gz 38549
-SHA256 7f2a63a6a666993ac29840eb2d8708ca98928f175e93d60d1e701aec0700fcfd BashBurn-1.4.tar.gz 38549
diff --git a/app-cdr/bashburn/files/digest-bashburn-2.0 b/app-cdr/bashburn/files/digest-bashburn-2.0-r1
index 0180b855f151..0180b855f151 100644
--- a/app-cdr/bashburn/files/digest-bashburn-2.0
+++ b/app-cdr/bashburn/files/digest-bashburn-2.0-r1