Incorporate changes by Jouni Rinne (bug #120054)

Package-Manager: portage-2.1_pre6-r5

4 files changed, 29 insertions, 23 deletions

diff --git a/gnustep-apps/cynthiune/ChangeLog b/gnustep-apps/cynthiune/ChangeLog
index 77cbba545296..761f8488e05e 100644
--- a/gnustep-apps/cynthiune/ChangeLog
+++ b/gnustep-apps/cynthiune/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnustep-apps/cynthiune
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.4 2006/01/08 12:36:23 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.5 2006/03/26 08:40:20 grobian Exp $
+
+  26 Mar 2006; Fabian Groffen <grobian@gentoo.org> cynthiune-0.9.4.ebuild:
+  Incorporate changes by Jouni Rinne (bug #120054)
 
   08 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> metadata.xml:
   Remove retiring dev from metadata.
diff --git a/gnustep-apps/cynthiune/Manifest b/gnustep-apps/cynthiune/Manifest
index 6f164e36529a..7fbe19db6838 100644
--- a/gnustep-apps/cynthiune/Manifest
+++ b/gnustep-apps/cynthiune/Manifest
@@ -1,12 +1,12 @@
-MD5 7ee01f237174ac97fa8b5cd6a198f774 ChangeLog 703
-RMD160 09d55933f3adaf69af230777b87e3dc044c99ca7 ChangeLog 703
-SHA256 803c2f27665bf5347d21b095407d942c823e136bd7cc08adf17a1519b797ce81 ChangeLog 703
-MD5 6a4811aefaf03d0c2ae1e4bad5a11f25 cynthiune-0.9.4.ebuild 1152
-RMD160 91662d2413980ab6a28ed5aa9893fb8aa0ef7081 cynthiune-0.9.4.ebuild 1152
-SHA256 149e6287e240b02334f0dbbec7aa8d04061c428843c63fbd0b66bd5a24be35fa cynthiune-0.9.4.ebuild 1152
-MD5 0cfdd58309dd61a8175fb1441aeeb44c files/digest-cynthiune-0.9.4 67
-RMD160 15bc2aa71bc42e03a72ff5761eca612fd308135e files/digest-cynthiune-0.9.4 67
-SHA256 457754dad78fcaef6f0961561de204db6854c401a9b69e42e58c9959218c9bfa files/digest-cynthiune-0.9.4 67
+MD5 9f91d95b0ce172d7cca3cacc1c02542a ChangeLog 831
+RMD160 d85ede6023e9cd0b6eb18d25d97c8de2db1f4e4d ChangeLog 831
+SHA256 88bed1f3e494d7496eb03848ad3ac33f1eb8743c2dcd44282cfdde74411d71ee ChangeLog 831
+MD5 c9f10046998694d9e512c6feb2efc05c cynthiune-0.9.4.ebuild 1079
+RMD160 3f6fb064c55495ab71d0442e246ea44c5e9a168d cynthiune-0.9.4.ebuild 1079
+SHA256 08af793931d31866b451f4a8f85bbf255e3b0868dce120c0081fd587903e3009 cynthiune-0.9.4.ebuild 1079
+MD5 2764efdc178cb44a451920637b48429f files/digest-cynthiune-0.9.4 247
+RMD160 dcc59f8b39e95109cf4698636cf277c0f0e8b375 files/digest-cynthiune-0.9.4 247
+SHA256 3c3b2da9987898100160d6faaaffce1ca677b1492fc9ee3a0dc9b72b0bfa0606 files/digest-cynthiune-0.9.4 247
 MD5 6605705ac6cf5ccfbb1e0fb5ffd5e5b0 metadata.xml 2216
 RMD160 06c2aea6ad54e88d28371ef8a6302120e88e8505 metadata.xml 2216
 SHA256 6559882bfeb74a0c812e092fc392728e16a7df57d1ec45d43f44babd79ee3424 metadata.xml 2216
diff --git a/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild b/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild
index 85faaa27f263..5181a54ce67f 100644
--- a/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild
+++ b/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild,v 1.6 2006/03/25 16:51:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild,v 1.7 2006/03/26 08:40:20 grobian Exp $
 
 inherit gnustep
 
@@ -11,7 +11,7 @@ DESCRIPTION="Free software and romantic music player for GNUstep."
 HOMEPAGE="http://organact.mine.nu/~wolfgang/cynthiune"
 SRC_URI="http://organact.mine.nu/~wolfgang/cynthiune/${P/c/C}.tar.gz"
 
-IUSE="esd flac mikmod vorbis"
+IUSE=""
 
 KEYWORDS="~ppc ~x86"
 LICENSE="GPL-2"
@@ -20,19 +20,20 @@ SLOT="0"
 DEPEND="${GS_DEPEND}
 	>=media-libs/libid3tag-0.15.0b
 	>=media-libs/libmad-0.15.1b
-	vorbis? ( >=media-libs/libogg-1.1.2
-	    >=media-libs/libvorbis-1.0.1-r2 )
-	mikmod? ( ~media-libs/libmodplug-0.7 )
-	flac? ( >=media-libs/flac-1.1.0-r2 )
-	esd? ( media-sound/esound )"
+	media-libs/audiofile
+	>=media-libs/libogg-1.1.2
+	>=media-libs/libvorbis-1.0.1-r2
+	~media-libs/libmodplug-0.7
+	>=media-libs/flac-1.1.0-r2
+	media-sound/esound"
 RDEPEND="${GS_RDEPEND}
 	>=media-libs/libid3tag-0.15.0b
 	>=media-libs/libmad-0.15.1b
-	vorbis? ( >=media-libs/libogg-1.1.2
-	    >=media-libs/libvorbis-1.0.1-r2 )
-	mikmod? ( ~media-libs/libmodplug-0.7 )
-	flac? ( >=media-libs/flac-1.1.0-r2 )
-	esd? ( media-sound/esound )"
+	media-libs/audiofile
+	>=media-libs/libogg-1.1.2
+	>=media-libs/libvorbis-1.0.1-r2
+	~media-libs/libmodplug-0.7
+	>=media-libs/flac-1.1.0-r2
+	media-sound/esound"
 
 egnustep_install_domain "Local"
-
diff --git a/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.4 b/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.4
index 8cb8a42dcc2d..2b7ef9ed25b3 100644
--- a/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.4
+++ b/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.4
@@ -1 +1,3 @@
 MD5 d57efebd3edbc7b7e2ffefcdc0eb61d5 Cynthiune-0.9.4.tar.gz 308113
+RMD160 80a0b0a67c6cc55a674e406ed0a7b23a6ed031f4 Cynthiune-0.9.4.tar.gz 308113
+SHA256 a10c04bfe9284a2f200d8193b9cef23a1663056331366c10a77531ddef2b2e45 Cynthiune-0.9.4.tar.gz 308113