Fix import of m4a (AAC) files

Package-Manager: portage-2.1_rc4-r2

5 files changed, 160 insertions, 8 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 0ef6af3d0862..0389366ff0bd 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.30 2006/05/28 03:11:32 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.31 2006/06/05 20:22:52 dsd Exp $
+
+*banshee-0.10.10-r4 (05 Jun 2006)
+
+  05 Jun 2006; Daniel Drake <dsd@gentoo.org>
+  +files/banshee-0.10.10-mp4-mimetype.patch, +banshee-0.10.10-r4.ebuild:
+  Fix import of m4a (AAC) files
 
 *banshee-0.10.10-r3 (28 May 2006)
 
diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest
index b70b14e2c33f..3532d1cb8386 100644
--- a/media-sound/banshee/Manifest
+++ b/media-sound/banshee/Manifest
@@ -5,6 +5,10 @@ AUX banshee-0.10.10-disableplugin.patch 817 RMD160 7088bde78a3ef71fea841753c98b6
 MD5 a259daa9dc2ecbe3bcf7a9a135ecbef1 files/banshee-0.10.10-disableplugin.patch 817
 RMD160 7088bde78a3ef71fea841753c98b61a5adbc571e files/banshee-0.10.10-disableplugin.patch 817
 SHA256 f29516bb380e2029200fed3568378fdf9edb6144451621e87570fb49906707a7 files/banshee-0.10.10-disableplugin.patch 817
+AUX banshee-0.10.10-mp4-mimetype.patch 597 RMD160 bf3d9f3a5d65dc366ca3f4905daab759057679da SHA1 3329c470aaacdc15e438f6beaa45c0cbf1b4d4ce SHA256 c9e65df065d4bc8e437281fc60737127ab9acbd9734e21e6d9aeb4ac2c036523
+MD5 1f0e7636437dd625d99a9854a9aa6620 files/banshee-0.10.10-mp4-mimetype.patch 597
+RMD160 bf3d9f3a5d65dc366ca3f4905daab759057679da files/banshee-0.10.10-mp4-mimetype.patch 597
+SHA256 c9e65df065d4bc8e437281fc60737127ab9acbd9734e21e6d9aeb4ac2c036523 files/banshee-0.10.10-mp4-mimetype.patch 597
 AUX banshee-0.10.9-event-reduction.patch 1152 RMD160 f1fa6c8b29a77627f7b50916a1b2371e88fec61a SHA1 faa1a2c3ec7b0583c3d42bbcde2830b825b248b6 SHA256 668b7bc0270dd7f9277f0e9bd2aef1cfa7a6754795ee92365553ac66544d201e
 MD5 ba188fd48b3a9664f36390ed617202ae files/banshee-0.10.9-event-reduction.patch 1152
 RMD160 f1fa6c8b29a77627f7b50916a1b2371e88fec61a files/banshee-0.10.9-event-reduction.patch 1152
@@ -19,14 +23,18 @@ EBUILD banshee-0.10.10-r3.ebuild 3529 RMD160 bbe28a2af22b2fbe06cc4821dad7cbbc036
 MD5 a9320bff01f64a9b08335a156fb113cf banshee-0.10.10-r3.ebuild 3529
 RMD160 bbe28a2af22b2fbe06cc4821dad7cbbc03632729 banshee-0.10.10-r3.ebuild 3529
 SHA256 2b565496fca6fdced4316cc9a96f52437bcd3631570d69d0692004a390788472 banshee-0.10.10-r3.ebuild 3529
