Version bump.

Package-Manager: portage-2.1.4

8 files changed, 27 insertions, 116 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/Manifest b/media-sound/dir2ogg/Manifest
index 12f243550552..b9f72fe54a56 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,26 +1,17 @@
-AUX dir2ogg-0.11-u1-01wav.patch 1712 RMD160 90a5c2135c1737c13343eb0299635f29ae1ea9b0 SHA1 34d3e5b0532b5fb9d5de07faa270c7e2949c5496 SHA256 6599dc7a63fe293871b9e3b0c6b8127a497401df504f5c5e75122cc22735d406
-MD5 ef58e0a66037e3b27a83e9146b25173e files/dir2ogg-0.11-u1-01wav.patch 1712
-RMD160 90a5c2135c1737c13343eb0299635f29ae1ea9b0 files/dir2ogg-0.11-u1-01wav.patch 1712
-SHA256 6599dc7a63fe293871b9e3b0c6b8127a497401df504f5c5e75122cc22735d406 files/dir2ogg-0.11-u1-01wav.patch 1712
 DIST dir2ogg-0.10.2.tar.gz 14702 RMD160 98cee1cbc9d740281fa9c058da8c7145116976c0 SHA1 1bfe8d3f8a3c4abd26de1116dc7b40d0a2c9176d SHA256 6bae54bd36094c28041d2ca5b62ca6d333882611298374434551a3023659e7fc
-DIST dir2ogg-0.10.3.tar.gz 14683 RMD160 bf20139bc60b8076ae4fd71508dbf19366e7469e SHA1 698519d71792170eeb60eef0536bda85823ac832 SHA256 3127d865dc81ec3753206ad6eb78a3cf938b437991b38483e6e81577908da06c
-DIST dir2ogg-0.11.tar.gz 18331 RMD160 58064296ea25d52eeb8aca5a0e48584667ad4fe2 SHA1 326dfe81efca11dde6c824a1af08f00a037cb518 SHA256 734653b761c64e84df217da0284bf4c3ee1dd4befc03663e0c4377dd884fed78
+DIST dir2ogg-0.11.1.tar.gz 18468 RMD160 8f0c7e955c7ce23ea0219a933f9326e97ce16f7d SHA1 ab7a2e30d7dfd85642919a879b9501444e0b406b SHA256 d917bdc501e73e690ac931978323b4dc432ee5aa64a1be19a5c24cd3a85b73c4
 EBUILD dir2ogg-0.10.2.ebuild 758 RMD160 d381490618f62ba51bc72a390493c4d2abc0f63f SHA1 ca98b06d947140c6cd7495a6725b2cbea7114d1a SHA256 b55854f9fe2f603b0da555a2cb36a485236ada642c8ef218d7607e3d3500cddc
 MD5 9878b4956f33c2e274c17f5b2c183605 dir2ogg-0.10.2.ebuild 758
 RMD160 d381490618f62ba51bc72a390493c4d2abc0f63f dir2ogg-0.10.2.ebuild 758
 SHA256 b55854f9fe2f603b0da555a2cb36a485236ada642c8ef218d7607e3d3500cddc dir2ogg-0.10.2.ebuild 758
