x86 stable wrt #360119

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

4 files changed, 6 insertions, 196 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 11f0e9895b10..85432ed3490f 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.132 2011/03/24 11:41:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.133 2011/03/27 14:38:06 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> banshee-1.8.1.ebuild:
+  x86 stable wrt #360119
 
   24 Mar 2011; Markos Chandras <hwoarang@gentoo.org> banshee-1.8.1.ebuild:
   Stable on amd64 wrt bug #360119
diff --git a/media-sound/banshee/banshee-1.8.0-r1.ebuild b/media-sound/banshee/banshee-1.8.0-r1.ebuild
deleted file mode 100644
index e50e60afe82c..000000000000
--- a/media-sound/banshee/banshee-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.8.0-r1.ebuild,v 1.5 2011/03/21 23:13:14 nirbheek Exp $
-
-EAPI=2
-
-inherit eutils autotools mono gnome2-utils fdo-mime versionator
-
-GVER=0.10.7
-
-DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee-project.org"
-
-#BANSHEE_V2=$(get_version_component_range 2)
-#[[ $((${BANSHEE_V2} % 2)) -eq 0 ]] && RELTYPE=stable || RELTYPE=unstable
-#SRC_URI="http://download.banshee-project.org/${PN}/${RELTYPE}/${PV}/${PN}-1-${PV}.tar.bz2"
-SRC_URI="http://download.banshee-project.org/${PN}/stable/${PV}/${PN}-1-${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+aac +cdda boo daap doc +encode ipod karma mtp podcast test +web youtube"
-
-# Hal is required until upstream bug 612616 is solved
-RDEPEND=">=dev-lang/mono-2.4.3
-	gnome-base/gnome-settings-daemon
-	x11-themes/gnome-icon-theme
-	sys-apps/dbus
-	sys-apps/hal
-	>=dev-dotnet/gtk-sharp-2.12:2
-	>=dev-dotnet/gconf-sharp-2.24.0:2
-	>=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1
-	>=media-libs/gstreamer-0.10.21-r3:0.10
-	>=media-libs/gst-plugins-base-0.10.25.2:0.10
-	>=media-libs/gst-plugins-bad-${GVER}
-	>=media-libs/gst-plugins-good-${GVER}:0.10
-	>=media-libs/gst-plugins-ugly-${GVER}:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-gnomevfs-${GVER}:0.10
-	>=media-plugins/gst-plugins-gconf-${GVER}:0.10
-	cdda? (
-		|| (
-			>=media-plugins/gst-plugins-cdparanoia-${GVER}:0.10
-			>=media-plugins/gst-plugins-cdio-${GVER}:0.10
-		)
-	)
-	media-libs/musicbrainz:1
-	>=dev-dotnet/ndesk-dbus-glib-0.4.1
-	>=dev-dotnet/ndesk-dbus-0.6.1a
-	>=dev-dotnet/mono-addins-0.4[gtk]
-	>=dev-dotnet/taglib-sharp-2.0.3.7
-	>=dev-db/sqlite-3.4:3
-	karma? ( >=media-libs/libkarma-0.1.0-r1 )
-	aac? ( >=media-plugins/gst-plugins-faad-${GVER}:0.10 )
-	boo? (
-		>=dev-lang/boo-0.8.1
-	)
-	daap? (
-		>=dev-dotnet/mono-zeroconf-0.8.0-r1
-	)
-	doc? (
-		virtual/monodoc
-		>=app-text/gnome-doc-utils-0.17.3
-	)
-	encode? (
-		>=media-plugins/gst-plugins-lame-${GVER}:0.10
-		>=media-plugins/gst-plugins-taglib-${GVER}:0.10
-	)
-	ipod? (
-		>=media-libs/libgpod-0.7.95[mono]
-	)
-	mtp? (
-		>=media-libs/libmtp-0.3.0
-	)
-	web? (
-		>=net-libs/webkit-gtk-1.2.2:2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
-	)
-	youtube? (
-		>=dev-dotnet/google-gdata-sharp-1.4
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-S=${WORKDIR}/${PN}-1-${PV}
-
-src_prepare () {
-	# Fix intltool b0rkage similar to
-	# https://bugzilla.gnome.org/show_bug.cgi?id=577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	# Fix security issue with LD_LIBRARY_PATH usage (bug #345567)
-	epatch "${FILESDIR}/${P}-fix-insecure-lib-path.patch"
-
-	epatch "${FILESDIR}/${PN}-1.7.4-make-webkit-optional.patch"
-	AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
-		eautoreconf
-}
-
-src_configure() {
-	# Disable gio till gtk-sharp-beans and gio-sharp are in-tree
-	# Disable gio-hardware till gudev-sharp and gkeyfile-sharp are around
-	# for a bit longer (when these are in, we can drop HAL)
-	# Ditto gst-sharp
-	local myconf="--disable-dependency-tracking --disable-static
-		--enable-gnome --enable-schemas-install
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--enable-gapless-playback
-		--disable-gio --disable-gst-sharp
-		--disable-gio_hardware --enable-hal
-		--disable-torrent
-		--disable-shave"
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable doc user-help) \
-		$(use_enable boo) \
-		$(use_enable mtp) \
-		$(use_enable daap) \
-		$(use_enable ipod appledevice) --disable-ipod \
-		$(use_enable podcast) \
-		$(use_enable karma) \
-		$(use_enable web webkit) \
-		$(use_enable youtube) \
-		${myconf}
-}
-
-src_compile() {
-	emake MCS=/usr/bin/gmcs
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install efailed"
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If ${PN} doesn't play some format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/banshee/banshee-1.8.1.ebuild b/media-sound/banshee/banshee-1.8.1.ebuild
index 38802365613f..8628fd5bc4b7 100644
--- a/media-sound/banshee/banshee-1.8.1.ebuild
+++ b/media-sound/banshee/banshee-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.8.1.ebuild,v 1.7 2011/03/24 11:41:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.8.1.ebuild,v 1.8 2011/03/27 14:38:06 ssuominen Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ SRC_URI="http://download.banshee-project.org/${PN}/stable/${PV}/${PN}-1-${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+aac +cdda boo daap doc +encode ipod karma mtp podcast test udev +web youtube"
 
 RDEPEND=">=dev-lang/mono-2.4.3
diff --git a/media-sound/banshee/files/banshee-1.8.0-fix-insecure-lib-path.patch b/media-sound/banshee/files/banshee-1.8.0-fix-insecure-lib-path.patch
deleted file mode 100644
index 5c400124098c..000000000000
--- a/media-sound/banshee/files/banshee-1.8.0-fix-insecure-lib-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 835c37e99196303195c88932169b73e975115e52 Mon Sep 17 00:00:00 2001
-From: Aaron Bockover <abockover@novell.com>
-Date: Wed, 20 Oct 2010 16:22:40 +0000
-Subject: Fix insecure LD_LIBRARY_PATH (bnc#642505)
-
-A vulnerability existed where if LD_LIBRARY_PATH were set but empty, a
-trailing : as a path separator would still be appended to the path,
-exposing an insecure/invalid search path. GST_PLUGINS_PATH was similarly
-vulnerable.
-
-Using :+: instead of +: prevents this as ${X:+:$X} returns X iff X is
-set and not empty whereas ${X+:$X} returns X iff X is set (it may be
-empty).
----
-diff --git a/src/Clients/Booter/banshee-1.linux.in b/src/Clients/Booter/banshee-1.linux.in
-index 9009797..11e8ccd 100644
---- a/src/Clients/Booter/banshee-1.linux.in
-+++ b/src/Clients/Booter/banshee-1.linux.in
-@@ -7,8 +7,8 @@ MONO_EXE="@expanded_libdir@/@PACKAGE@/$exec_asm"
- BANSHEE_EXEC_NAME=$(basename $0)
- BANSHEE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/banshee-1"
- 
--export LD_LIBRARY_PATH=@expanded_libdir@/@PACKAGE@:@expanded_libdir@/@PACKAGE@/Extensions:@expanded_libdir@/@PACKAGE@/Backends:@expanded_libdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
--export GST_PLUGIN_PATH=@expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH+:$GST_PLUGIN_PATH}
-+export LD_LIBRARY_PATH=@expanded_libdir@/@PACKAGE@:@expanded_libdir@/@PACKAGE@/Extensions:@expanded_libdir@/@PACKAGE@/Backends:@expanded_libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-+export GST_PLUGIN_PATH=@expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}
- if [ $BANSHEE_EXEC_NAME = "muinshee" ]; then
-     BANSHEE_CLIENT="Muinshee"
-     export MONO_PATH=@expanded_libdir@/@PACKAGE@/Extensions
---
-cgit v0.8.3.1