+EBUILD banshee-0.10.10-r4.ebuild 3568 RMD160 1273e334884a8fc30836450bf5f38b62c301ab7a SHA1 29ef6abb3a7683f7f5ec443edbf7b5dd51c9b949 SHA256 0548d68a691e2a9528ab44e4917afa64b0045664a9114be607237a2ec164a28c
+MD5 64f2f4225d9bf012b564b0ce3fca650d banshee-0.10.10-r4.ebuild 3568
+RMD160 1273e334884a8fc30836450bf5f38b62c301ab7a banshee-0.10.10-r4.ebuild 3568
+SHA256 0548d68a691e2a9528ab44e4917afa64b0045664a9114be607237a2ec164a28c banshee-0.10.10-r4.ebuild 3568
 EBUILD banshee-0.10.9-r1.ebuild 3563 RMD160 bee3aee6a3cbc5620ba2ed216ea3aab94db6d9c0 SHA1 3a855b118a9ed276202109c26c6777b7217215ad SHA256 9f56843f1d1462037762c0ead33b1342f895a7ec082159f4c6e6812de05fa6f4
 MD5 7d06d9e65a2cc4363c5ba578c02b59cc banshee-0.10.9-r1.ebuild 3563
 RMD160 bee3aee6a3cbc5620ba2ed216ea3aab94db6d9c0 banshee-0.10.9-r1.ebuild 3563
 SHA256 9f56843f1d1462037762c0ead33b1342f895a7ec082159f4c6e6812de05fa6f4 banshee-0.10.9-r1.ebuild 3563
-MISC ChangeLog 5883 RMD160 a10aec095ef50656e62b1c4922a0cf5752538c77 SHA1 c19e0a63db974a1d0234d00d9ce2c7d28c241d48 SHA256 208ff94eb5622f27b64ad022f9b9a9414c955d0e54d93c32561d49156ae29491
-MD5 fe8f38d37195d8e747fdd06bc00fbab9 ChangeLog 5883
-RMD160 a10aec095ef50656e62b1c4922a0cf5752538c77 ChangeLog 5883
-SHA256 208ff94eb5622f27b64ad022f9b9a9414c955d0e54d93c32561d49156ae29491 ChangeLog 5883
+MISC ChangeLog 6064 RMD160 38a8d9e2e6d3e7b0078be73a34127a1bb34634b1 SHA1 e2a9446ad8ce9a0f0e4203feb8014cea679cc7ae SHA256 b4dde21e6ad920c50766ab7b485a8363e4f71bbd1b218e64317bc5539d2d6036
+MD5 d00dd0b5becbee49dd52ca6560c473f1 ChangeLog 6064
+RMD160 38a8d9e2e6d3e7b0078be73a34127a1bb34634b1 ChangeLog 6064
+SHA256 b4dde21e6ad920c50766ab7b485a8363e4f71bbd1b218e64317bc5539d2d6036 ChangeLog 6064
 MISC metadata.xml 294 RMD160 a0ecd559d8ebff0b2e91aac31e12dd1fb9074c7e SHA1 a82bcefd597a8ca762a169dd8b2895d1347dcdfb SHA256 50e382a1cdc9b8d5bd7a6e62bae3e8b57cf36e157f70d0136b57d50edf2e8041
 MD5 46261388ca1ae057f1d8590a23834c49 metadata.xml 294
 RMD160 a0ecd559d8ebff0b2e91aac31e12dd1fb9074c7e metadata.xml 294
@@ -34,13 +42,16 @@ SHA256 50e382a1cdc9b8d5bd7a6e62bae3e8b57cf36e157f70d0136b57d50edf2e8041 metadata
 MD5 337c96a8bb65dbab253ecee886f7b683 files/digest-banshee-0.10.10-r3 250
 RMD160 98b6189b47023b88bbe33335f271c5a74bf89462 files/digest-banshee-0.10.10-r3 250
 SHA256 d29718eb197a6c9d4df49fb845ab9b7013976bf08cdae4fdeb20228eed46c9c4 files/digest-banshee-0.10.10-r3 250
