Fix 174811 and remove old 1.4 version

Package-Manager: portage-2.1.2.2

6 files changed, 27 insertions, 73 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/Manifest b/app-cdr/bashburn/Manifest
index 687bc6d6693d..2792c38dbe9e 100644
--- a/app-cdr/bashburn/Manifest
+++ b/app-cdr/bashburn/Manifest
@@ -1,12 +1,7 @@
-DIST BashBurn-1.4.tar.gz 38549 RMD160 6bda42ce05a91e7b40439c1890f5fa66b09ce108 SHA1 beae094bc487c39be4893e5b678536026e37a1f6 SHA256 7f2a63a6a666993ac29840eb2d8708ca98928f175e93d60d1e701aec0700fcfd
 DIST BashBurn-1.5.2.tar.gz 42615 RMD160 8a28acf613f0b1fd088a02f4c7acb1a6647bac40 SHA1 60e06bf5017ac7f92be2810c0ee6ff821605b101 SHA256 84309073964271cfe21588a2a7eb93ed7a34eaf2fa2efdafbd0dc61d9423c860
 DIST BashBurn-1.8.0.tar.gz 71420 RMD160 8168bc64bfd1594c8d6030944747b6a1b1d0f206 SHA1 cb7358e36180edc36068e947d3020947113819f9 SHA256 4343788a3021ee168c168cc02126ccb97932386eb821cf65785c41d84a7ab5cb
 DIST BashBurn-1.8.5.tar.gz 81623 RMD160 410643b498228970350e00f650d00fff78975b95 SHA1 4f9c4e6d994b7abc34108a40e1043e89e1f8286c SHA256 7bfda8f06b4069f984cff6c31b2dfcea402cabf6e7fc1b5f17c89fae19dfe87f
 DIST BashBurn-2.0.tar.gz 94548 RMD160 2380aec59b2c06b2abbd4c737f1c2704d3831bc3 SHA1 31c4f33da40d1504e46c68c8ae806006b050b736 SHA256 a7e4aa502e86278170dc4cff4b5c1e6b580c5e3a68a0cd0d3fe01eb7383af0d5
-EBUILD bashburn-1.4.ebuild 1142 RMD160 674441121656fca12dcbe5a76735444b8c92b06a SHA1 be33b1a5ed6cf05e17f0bcff949a0494054107fa SHA256 d04e00e7165065388b567413ac4c437f085f859e27c391fd3d9d1b41924b33b7
-MD5 45eb13efae51a3f5b984e2cd532c62f0 bashburn-1.4.ebuild 1142
-RMD160 674441121656fca12dcbe5a76735444b8c92b06a bashburn-1.4.ebuild 1142
-SHA256 d04e00e7165065388b567413ac4c437f085f859e27c391fd3d9d1b41924b33b7 bashburn-1.4.ebuild 1142
 EBUILD bashburn-1.5.2.ebuild 1218 RMD160 d05835668afa005ab68aa69b61262ea168a81dc2 SHA1 3655c84b22ca2f7c692bffcf2545510ec5562326 SHA256 6c0c0a6dacbaedb7b15170fc8b2a5b42c88ec41b16ae21476092082bc3de9cb0
 MD5 e80c463ff572a019659e15bee81d169e bashburn-1.5.2.ebuild 1218
 RMD160 d05835668afa005ab68aa69b61262ea168a81dc2 bashburn-1.5.2.ebuild 1218
@@ -19,21 +14,18 @@ EBUILD bashburn-1.8.5.ebuild 1280 RMD160 10f6ce4a1b1bc34e6143bb27f9670555d99f828
 MD5 8a7d37b2781aeb8850d8df3abff316dd bashburn-1.8.5.ebuild 1280
 RMD160 10f6ce4a1b1bc34e6143bb27f9670555d99f828f bashburn-1.8.5.ebuild 1280
 SHA256 a067ceb5bb5e003739511a1294a40bddc5adcfe6e624b30bd72c0201427ad477 bashburn-1.8.5.ebuild 1280