-EBUILD dir2ogg-0.10.3.ebuild 762 RMD160 8bc76b0aaaa1b7d556d812ec0296247e053964b0 SHA1 75621c6c33a8679d19deefeefa07a5abc6d11666 SHA256 a76305353f7cf73cc4aa9133380446a6812a4c8e4084872e8cbb567bfd4fcb40
-MD5 d9674b60cd5e45ef8d71df1956723da2 dir2ogg-0.10.3.ebuild 762
-RMD160 8bc76b0aaaa1b7d556d812ec0296247e053964b0 dir2ogg-0.10.3.ebuild 762
-SHA256 a76305353f7cf73cc4aa9133380446a6812a4c8e4084872e8cbb567bfd4fcb40 dir2ogg-0.10.3.ebuild 762
-EBUILD dir2ogg-0.11.ebuild 929 RMD160 9deaea9fa5c07d5ad7585f9d3f2a48eeb0f8a5ed SHA1 3272075d49d6373cf7998e6469be0ee8a460a19b SHA256 dbfabffd58a312dd8e532bdbe25a71332cdf4e0b35ea8257a740b1f36b2a321d
-MD5 566ad5abf6739b9326b5a6ee13afb234 dir2ogg-0.11.ebuild 929
-RMD160 9deaea9fa5c07d5ad7585f9d3f2a48eeb0f8a5ed dir2ogg-0.11.ebuild 929
-SHA256 dbfabffd58a312dd8e532bdbe25a71332cdf4e0b35ea8257a740b1f36b2a321d dir2ogg-0.11.ebuild 929
-MISC ChangeLog 3175 RMD160 6bbbefdadcd51d9d8d1c5bd24fc0230eaee4bb6d SHA1 c02661b81c50521b4afa0a9d0b23fc31222816ed SHA256 b610ac48eed8d29b163de96549ae56f85919f433642e096a62c939f3ef88b704
-MD5 03b894f11fe3ff39832af79023172ab6 ChangeLog 3175
-RMD160 6bbbefdadcd51d9d8d1c5bd24fc0230eaee4bb6d ChangeLog 3175
-SHA256 b610ac48eed8d29b163de96549ae56f85919f433642e096a62c939f3ef88b704 ChangeLog 3175
+EBUILD dir2ogg-0.11.1.ebuild 840 RMD160 4410e33452ccb59bc248ba9d6517f435cc9bdfc5 SHA1 a0edcbe9024cc730cdc14737045586f0f98abe80 SHA256 fa5c2eb8eaa09381b796cf42d16f1aefcc7a153513675687e18b483dc548cbdc
+MD5 055060c63294245e3127f21554ca8e14 dir2ogg-0.11.1.ebuild 840
+RMD160 4410e33452ccb59bc248ba9d6517f435cc9bdfc5 dir2ogg-0.11.1.ebuild 840
+SHA256 fa5c2eb8eaa09381b796cf42d16f1aefcc7a153513675687e18b483dc548cbdc dir2ogg-0.11.1.ebuild 840
+MISC ChangeLog 3382 RMD160 2409f53b5409cd5319699a48409739001a1c9627 SHA1 7f23900046cece8630374af29d0feaeed493ea66 SHA256 09b8d4a145f963d4581e3daa2ba7f6352a1dea7e3679b6ec8ce206fe5fbdd940
+MD5 a12586f603f354445e7dfa5486a1ade3 ChangeLog 3382
+RMD160 2409f53b5409cd5319699a48409739001a1c9627 ChangeLog 3382
+SHA256 09b8d4a145f963d4581e3daa2ba7f6352a1dea7e3679b6ec8ce206fe5fbdd940 ChangeLog 3382
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -28,9 +19,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 fe1b30425491d3edba90674872252422 files/digest-dir2ogg-0.10.2 241
 RMD160 006a816d0333ae056bc03461bd51bac19e3af22a files/digest-dir2ogg-0.10.2 241
 SHA256 d0b9680db50c1553fa27bbe3627e8279db3628e183de8543acd203fbfb993a69 files/digest-dir2ogg-0.10.2 241
-MD5 d915f5ad4d078a531ef3d44d5032efb2 files/digest-dir2ogg-0.10.3 241
-RMD160 e4a8b20a8debe171028719afdb60e591a22e50f8 files/digest-dir2ogg-0.10.3 241
-SHA256 a448567dfdf91a845934ffd459531bf9a94cc5d7b3e5407134a3f45ce77d4947 files/digest-dir2ogg-0.10.3 241
-MD5 5393208b126e24888c7e1e1bde36a5ea files/digest-dir2ogg-0.11 235
-RMD160 b2576f601f65946f38d6d07c10106c3eef2b6361 files/digest-dir2ogg-0.11 235
-SHA256 051f64db1d8f935f7c08a0b96d9ca54d0157f300935633581b72fa8f9a9a4c04 files/digest-dir2ogg-0.11 235
+MD5 0b4b771a6df87d70fa7847cf2cebb8c6 files/digest-dir2ogg-0.11.1 241
+RMD160 61944b90d885fcef607d54f07ac4232269b355a4 files/digest-dir2ogg-0.11.1 241
+SHA256 eab6e59061521d46f1593d115371bb5a33172099c563abd319c47b694b3f53a5 files/digest-dir2ogg-0.11.1 241
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:
-