+MD5 337c96a8bb65dbab253ecee886f7b683 files/digest-banshee-0.10.10-r4 250
+RMD160 98b6189b47023b88bbe33335f271c5a74bf89462 files/digest-banshee-0.10.10-r4 250
+SHA256 d29718eb197a6c9d4df49fb845ab9b7013976bf08cdae4fdeb20228eed46c9c4 files/digest-banshee-0.10.10-r4 250
 MD5 472c7bed0ed7f7bde4a02cbbe05ce126 files/digest-banshee-0.10.9-r1 247
 RMD160 4936f49a45d9dc638116b5df80a06a20fd30a256 files/digest-banshee-0.10.9-r1 247
 SHA256 629aad018eac96f855d8c6f01d3bfa333857decfe8980b9e41ba69439b658806 files/digest-banshee-0.10.9-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEeRRDwUpWvClEHQoRAhRzAJ9UcFcr8rm1YWazeAz0Z7ZOoOD6FgCeIWvA
-e5pF3kE/sA2znKs7AuadtHk=
-=PnRo
+iD8DBQFEhJL2TOXg++0VvJQRAjaPAJ9+jVOrmXlvsoQmXv4GLyVi8Yaw9gCgptTg
+BaAM93BwW59gyPhuCqBLajg=
+=UqOv
 -----END PGP SIGNATURE-----