-EBUILD bashburn-2.0.ebuild 1280 RMD160 b5aeb98af7bae7f8c5b24e514775f7caf0b1d04f SHA1 ac8c4edf53721184502e50f0ddab203e352c066f SHA256 583a3ab48e054f2b83ca6e0e184cebbef389514875c100bfd843a379fa78ceac
-MD5 5258de7537fab8cfe1089df9afff73bb bashburn-2.0.ebuild 1280
-RMD160 b5aeb98af7bae7f8c5b24e514775f7caf0b1d04f bashburn-2.0.ebuild 1280
-SHA256 583a3ab48e054f2b83ca6e0e184cebbef389514875c100bfd843a379fa78ceac bashburn-2.0.ebuild 1280
-MISC ChangeLog 3198 RMD160 d0cfa67dede909a0e13ffade3a87479a3a3754b7 SHA1 3925502bf254135a3705e857cfb992ac26eee2f1 SHA256 2518445ecbcb09939fcdee9e3400fd589832500634b861affc1eb91256321426
-MD5 b880e069edd196bcb7ed7bc04a479594 ChangeLog 3198
-RMD160 d0cfa67dede909a0e13ffade3a87479a3a3754b7 ChangeLog 3198
-SHA256 2518445ecbcb09939fcdee9e3400fd589832500634b861affc1eb91256321426 ChangeLog 3198
+EBUILD bashburn-2.0-r1.ebuild 1288 RMD160 4ab27a033f08e78fa5dcd9bf3c95f65b2646a211 SHA1 2ba9d73caf1a4fcc292e4320f160cdf28cf84db8 SHA256 44de97fe857be56f4b130e5a57f6c5bc176a82eb40ba6314fe7ea13c29860a7d
+MD5 341419acec71238f182e45fdaff0dad0 bashburn-2.0-r1.ebuild 1288
+RMD160 4ab27a033f08e78fa5dcd9bf3c95f65b2646a211 bashburn-2.0-r1.ebuild 1288
+SHA256 44de97fe857be56f4b130e5a57f6c5bc176a82eb40ba6314fe7ea13c29860a7d bashburn-2.0-r1.ebuild 1288
+MISC ChangeLog 3623 RMD160 e0b84a918f9e3278fa2ce0fd36d07c6efda79bb6 SHA1 01c9eb4802bdcf0fcd3fd6974ce72b4fa173f5ec SHA256 36bdaf47adfae38a16b98f5de9b94c4ec2be7cc36024007e1ec77befebe1db84
+MD5 169c6ed72adefb2df8bef60a6124ab82 ChangeLog 3623
+RMD160 e0b84a918f9e3278fa2ce0fd36d07c6efda79bb6 ChangeLog 3623
+SHA256 36bdaf47adfae38a16b98f5de9b94c4ec2be7cc36024007e1ec77befebe1db84 ChangeLog 3623
 MISC metadata.xml 231 RMD160 9a61d16499ab21f754c3904158682cbdddd0ae35 SHA1 ebe89ab66443f96c0ac0de21c5bd52ee24250578 SHA256 da94d062b94da2f5565d99926d7a69bfa3d859c64f2d97cef5ed4a79be637ad9
 MD5 38daf016dba0b89ad685f5051b8264a5 metadata.xml 231
 RMD160 9a61d16499ab21f754c3904158682cbdddd0ae35 metadata.xml 231
 SHA256 da94d062b94da2f5565d99926d7a69bfa3d859c64f2d97cef5ed4a79be637ad9 metadata.xml 231
-MD5 f1d6929c7799b7bcab60e76c51bf9f88 files/digest-bashburn-1.4 235
-RMD160 92c6fecaf6dd32ca1b33c0c0028d13b06ca5cd23 files/digest-bashburn-1.4 235
-SHA256 a6b382e8b872e6c0446a7d62bcab8bb5927d7f413f4f1970944ee7a5a5f4bd04 files/digest-bashburn-1.4 235
 MD5 c2396fe729d911edb1c1f7f04f6b805f files/digest-bashburn-1.5.2 241
 RMD160 4e9204f8de7d356ea04f8a8c798777e8651e1ba2 files/digest-bashburn-1.5.2 241
 SHA256 9f1749ec866b1f1d61b642ab8f2134adfb43493768a85d8749e1b77022535c9b files/digest-bashburn-1.5.2 241
@@ -43,6 +35,6 @@ SHA256 ec28ee1244dad934a76bca5a5c292b78d6fb663e04888136a8eb0edce166259d files/di
 MD5 e68cb2c67cb31b4f6850f1227b683e3e files/digest-bashburn-1.8.5 241
 RMD160 66248a3f98b79b5be51b0d6a514f16fbdeb66e89 files/digest-bashburn-1.8.5 241
 SHA256 57c5d889f3271eb6075856a350a1378857eabb8d02b8a0746b6da708badf32b8 files/digest-bashburn-1.8.5 241
-MD5 d361febfef1095148760a0a055df9027 files/digest-bashburn-2.0 235
-RMD160 b2309b152f24c227d1007bc77e8effa927d3271b files/digest-bashburn-2.0 235
-SHA256 6631d7b5bae9ffcae7912619909516bea8f0e195951f34d09d8a30c9ffb78e44 files/digest-bashburn-2.0 235
+MD5 d361febfef1095148760a0a055df9027 files/digest-bashburn-2.0-r1 235
+RMD160 b2309b152f24c227d1007bc77e8effa927d3271b files/digest-bashburn-2.0-r1 235
+SHA256 6631d7b5bae9ffcae7912619909516bea8f0e195951f34d09d8a30c9ffb78e44 files/digest-bashburn-2.0-r1 235
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