Version bump.

(Portage version: 2.1.4)

7 files changed, 15 insertions, 92 deletions

diff --git a/media-sound/dir2ogg/ChangeLog b/media-sound/dir2ogg/ChangeLog
index ad1b21f18288..d3a320392483 100644
--- a/media-sound/dir2ogg/ChangeLog
+++ b/media-sound/dir2ogg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/dir2ogg
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/ChangeLog,v 1.22 2007/12/12 17:33:32 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/ChangeLog,v 1.23 2008/01/27 14:31:12 drac Exp $
+
+*dir2ogg-0.11.1 (27 Jan 2008)
+
+  27 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  -files/dir2ogg-0.11-u1-01wav.patch, -dir2ogg-0.10.3.ebuild,
+  -dir2ogg-0.11.ebuild, +dir2ogg-0.11.1.ebuild:
+  Version bump.
 
 *dir2ogg-0.11 (12 Dec 2007)
 
diff --git a/media-sound/dir2ogg/dir2ogg-0.10.3.ebuild b/media-sound/dir2ogg/dir2ogg-0.10.3.ebuild
deleted file mode 100644
index f3845c40ca6e..000000000000
--- a/media-sound/dir2ogg/dir2ogg-0.10.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.10.3.ebuild,v 1.1 2007/11/11 17:25:09 drac Exp $
-
-DESCRIPTION="Converts Mp3, M4a, Wma, and Wav files to Ogg Vorbis format."
-HOMEPAGE="http://jak-linux.org/projects/dir2ogg"
-SRC_URI="http://jak-linux.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="aac wma"
-
-DEPEND=""
-RDEPEND="virtual/python
-	dev-python/pyid3lib
-	media-sound/vorbis-tools
-	>=media-libs/mutagen-1.11
-	|| ( media-sound/mpg321 media-sound/mpg123 )
-	aac? ( media-libs/faad2 )
-	wma? ( media-video/mplayer )"
-
-src_install() {
-	dobin dir2ogg
-	doman dir2ogg.1
-	dodoc NEWS README
-}
diff --git a/media-sound/dir2ogg/dir2ogg-0.11.ebuild b/media-sound/dir2ogg/dir2ogg-0.11.1.ebuild
index f7ce16848302..ca3c404caf63 100644
--- a/media-sound/dir2ogg/dir2ogg-0.11.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.11.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.11.ebuild,v 1.1 2007/12/12 17:33:32 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.11.1.ebuild,v 1.1 2008/01/27 14:31:12 drac Exp $
 
-inherit eutils versionator
+inherit versionator
 
 MY_PR=$(get_version_component_range 1-2 ${PV})
 
@@ -24,12 +24,6 @@ RDEPEND="virtual/python
 	aac? ( media-libs/faad2 )
 	wma? ( media-video/mplayer )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-u1-01wav.patch
-}
-
 src_install() {
 	dobin dir2ogg
 	doman dir2ogg.1
diff --git a/media-sound/dir2ogg/files/digest-dir2ogg-0.10.3 b/media-sound/dir2ogg/files/digest-dir2ogg-0.10.3
deleted file mode 100644
index 99bb54da6545..000000000000
--- a/media-sound/dir2ogg/files/digest-dir2ogg-0.10.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2a791bcfaf01ead6d10a43e42cbf7edd dir2ogg-0.10.3.tar.gz 14683
-RMD160 bf20139bc60b8076ae4fd71508dbf19366e7469e dir2ogg-0.10.3.tar.gz 14683
-SHA256 3127d865dc81ec3753206ad6eb78a3cf938b437991b38483e6e81577908da06c dir2ogg-0.10.3.tar.gz 14683
diff --git a/media-sound/dir2ogg/files/digest-dir2ogg-0.11 b/media-sound/dir2ogg/files/digest-dir2ogg-0.11
deleted file mode 100644
index 39b71d891533..000000000000
--- a/media-sound/dir2ogg/files/digest-dir2ogg-0.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5feaf13de5af7bc7ec5208906d7eba0f dir2ogg-0.11.tar.gz 18331
-RMD160 58064296ea25d52eeb8aca5a0e48584667ad4fe2 dir2ogg-0.11.tar.gz 18331
-SHA256 734653b761c64e84df217da0284bf4c3ee1dd4befc03663e0c4377dd884fed78 dir2ogg-0.11.tar.gz 18331
diff --git a/media-sound/dir2ogg/files/digest-dir2ogg-0.11.1 b/media-sound/dir2ogg/files/digest-dir2ogg-0.11.1
new file mode 100644
index 000000000000..ae870efc7f58
--- /dev/null
+++ b/media-sound/dir2ogg/files/digest-dir2ogg-0.11.1
@@ -0,0 +1,3 @@
+MD5 67fe28061c1759eb5dd8a867a152ad74 dir2ogg-0.11.1.tar.gz 18468
+RMD160 8f0c7e955c7ce23ea0219a933f9326e97ce16f7d dir2ogg-0.11.1.tar.gz 18468
+SHA256 d917bdc501e73e690ac931978323b4dc432ee5aa64a1be19a5c24cd3a85b73c4 dir2ogg-0.11.1.tar.gz 18468
diff --git a/media-sound/dir2ogg/files/dir2ogg-0.11-u1-01wav.patch b/media-sound/dir2ogg/files/dir2ogg-0.11-u1-01wav.patch
deleted file mode 100644
index ee2bdd91111f..000000000000
--- a/media-sound/dir2ogg/files/dir2ogg-0.11-u1-01wav.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-=== modified file 'dir2ogg'
---- dir2ogg	2007-11-25 15:28:55 +0000
-+++ dir2ogg	2007-12-09 20:31:12 +0000
-@@ -38,13 +38,14 @@
- from optparse import OptionParser
- from subprocess import Popen, call, PIPE
- 
--__version__ = '0.11'
--__date__    = '2007-11-25'
-+__version__ = '0.11.1'
-+__date__    = '2007-12-10'
- 
- FILTERS = {'mp3': ('*.mp3',),
-            'm4a': ('*.aac', '*.m4a', '*.mp4'),
-            'wma': ('*.asf', '*.wma', '*.wmf'),
-            'flac': ('*.flac',),
-+           'wav': ('*.wav', ),
-            }
- 
- def mmatch(names, patterns, rbool=True):
-@@ -124,7 +125,7 @@
-         if getattr(options, 'convert_' + ext):
-             options.filters += pat
-         # Missing decoders
--        if getattr(options, 'convert_' + ext) and not getattr(options, ext + '_decoder'):
-+        if ext != 'wav' and getattr(options, 'convert_' + ext) and not getattr(options, ext + '_decoder'):
-             fatal('%s was enabled, but no decoder has been found.' % ext)
- 
-     if len(args) == 0 and not options.cdda:
-@@ -290,7 +291,7 @@
-         self.songwav = song_root + 'wav'
-         self.songogg = song_root + 'ogg'
-         for ext, pat in FILTERS.items():
--            if mmatch(self.song, pat):
-+            if mmatch(self.song, pat) and ext != 'wav':
-                 self.decoder = getattr(self.conf, ext + '_decoder')
-                 getattr(self, 'grab_%s_tags' % ext)()
-             if ext == 'mp3' and self.conf.smart_mp3:
-@@ -387,7 +388,7 @@
-                 import traceback
-                 traceback.print_exc()
-                 return False
--        else:
-+        elif self.songwav != self.song or 'cd-' in self.decoder:
-             warn('No tags found...')
- 
-         if self.conf.delete_input:
-