diff --git a/media-sound/banshee/banshee-0.10.10-r4.ebuild b/media-sound/banshee/banshee-0.10.10-r4.ebuild
new file mode 100644
index 000000000000..3e6c328e8bad
--- /dev/null
+++ b/media-sound/banshee/banshee-0.10.10-r4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-0.10.10-r4.ebuild,v 1.1 2006/06/05 20:22:52 dsd Exp $
+
+inherit autotools eutils gnome2 mono
+
+DESCRIPTION="Banshee allows you to import CDs, sync your music collection, play
+music directly from an iPod, create playlists with songs from your library, and
+create audio and MP3 CDs from subsets of your library."
+HOMEPAGE="http://banshee-project.org"
+SRC_URI="http://banshee-project.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="aac doc daap ipod flac mad njb vorbis"
+
+RDEPEND=">=dev-lang/mono-1.1.13
+	>=dev-dotnet/gtk-sharp-2.8.0
+	>=dev-dotnet/gnomevfs-sharp-2.8.0
+	>=dev-dotnet/gconf-sharp-2.8.0
+	>=media-libs/gstreamer-0.10.0
+	>=media-libs/gst-plugins-base-0.10.0
+	>=media-libs/gst-plugins-good-0.10.0
+	>=media-libs/gst-plugins-ugly-0.10.0
+	>=media-plugins/gst-plugins-alsa-0.10.0
+	>=media-plugins/gst-plugins-gnomevfs-0.10.0
+	>=media-plugins/gst-plugins-gconf-0.10.0
+	encode? ( >=media-plugins/gst-plugins-lame-0.10.0 )
+	mad? ( >=media-plugins/gst-plugins-mad-0.10.0 )
+	vorbis? ( >=media-plugins/gst-plugins-ogg-0.10.0
+		>=media-plugins/gst-plugins-vorbis-0.10.0 )
+	flac? ( >=media-plugins/gst-plugins-flac-0.10.0 )
+	aac? ( >=media-plugins/gst-plugins-faad-0.10.0
+		>=media-libs/faad2-2.0-r4 )
+	>=media-plugins/gst-plugins-cdparanoia-0.10.0
+	>=media-libs/musicbrainz-2.1.1
+	real? ( media-video/realplayer )
+	njb? ( >=dev-dotnet/njb-sharp-0.3.0 )
+	daap? ( >=net-dns/avahi-0.6.9 )
+	>=dev-libs/glib-2.0
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/gnome-desktop-2.0
+	ipod? ( >=dev-dotnet/ipod-sharp-0.5.15
+		>=media-plugins/gst-plugins-faac-0.10.0 )
+	>=sys-apps/hal-0.5.2
+	>=sys-apps/dbus-0.60
+	>=dev-db/sqlite-3
+	>=gnome-extra/nautilus-cd-burner-2.12"
+
+USE_DESTDIR=1
+DOCS="ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	if ! built_with_use sys-apps/dbus mono ; then
+		echo
+		eerror "In order to compile banshee, you need to have sys-apps/dbus emerged"
+		eerror "with 'mono' in your USE flags. Please add that flag, re-emerge"
+		eerror "dbus, and then emerge banshee."
+		die "sys-apps/dbus is missing the .NET binding."
+	fi
+
+	if use daap && ! built_with_use net-dns/avahi mono ; then
+		echo
+		eerror "In order to compile banshee with daap support"
+		eerror "you need to have net-dns/avahi emerged"
+		eerror "with 'mono' in your USE flags. Please add that flag, re-emerge"
+		eerror "avahi, and then emerge banshee."
+		die "net-dns/avahi is missing the .NET binding."
+	fi
+
+	if use daap; then
+		G2CONF="${G2CONF} --enable-avahi"
+		else
+		G2CONF="${G2CONF} --disable-daap"
+	fi
+
+	G2CONF="${G2CONF} --disable-xing \
+		--disable-helix \
+		--disable-docs \
+		--with-gstreamer-0-10 \
+		$( use_enable ipod) \
+		$( use_enable njb)"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-disableplugin.patch
+	epatch ${FILESDIR}/${P}-mp4-mimetype.patch
+	eautoreconf
+}
+
+src_compile() {
+	addpredict "/root/.gnome2"
+	addpredict "/root/.gconf"
+	addpredict "/root/.gconfd"
+	gnome2_src_configure
+	emake -j1 || "make failed"
+}
+
+src_install() {
+	gnome2_src_install
+	if ! use ipod; then
+		dodir /usr/$(get_libdir)/banshee/Banshee.Dap
+	fi
+}
+pkg_postinst() {
+	gnome2_pkg_postinst
+	einfo
+	einfo "In case you have an ipod please rebuild this package with USE=ipod"
+	einfo "If you have a audio player supported by libnjb please"
+	einfo "rebuild this package with USE=njb"
+	einfo
+	einfo "Banshee is build only with gstreamer 0.10.x support."
+	einfo
+}
diff --git a/media-sound/banshee/files/banshee-0.10.10-mp4-mimetype.patch b/media-sound/banshee/files/banshee-0.10.10-mp4-mimetype.patch
new file mode 100644
index 000000000000..efe2823e09ac
--- /dev/null
+++ b/media-sound/banshee/files/banshee-0.10.10-mp4-mimetype.patch
@@ -0,0 +1,13 @@
+Index: banshee-0.10.10/entagged-sharp/Mp4/Mp4FileReader.cs
+===================================================================
+--- banshee-0.10.10.orig/entagged-sharp/Mp4/Mp4FileReader.cs
++++ banshee-0.10.10/entagged-sharp/Mp4/Mp4FileReader.cs
+@@ -34,6 +34,8 @@ using Entagged.Audioformats.Mp4.Util;
+ namespace Entagged.Audioformats.Mp4
+ {
+     [SupportedMimeType ("audio/x-m4a")]
++    [SupportedMimeType ("audio/mp4")]
++    [SupportedMimeType ("audio/m4a")]
+     [SupportedMimeType ("entagged/m4a")]
+     [SupportedMimeType ("entagged/m4p")]    
+     public class Mp4FileReader : AudioFileReader
diff --git a/media-sound/banshee/files/digest-banshee-0.10.10-r4 b/media-sound/banshee/files/digest-banshee-0.10.10-r4
new file mode 100644
index 000000000000..ccdb303ddc17
--- /dev/null
+++ b/media-sound/banshee/files/digest-banshee-0.10.10-r4
@@ -0,0 +1,3 @@
+MD5 cb553f5bc6dc14b7afa44349d025bbdc banshee-0.10.10.tar.gz 1283567
+RMD160 af60d5883d1fee43269bd173ada08138bc50a20a banshee-0.10.10.tar.gz 1283567
+SHA256 38fc1f388637e036808555d086276122f3d410f8469cbad8313d329a276fefd5 banshee-0.10.10.tar.gz 1283567