Elisa 0.3.5

svn path=/maintainer/; revision=88

29 files changed, 66 insertions, 810 deletions

diff --git a/manifest1_obsolete b/manifest1_obsolete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/manifest1_obsolete
diff --git a/media-plugins/elisa-plugins-bad/ChangeLog b/media-plugins/elisa-plugins-bad/ChangeLog
new file mode 100644
index 0000000..400b1bf
--- /dev/null
+++ b/media-plugins/elisa-plugins-bad/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for media-plugins/elisa-plugins-bad
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  16 Jun 2008; Daniel Gryniewicz <dang@gentoo.org> ++,
+  -elisa-plugins-bad-0.3.4.ebuild:
+  Bump to 0.3.5
+
diff --git a/media-plugins/elisa-plugins-bad/Manifest b/media-plugins/elisa-plugins-bad/Manifest
index 9ba48d3..2027cf7 100644
--- a/media-plugins/elisa-plugins-bad/Manifest
+++ b/media-plugins/elisa-plugins-bad/Manifest
@@ -1,2 +1,3 @@
-DIST elisa-plugins-bad-0.3.4.tar.gz 8364545 RMD160 d030e812f6a9ee2653d0750401497ca5223713e5 SHA1 a251f62951b7c3ecf364bda7a73f1856a7a66fb6 SHA256 818dfac4a64009879eb9fee6ac73df7b168dd4e90b76de2d66716384865015c5
-EBUILD elisa-plugins-bad-0.3.4.ebuild 716 RMD160 fb4cb15181b2d09668b30a76d9171a53da3b0403 SHA1 e55100961b153b1dff05d5477f02606717c05f30 SHA256 04ab02ca0c5a56e0ee39e34eb6510398b48a921ba4b5293c76243405811a769b
+DIST elisa-plugins-bad-0.3.5.tar.gz 8356917 RMD160 6e3831217d438bab5710e03800ab1e366c3fe40c SHA1 ba2e78b47b5ea39f5cc7462be246c13280bf5f0c SHA256 1309600f11a6886f7f231ae7d5f8cf6e78c3fd1370b48f4ae8b80685f067e26f
+EBUILD elisa-plugins-bad-0.3.5.ebuild 716 RMD160 fb4cb15181b2d09668b30a76d9171a53da3b0403 SHA1 e55100961b153b1dff05d5477f02606717c05f30 SHA256 04ab02ca0c5a56e0ee39e34eb6510398b48a921ba4b5293c76243405811a769b
+MISC ChangeLog 239 RMD160 527d990c9552373dddd32b7a4f42e1db74db57d2 SHA1 585274437850125cbed43aef7ddb801dd2123fe1 SHA256 2d63b0b8d17010708d1a03045244f3d85344efd8f17dd499cfe9680f035e4540
diff --git a/media-plugins/elisa-plugins-bad/elisa-plugins-bad-0.3.4.ebuild b/media-plugins/elisa-plugins-bad/elisa-plugins-bad-0.3.5.ebuild
index 9edf45d..9edf45d 100644
--- a/media-plugins/elisa-plugins-bad/elisa-plugins-bad-0.3.4.ebuild
+++ b/media-plugins/elisa-plugins-bad/elisa-plugins-bad-0.3.5.ebuild
diff --git a/media-plugins/elisa-plugins-good/ChangeLog b/media-plugins/elisa-plugins-good/ChangeLog
new file mode 100644
index 0000000..10d78a7
--- /dev/null
+++ b/media-plugins/elisa-plugins-good/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for media-plugins/elisa-plugins-good
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  16 Jun 2008; Daniel Gryniewicz <dang@gentoo.org> ++,
+  -elisa-plugins-good-0.3.4.ebuild:
+  Bump to 0.3.5
+
diff --git a/media-plugins/elisa-plugins-good/Manifest b/media-plugins/elisa-plugins-good/Manifest
index 2431ab5..90c49be 100644
--- a/media-plugins/elisa-plugins-good/Manifest
+++ b/media-plugins/elisa-plugins-good/Manifest
@@ -1,2 +1,3 @@
-DIST elisa-plugins-good-0.3.4.tar.gz 279298 RMD160 84842762d2af4e738217977c10e76f069240a533 SHA1 857c162d7744a86a3e5f939f0dce2aa3947f913b SHA256 9fc2ff3c0ed3973d346227713a55bdf263d4e89a0fa96f66b7e228ad9b0778d4
-EBUILD elisa-plugins-good-0.3.4.ebuild 502 RMD160 d8a5d9e626e87417f093951d299cea8f78dc55f0 SHA1 b2913a191176aad784dcf98f6fba41481d22ab69 SHA256 4c9d7030869ceb6b06efbff421f34b5e96f0d326823db8c161ae9050bdbb9fe7
+DIST elisa-plugins-good-0.3.5.tar.gz 279597 RMD160 6a266d08ba50eab0e2edb6199fb39d626da8f7c3 SHA1 62e2ecbbce41ee7064386a99d077c57500468e9d SHA256 c64085bc6ff27ee950a764a6026e03c1e7f98f036d767c0fe1b361b1fc6a3229
+EBUILD elisa-plugins-good-0.3.5.ebuild 502 RMD160 d8a5d9e626e87417f093951d299cea8f78dc55f0 SHA1 b2913a191176aad784dcf98f6fba41481d22ab69 SHA256 4c9d7030869ceb6b06efbff421f34b5e96f0d326823db8c161ae9050bdbb9fe7
+MISC ChangeLog 241 RMD160 4fa4c3240f826609b218c531d93df9655db65811 SHA1 083835cdd60d3402d8182c1844642ba6dcd94b57 SHA256 305083fef8b43a6ca35751a1119234782a2f3ba7a9b2e1bf4e19e7df25e71714
diff --git a/media-plugins/elisa-plugins-good/elisa-plugins-good-0.3.4.ebuild b/media-plugins/elisa-plugins-good/elisa-plugins-good-0.3.5.ebuild
index d0b6d79..d0b6d79 100644
--- a/media-plugins/elisa-plugins-good/elisa-plugins-good-0.3.4.ebuild
+++ b/media-plugins/elisa-plugins-good/elisa-plugins-good-0.3.5.ebuild
diff --git a/media-plugins/elisa-plugins-ugly/ChangeLog b/media-plugins/elisa-plugins-ugly/ChangeLog
new file mode 100644
index 0000000..e79593c
--- /dev/null
+++ b/media-plugins/elisa-plugins-ugly/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for media-plugins/elisa-plugins-ugly
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  16 Jun 2008; Daniel Gryniewicz <dang@gentoo.org> ++,
+  -elisa-plugins-ugly-0.3.4.ebuild:
+  Bump to 0.3.5
+
diff --git a/media-plugins/elisa-plugins-ugly/Manifest b/media-plugins/elisa-plugins-ugly/Manifest
index 74a325b..3ebb5aa 100644
--- a/media-plugins/elisa-plugins-ugly/Manifest
+++ b/media-plugins/elisa-plugins-ugly/Manifest
@@ -1,2 +1,3 @@
-DIST elisa-plugins-ugly-0.3.4.tar.gz 35313 RMD160 1c7509e4dc53147f8dcd552e3eadab0b5e6990af SHA1 eb0c081a783fd3ded5475c1a7307c70cabc8c8d8 SHA256 cd60f6a94edbcb724cb6c30de0b1876f3d96a536622b64ae38acbba6e5973747
-EBUILD elisa-plugins-ugly-0.3.4.ebuild 716 RMD160 fb4cb15181b2d09668b30a76d9171a53da3b0403 SHA1 e55100961b153b1dff05d5477f02606717c05f30 SHA256 04ab02ca0c5a56e0ee39e34eb6510398b48a921ba4b5293c76243405811a769b
+DIST elisa-plugins-ugly-0.3.5.tar.gz 35231 RMD160 92fefdcd443e9d101882563efbf392fd88e90eee SHA1 e3890dc43a85ec2d23b2a1db5b764dcda44fa17e SHA256 85a9abcac819ad6de7f4de45cf37e7c6a2cccbac9992cd187a496f951674122e
+EBUILD elisa-plugins-ugly-0.3.5.ebuild 716 RMD160 fb4cb15181b2d09668b30a76d9171a53da3b0403 SHA1 e55100961b153b1dff05d5477f02606717c05f30 SHA256 04ab02ca0c5a56e0ee39e34eb6510398b48a921ba4b5293c76243405811a769b
+MISC ChangeLog 241 RMD160 106242deec247b9a8b1f87583eebc3185b8de841 SHA1 8d08ef5d5aed1d98c7b54100c57f901f7b5d9b28 SHA256 d7ed22111fab4d87a1ebc00658d50712f7b6b5f009fc2586bed3fec2902f8034
diff --git a/media-plugins/elisa-plugins-ugly/elisa-plugins-ugly-0.3.4.ebuild b/media-plugins/elisa-plugins-ugly/elisa-plugins-ugly-0.3.5.ebuild
index 9edf45d..9edf45d 100644
--- a/media-plugins/elisa-plugins-ugly/elisa-plugins-ugly-0.3.4.ebuild
+++ b/media-plugins/elisa-plugins-ugly/elisa-plugins-ugly-0.3.5.ebuild
diff --git a/media-video/elisa/ChangeLog b/media-video/elisa/ChangeLog
index 8447678..246485c 100644
--- a/media-video/elisa/ChangeLog
+++ b/media-video/elisa/ChangeLog
@@ -2,6 +2,22 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jun 2008; Daniel Gryniewicz <dang@gentoo.org> ++, ++,
+  -elisa-0.3.4.ebuild:
+  Bump to 0.3.5 We didn't add any feature in that release but we fixed some
+  really important bugs preventing Elisa to work correctly.
+
+  Bugs fixed since 0.3.4:
+
+  - 1148: Splashcreen with compiz is cropped - 1147: non square splashscreen
+  version number update - 1138: update the config_upgrader to activate
+  update:updater_service - 1137: Issues thumbnailing photos while playing
+  shoutcast - 1136: Big navigation or player issue - 1135: Ipod nano bug -
+  1134: Elisa don't start on Fresh Hardy - 1133: Problems installing plugins
+  with underscore in name - 1130: the "core" egg is not correctly loaded
+  from user-wide installation - 1088: Elisa randomly fails to start in
+  fullscreen mode - 1085: duration does not get updated proper
+
   05 Mar 2008; Daniel Gryniewicz <dang@gentoo.org> ++, ++:
   Bump to 0.3.4 This is Elisa 0.3.4, fourth release of the 0.3 branch.
   
diff --git a/media-video/elisa/Manifest b/media-video/elisa/Manifest
index 974a1b8..f2980aa 100644
--- a/media-video/elisa/Manifest
+++ b/media-video/elisa/Manifest
@@ -1,19 +1,5 @@
-DIST elisa-0.1.3.tar.gz 11457436 RMD160 c46b32839dbfc618df0854178216fb7b0ca2d6fb SHA1 a611e8442e35017b9501018495aaf54bb79027f4 SHA256 f1b43d6694f3595ecbc19c43021fad915ec8b822569c9f0a21ee3dfbee917954
-DIST elisa-0.1.4.1.tar.gz 12134145 RMD160 053c133450bd0463f72be2c96dad0ea3e86ccb8e SHA1 ec50b9e64dc67104c236e294d74820c588f78372 SHA256 eb0c41f71dee41228aec2f1e8896fb82934bcdda41a7c3891d8b4764228585c6
-DIST elisa-0.1.4.2.tar.gz 13327257 RMD160 287c6f9852567f329f36a45c6c1a2ec3b8c4e65a SHA1 29c3d6c277c918a9bf7be4592cc309bd50710da1 SHA256 717e814a8ed5a31fd42da5921e1378dfce751b994302f14f9cb5c5233a14ddfa
-DIST elisa-0.1.5.tar.gz 13333109 RMD160 d4222a5462cdd07f05acacfaccc1c9704aa1a81a SHA1 c592b3bdc569f92837a8b908a050c3b096199b35 SHA256 0fd0184c44b62fff35ab53a89193a781ea03f941e592c38157fcddf5535e6856
-DIST elisa-0.1.6.tar.gz 13333863 RMD160 c3324b87117778ae3cc9bddbc514f426d5694047 SHA1 03ba0721530523d51b9dd1c2be76d9805f0c7ed7 SHA256 5911b63ae71f7fbf50870f2feeeebc3179b33cbb2e1f009d730a77d86083d682
-DIST elisa-0.3.2.tar.gz 11102424 RMD160 ea100d5aa9529b431cf0829a0b36b0cab3dd9b1b SHA1 2f20721d004f195b90ea8ff3a19486cfc4f24ebc SHA256 79e30103192da60ccb6e33f198b88e9790f0715d86f603d36922223eee879260
-DIST elisa-0.3.2_p1.tar.gz 12412080 RMD160 0515229195f513bdce16664f0bc2a8157dbad399 SHA1 f45cd0d9388c435a2ce044b3c1b2b87a824babc3 SHA256 2339562a17122c9813aace9666c70e7a08223d52ca8e87af54b91ab7426aff7a
 DIST elisa-0.3.3.tar.gz 22564562 RMD160 1042cda8033dec4e8ce91aefb58822426e9d551d SHA1 6dd78be630d0ac128972f5f2ee9a4033f623876b SHA256 98c28abcc4dfcdd41b559d6b214b671fa7d31782bd0bc5411e2b47de5ed017e3
-DIST elisa-0.3.4.tar.gz 995985 RMD160 63720ed53290b397ee13b09cc9ccdd7a4569906d SHA1 d7af37913b2fff938dbbca2a0e38d83fe73528a1 SHA256 afab4d9d62b66988cdce63c81a2ca12b98700049b510c2146b8baf4cb95178d1
-EBUILD elisa-0.1.3.ebuild 2774 RMD160 2601c5f5e776c4dc9678e88b38272bee92b76ddf SHA1 7c4464e7c710f4e2d05ed059413a4b259d396c2e SHA256 439eaba997b41e4d698e840095a8949e2c6048e555c8a0602dca98a44324f70f
-EBUILD elisa-0.1.4.1.ebuild 2779 RMD160 93f6503a5bfed5e6610ea1732109e45f6a9d5150 SHA1 fca9ec95357d781261536230d856831c239becac SHA256 e2224fc165967af437a273e957ca2f6f45e4e231848ee111ef79e90a81caf42a
-EBUILD elisa-0.1.4.2.ebuild 2899 RMD160 9e956c266004e3eab3d1478bd5d5e49eb94d3eb5 SHA1 ee066531b28bc61b2131b63b274b7205c81f9e97 SHA256 3233d99d7e70cfb18b1bb260dc8985f9da2f84c75b01a944446e1bbfe4cce83b
-EBUILD elisa-0.1.5.ebuild 2897 RMD160 76af09fde2c6650bafe50b2ab8e5497fd67969fc SHA1 a3e6cc62d0220690258c2afbe58476b82b110832 SHA256 8a45dfed84259539d4b7325c1049a288edae1fb1ffa03c35c1860e707527e269
-EBUILD elisa-0.1.6.ebuild 2897 RMD160 76af09fde2c6650bafe50b2ab8e5497fd67969fc SHA1 a3e6cc62d0220690258c2afbe58476b82b110832 SHA256 8a45dfed84259539d4b7325c1049a288edae1fb1ffa03c35c1860e707527e269
-EBUILD elisa-0.3.2.ebuild 2932 RMD160 cae10e1af29acb7f458e63fa71fc529b7d8d57db SHA1 943453d79ba289f3bc53a86941d7307e7bfa7589 SHA256 58cc5ae7aa3469fd726389a08a15b8cda704935268719c2f55516173860a7c37
-EBUILD elisa-0.3.2_p1.ebuild 2994 RMD160 329e0bfdeb5ca6fac9f2d4fd8d37f71657284fb3 SHA1 f8060bd020d77b32e7708a3b1402110293db4b9e SHA256 da2ad5c5e6608af28171df75e038a9aedac25b6ed8e172bc1da6b13aa78cd416
+DIST elisa-0.3.5.tar.gz 1034087 RMD160 49d2255e31c9ac324d38a3c7184f551c510480a5 SHA1 a8e2ce46077e425f5a59748af2ade1c6204ce476 SHA256 0bf6d9f19a96d343b37a3d3e388925e61145988c7af487df679804b34a19fc56
 EBUILD elisa-0.3.3.ebuild 2962 RMD160 c76dcea2fcdb668ac6a07280a9e594ec1eb83db9 SHA1 545ce4882a29fa4d1468b44d344493a11580df93 SHA256 a32fc088c35ed2094ce394ba7e6968addf51b8965f4a9bfccd6fc4c0817753f5
-EBUILD elisa-0.3.4.ebuild 2882 RMD160 377d0d3f876410bf009f1fe5a033ff127663c7b4 SHA1 d38b39a8e2cadd60d9adb543741a6f8ef3ea00ca SHA256 941d1bcc61ac3fdcb206e76b260d262d1662b07b1969596890f2f439dd4c2f70
-MISC ChangeLog 17939 RMD160 c43f1041f056af1d4ea7bb12d0270a2fb4bc854a SHA1 abe587a469908bb3b0528c3b74c63cd96da41be7 SHA256 4ff0941300f3dc1417059de2081106b56eefbec766f6bf8551c8f6332521389c
+EBUILD elisa-0.3.5.ebuild 3161 RMD160 96889f5aefbd8913901c017ee8daa75c216e19f6 SHA1 2f8b7123ca5a5f944100d7ab9aeeb2a165ee0f7f SHA256 721c566ba5f79561d3d9cedf266920db31eb663109903f4aa630b2fd062514be
+MISC ChangeLog 18767 RMD160 14598a4e0c8d6d5576bb933dc26d730fff074ac8 SHA1 9510daaaaffc8d87efbf690e16f311e8e2eaf22f SHA256 c4e8bfd41d28d82f8b1b8d16c751a939bbbb06c1ba3282d758b644e184ccee3d
diff --git a/media-video/elisa/elisa-0.1.3.ebuild b/media-video/elisa/elisa-0.1.3.ebuild
deleted file mode 100644
index 505dad5..0000000
--- a/media-video/elisa/elisa-0.1.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2006 BreakMyGentoo.org
-# Distributed under the terms of the GNU General Public License v2
-
-inherit distutils python
-
-DESCRIPTION="Elisa is an open source, cross platform media center solution for Linux, MacOSX and Windows on top of GStreamer."
-HOMEPAGE="http://www.fluendo.com/elisa/"
-SRC_URI="http://www.fluendo.com/elisa/downloads/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64 ~ppc"
-IUSE="daap doc dvd ipod lirc upnp"
-
-MAKEOPTS="-j1"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-python/setuptools
-	>=dev-python/imaging-1
-	>=dev-python/twisted-2.2
-	dev-python/gnome-python-extras
-	>=media-libs/gstreamer-0.10.4
-	>=dev-python/gst-python-0.10
-	>=media-libs/pigment-${PV}
-	>=dev-db/sqlite-3.2.8
-	>=dev-python/pysqlite-2.0.5
-	upnp? (
-		dev-python/twisted-web
-		dev-python/elementtree
-		dev-python/celementtree
-		dev-python/soappy
-	)
-	dvd? (
-		media-libs/libdvdcss
-		>=media-plugins/gst-plugins-ffmpeg-0.10
-		>=media-libs/gst-plugins-bad-0.10
-		>=media-libs/gst-plugins-ugly-0.10
-	)
-	lirc? (
-		app-misc/lirc
-		dev-python/pylirc
-	)
-	daap? (
-		dev-python/PythonDaap
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=net-dns/avahi-0.6
-	)
-	ipod? (
-		media-libs/libgpod
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/hal-0.5
-	)"
-
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS"
-
-pkg_setup() {
-	if use daap ; then
-		if built_with_use net-dns/avahi python ; then
-			einfo "Avahi Python bindings found ..."
-		else
-			eerror "Please rebuild net-dns/avahi with python support enabled!"
-			eerror "Try USE=\"python\" emerge net-dns/avahi,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge net-dns/avahi."
-			die "USE flag \"python\" must be enabled in net-dns/avahi"
-		fi
-	fi
-
-
-	if use ipod ; then
-		if built_with_use media-libs/libgpod python ; then
-			einfo "libgpod Python bindings found ..."
-		else
-			eerror "Please rebuild media-libs/libgpod with python support enabled!"
-			eerror "Try USE=\"python\" emerge media-libs/libgpod,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge media-libs/libgpod."
-			die "USE flag \"python\" must be enabled in media-libs/libgpod"
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	einfo "After first run of the box, edit elisa.conf and add some media"
-	einfo "locations in [movies], [music] and [pictures] config sections"
-	einfo "e.g."
-	einfo "[plugins.pictures]"
-	einfo "locations = ['file://./sample_data/pictures',]"
-	einfo ""
-	einfo "[plugins.movies]"
-	einfo "locations = ['file://./sample_data/movies', 'file:///data/movies/', 'smb://mediaserver/movies/']"
-	einfo ""
-	einfo "[plugins.music]"
-	einfo "locations = ['file://./sample_data/music', 'file:///data/music/']"
-
-}
diff --git a/media-video/elisa/elisa-0.1.4.1.ebuild b/media-video/elisa/elisa-0.1.4.1.ebuild
deleted file mode 100644
index f05b9a6..0000000
--- a/media-video/elisa/elisa-0.1.4.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2006-2007 BreakMyGentoo.org
-# Distributed under the terms of the GNU General Public License v2
-
-inherit distutils python
-
-DESCRIPTION="Elisa is an open source, cross platform media center solution for Linux, MacOSX and Windows on top of GStreamer."
-HOMEPAGE="http://www.fluendo.com/elisa/"
-SRC_URI="http://www.fluendo.com/elisa/downloads/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64 ~ppc"
-IUSE="daap doc dvd ipod lirc upnp"
-
-MAKEOPTS="-j1"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-python/setuptools
-	>=dev-python/imaging-1
-	>=dev-python/twisted-2.2
-	dev-python/gnome-python-extras
-	>=media-libs/gstreamer-0.10.4
-	>=dev-python/gst-python-0.10
-	>=media-libs/pigment-0.1.1
-	>=dev-db/sqlite-3.2.8
-	>=dev-python/pysqlite-2.0.5
-	upnp? (
-		dev-python/twisted-web
-		dev-python/elementtree
-		dev-python/celementtree
-		dev-python/soappy
-	)
-	dvd? (
-		media-libs/libdvdcss
-		>=media-plugins/gst-plugins-ffmpeg-0.10
-		>=media-libs/gst-plugins-bad-0.10
-		>=media-libs/gst-plugins-ugly-0.10
-	)
-	lirc? (
-		app-misc/lirc
-		dev-python/pylirc
-	)
-	daap? (
-		dev-python/PythonDaap
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=net-dns/avahi-0.6
-	)
-	ipod? (
-		media-libs/libgpod
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/hal-0.5
-	)"
-
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS"
-
-pkg_setup() {
-	if use daap ; then
-		if built_with_use net-dns/avahi python ; then
-			einfo "Avahi Python bindings found ..."
-		else
-			eerror "Please rebuild net-dns/avahi with python support enabled!"
-			eerror "Try USE=\"python\" emerge net-dns/avahi,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge net-dns/avahi."
-			die "USE flag \"python\" must be enabled in net-dns/avahi"
-		fi
-	fi
-
-
-	if use ipod ; then
-		if built_with_use media-libs/libgpod python ; then
-			einfo "libgpod Python bindings found ..."
-		else
-			eerror "Please rebuild media-libs/libgpod with python support enabled!"
-			eerror "Try USE=\"python\" emerge media-libs/libgpod,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge media-libs/libgpod."
-			die "USE flag \"python\" must be enabled in media-libs/libgpod"
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	einfo "After first run of the box, edit elisa.conf and add some media"
-	einfo "locations in [movies], [music] and [pictures] config sections"
-	einfo "e.g."
-	einfo "[plugins.pictures]"
-	einfo "locations = ['file://./sample_data/pictures',]"
-	einfo ""
-	einfo "[plugins.movies]"
-	einfo "locations = ['file://./sample_data/movies', 'file:///data/movies/', 'smb://mediaserver/movies/']"
-	einfo ""
-	einfo "[plugins.music]"
-	einfo "locations = ['file://./sample_data/music', 'file:///data/music/']"
-
-}
diff --git a/media-video/elisa/elisa-0.1.4.2.ebuild b/media-video/elisa/elisa-0.1.4.2.ebuild
deleted file mode 100644
index ffcc383..0000000
--- a/media-video/elisa/elisa-0.1.4.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2006-2007 BreakMyGentoo.org
-# Distributed under the terms of the GNU General Public License v2
-
-inherit distutils python
-
-DESCRIPTION="Elisa is an open source, cross platform media center solution for Linux, MacOSX and Windows on top of GStreamer."
-HOMEPAGE="http://www.fluendo.com/elisa/"
-SRC_URI="http://www.fluendo.com/elisa/downloads/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="daap doc dvd ipod lirc upnp"
-
-MAKEOPTS="-j1"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-python/setuptools
-	>=dev-python/imaging-1
-	>=dev-python/twisted-2.2
-	dev-python/gnome-python-extras
-	>=media-libs/gstreamer-0.10.4
-	>=dev-python/gst-python-0.10
-	>=media-plugins/gst-plugins-ogg-0.10
-	>=media-plugins/gst-plugins-vorbis-0.10
-	>=media-plugins/gst-plugins-theora-0.10
-	>=media-libs/pigment-0.1.1
-	>=dev-db/sqlite-3.2.8
-	>=dev-python/pysqlite-2.0.5
-	upnp? (
-		dev-python/twisted-web
-		dev-python/elementtree
-		dev-python/celementtree
-		dev-python/soappy
-	)
-	dvd? (
-		media-libs/libdvdcss
-		>=media-plugins/gst-plugins-ffmpeg-0.10
-		>=media-libs/gst-plugins-bad-0.10
-		>=media-libs/gst-plugins-ugly-0.10
-	)
-	lirc? (
-		app-misc/lirc
-		dev-python/pylirc
-	)
-	daap? (
-		dev-python/PythonDaap
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=net-dns/avahi-0.6
-	)
-	ipod? (
-		media-libs/libgpod
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/hal-0.5
-	)"
-
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS"
-
-pkg_setup() {
-	if use daap ; then
-		if built_with_use net-dns/avahi python ; then
-			einfo "Avahi Python bindings found ..."
-		else
-			eerror "Please rebuild net-dns/avahi with python support enabled!"
-			eerror "Try USE=\"python\" emerge net-dns/avahi,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge net-dns/avahi."
-			die "USE flag \"python\" must be enabled in net-dns/avahi"
-		fi
-	fi
-
-
-	if use ipod ; then
-		if built_with_use media-libs/libgpod python ; then
-			einfo "libgpod Python bindings found ..."
-		else
-			eerror "Please rebuild media-libs/libgpod with python support enabled!"
-			eerror "Try USE=\"python\" emerge media-libs/libgpod,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge media-libs/libgpod."
-			die "USE flag \"python\" must be enabled in media-libs/libgpod"
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	einfo "After first run of the box, edit elisa.conf and add some media"
-	einfo "locations in [movies], [music] and [pictures] config sections"
-	einfo "e.g."
-	einfo "[plugins.pictures]"
-	einfo "locations = ['file://./sample_data/pictures',]"
-	einfo ""
-	einfo "[plugins.movies]"
-	einfo "locations = ['file://./sample_data/movies', 'file:///data/movies/', 'smb://mediaserver/movies/']"
-	einfo ""
-	einfo "[plugins.music]"
-	einfo "locations = ['file://./sample_data/music', 'file:///data/music/']"
-
-}
diff --git a/media-video/elisa/elisa-0.1.5.ebuild b/media-video/elisa/elisa-0.1.5.ebuild
deleted file mode 100644
index dc61bb3..0000000
--- a/media-video/elisa/elisa-0.1.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2006-2007 BreakMyGentoo.org
-# Distributed under the terms of the GNU General Public License v2
-
-inherit distutils python
-
-DESCRIPTION="Elisa is an open source, cross platform media center solution for Linux, MacOSX and Windows on top of GStreamer."
-HOMEPAGE="http://elisa.fluendo.com/"
-SRC_URI="http://elisa.fluendo.com/static/download/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="daap doc dvd ipod lirc upnp"
-
-MAKEOPTS="-j1"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-python/setuptools
-	>=dev-python/imaging-1
-	>=dev-python/twisted-2.2
-	dev-python/gnome-python-extras
-	>=media-libs/gstreamer-0.10.4
-	>=dev-python/gst-python-0.10
-	>=media-plugins/gst-plugins-ogg-0.10
-	>=media-plugins/gst-plugins-vorbis-0.10
-	>=media-plugins/gst-plugins-theora-0.10
-	>=media-libs/pigment-0.1.1
-	>=dev-db/sqlite-3.2.8
-	>=dev-python/pysqlite-2.0.5
-	upnp? (
-		dev-python/twisted-web
-		dev-python/elementtree
-		dev-python/celementtree
-		dev-python/soappy
-	)
-	dvd? (
-		media-libs/libdvdcss
-		>=media-plugins/gst-plugins-ffmpeg-0.10
-		>=media-libs/gst-plugins-bad-0.10
-		>=media-libs/gst-plugins-ugly-0.10
-	)
-	lirc? (
-		app-misc/lirc
-		dev-python/pylirc
-	)
-	daap? (
-		dev-python/PythonDaap
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=net-dns/avahi-0.6
-	)
-	ipod? (
-		media-libs/libgpod
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/hal-0.5
-	)"
-
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS"
-
-pkg_setup() {
-	if use daap ; then
-		if built_with_use net-dns/avahi python ; then
-			einfo "Avahi Python bindings found ..."
-		else
-			eerror "Please rebuild net-dns/avahi with python support enabled!"
-			eerror "Try USE=\"python\" emerge net-dns/avahi,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge net-dns/avahi."
-			die "USE flag \"python\" must be enabled in net-dns/avahi"
-		fi
-	fi
-
-
-	if use ipod ; then
-		if built_with_use media-libs/libgpod python ; then
-			einfo "libgpod Python bindings found ..."
-		else
-			eerror "Please rebuild media-libs/libgpod with python support enabled!"
-			eerror "Try USE=\"python\" emerge media-libs/libgpod,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge media-libs/libgpod."
-			die "USE flag \"python\" must be enabled in media-libs/libgpod"
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	einfo "After first run of the box, edit elisa.conf and add some media"
-	einfo "locations in [movies], [music] and [pictures] config sections"
-	einfo "e.g."
-	einfo "[plugins.pictures]"
-	einfo "locations = ['file://./sample_data/pictures',]"
-	einfo ""
-	einfo "[plugins.movies]"
-	einfo "locations = ['file://./sample_data/movies', 'file:///data/movies/', 'smb://mediaserver/movies/']"
-	einfo ""
-	einfo "[plugins.music]"
-	einfo "locations = ['file://./sample_data/music', 'file:///data/music/']"
-
-}
diff --git a/media-video/elisa/elisa-0.1.6.ebuild b/media-video/elisa/elisa-0.1.6.ebuild
deleted file mode 100644
index dc61bb3..0000000
--- a/media-video/elisa/elisa-0.1.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2006-2007 BreakMyGentoo.org
-# Distributed under the terms of the GNU General Public License v2
-
-inherit distutils python
-
-DESCRIPTION="Elisa is an open source, cross platform media center solution for Linux, MacOSX and Windows on top of GStreamer."
-HOMEPAGE="http://elisa.fluendo.com/"
-SRC_URI="http://elisa.fluendo.com/static/download/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="daap doc dvd ipod lirc upnp"
-
-MAKEOPTS="-j1"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-python/setuptools
-	>=dev-python/imaging-1
-	>=dev-python/twisted-2.2
-	dev-python/gnome-python-extras
-	>=media-libs/gstreamer-0.10.4
-	>=dev-python/gst-python-0.10
-	>=media-plugins/gst-plugins-ogg-0.10
-	>=media-plugins/gst-plugins-vorbis-0.10
-	>=media-plugins/gst-plugins-theora-0.10
-	>=media-libs/pigment-0.1.1
-	>=dev-db/sqlite-3.2.8
-	>=dev-python/pysqlite-2.0.5
-	upnp? (
-		dev-python/twisted-web
-		dev-python/elementtree
-		dev-python/celementtree
-		dev-python/soappy
-	)
-	dvd? (
-		media-libs/libdvdcss
-		>=media-plugins/gst-plugins-ffmpeg-0.10
-		>=media-libs/gst-plugins-bad-0.10
-		>=media-libs/gst-plugins-ugly-0.10
-	)
-	lirc? (
-		app-misc/lirc
-		dev-python/pylirc
-	)
-	daap? (
-		dev-python/PythonDaap
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=net-dns/avahi-0.6
-	)
-	ipod? (
-		media-libs/libgpod
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/hal-0.5
-	)"
-
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS"
-
-pkg_setup() {
-	if use daap ; then
-		if built_with_use net-dns/avahi python ; then
-			einfo "Avahi Python bindings found ..."
-		else
-			eerror "Please rebuild net-dns/avahi with python support enabled!"
-			eerror "Try USE=\"python\" emerge net-dns/avahi,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge net-dns/avahi."
-			die "USE flag \"python\" must be enabled in net-dns/avahi"
-		fi
-	fi
-
-
-	if use ipod ; then
-		if built_with_use media-libs/libgpod python ; then
-			einfo "libgpod Python bindings found ..."
-		else
-			eerror "Please rebuild media-libs/libgpod with python support enabled!"
-			eerror "Try USE=\"python\" emerge media-libs/libgpod,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge media-libs/libgpod."
-			die "USE flag \"python\" must be enabled in media-libs/libgpod"
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	einfo "After first run of the box, edit elisa.conf and add some media"
-	einfo "locations in [movies], [music] and [pictures] config sections"
-	einfo "e.g."
-	einfo "[plugins.pictures]"
-	einfo "locations = ['file://./sample_data/pictures',]"
-	einfo ""
-	einfo "[plugins.movies]"
-	einfo "locations = ['file://./sample_data/movies', 'file:///data/movies/', 'smb://mediaserver/movies/']"
-	einfo ""
-	einfo "[plugins.music]"
-	einfo "locations = ['file://./sample_data/music', 'file:///data/music/']"
-
-}
diff --git a/media-video/elisa/elisa-0.3.2.ebuild b/media-video/elisa/elisa-0.3.2.ebuild
deleted file mode 100644
index f5ba3a9..0000000
--- a/media-video/elisa/elisa-0.3.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2006-2007 BreakMyGentoo.org
-# Distributed under the terms of the GNU General Public License v2
-
-inherit distutils python
-
-DESCRIPTION="Elisa is an open source, cross platform media center solution for Linux, MacOSX and Windows on top of GStreamer."
-HOMEPAGE="http://elisa.fluendo.com/"
-SRC_URI="http://elisa.fluendo.com/static/download/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="daap doc dvd ipod lirc upnp"
-
-MAKEOPTS="-j1"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-python/setuptools
-	>=dev-python/imaging-1
-	>=dev-python/twisted-2.2
-	dev-python/twisted-web
-	dev-python/gnome-python-extras
-	>=media-libs/gstreamer-0.10.4
-	>=dev-python/gst-python-0.10
-	>=media-plugins/gst-plugins-ogg-0.10
-	>=media-plugins/gst-plugins-vorbis-0.10
-	>=media-plugins/gst-plugins-theora-0.10
-	>=media-libs/pigment-0.3
-	>=dev-db/sqlite-3.2.8
-	>=dev-python/pysqlite-2.0.5
-	dev-python/ctypes
-	upnp? (
-		dev-python/elementtree
-		dev-python/celementtree
-		dev-python/soappy
-	)
-	dvd? (
-		media-libs/libdvdcss
-		>=media-plugins/gst-plugins-ffmpeg-0.10
-		>=media-libs/gst-plugins-bad-0.10
-		>=media-libs/gst-plugins-ugly-0.10
-		dev-python/tagpy
-	)
-	lirc? (
-		app-misc/lirc
-		dev-python/pylirc
-	)
-	daap? (
-		dev-python/PythonDaap
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=net-dns/avahi-0.6
-	)
-	ipod? (
-		media-libs/libgpod
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/hal-0.5
-	)"
-
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS"
-
-pkg_setup() {
-	if use daap ; then
-		if built_with_use net-dns/avahi python ; then
-			einfo "Avahi Python bindings found ..."
-		else
-			eerror "Please rebuild net-dns/avahi with python support enabled!"
-			eerror "Try USE=\"python\" emerge net-dns/avahi,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge net-dns/avahi."
-			die "USE flag \"python\" must be enabled in net-dns/avahi"
-		fi
-	fi
-
-
-	if use ipod ; then
-		if built_with_use media-libs/libgpod python ; then
-			einfo "libgpod Python bindings found ..."
-		else
-			eerror "Please rebuild media-libs/libgpod with python support enabled!"
-			eerror "Try USE=\"python\" emerge media-libs/libgpod,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge media-libs/libgpod."
-			die "USE flag \"python\" must be enabled in media-libs/libgpod"
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	einfo "After first run of the box, edit elisa.conf and add some media"
-	einfo "locations in [movies], [music] and [pictures] config sections"
-	einfo "e.g."
-	einfo "[plugins.pictures]"
-	einfo "locations = ['file://./sample_data/pictures',]"
-	einfo ""
-	einfo "[plugins.movies]"
-	einfo "locations = ['file://./sample_data/movies', 'file:///data/movies/', 'smb://mediaserver/movies/']"
-	einfo ""
-	einfo "[plugins.music]"
-	einfo "locations = ['file://./sample_data/music', 'file:///data/music/']"
-
-}
diff --git a/media-video/elisa/elisa-0.3.2_p1.ebuild b/media-video/elisa/elisa-0.3.2_p1.ebuild
deleted file mode 100644
index 886c17f..0000000
--- a/media-video/elisa/elisa-0.3.2_p1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2006-2007 BreakMyGentoo.org
-# Distributed under the terms of the GNU General Public License v2
-
-inherit distutils python
-
-DESCRIPTION="Elisa is an open source, cross platform media center solution for Linux, MacOSX and Windows on top of GStreamer."
-HOMEPAGE="http://elisa.fluendo.com/"
-SRC_URI="http://elisa.fluendo.com/static/download/${PN}/${P}.tar.gz"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="daap doc dvd ipod lirc upnp"
-
-MAKEOPTS="-j1"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-python/setuptools
-	>=dev-python/imaging-1
-	>=dev-python/twisted-2.2
-	dev-python/twisted-web
-	dev-python/gnome-python-extras
-	>=media-libs/gstreamer-0.10.4
-	>=dev-python/gst-python-0.10
-	>=media-plugins/gst-plugins-ogg-0.10
-	>=media-plugins/gst-plugins-vorbis-0.10
-	>=media-plugins/gst-plugins-theora-0.10
-	>=media-libs/pigment-0.3
-	>=dev-db/sqlite-3.2.8
-	>=dev-python/pysqlite-2.0.5
-	dev-python/ctypes
-	upnp? (
-		dev-python/elementtree
-		dev-python/celementtree
-		dev-python/soappy
-	)
-	dvd? (
-		media-libs/libdvdcss
-		>=media-plugins/gst-plugins-ffmpeg-0.10
-		>=media-libs/gst-plugins-bad-0.10
-		>=media-libs/gst-plugins-ugly-0.10
-		dev-python/tagpy
-	)
-	lirc? (
-		app-misc/lirc
-		dev-python/pylirc
-	)
-	daap? (
-		dev-python/PythonDaap
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=net-dns/avahi-0.6
-	)
-	ipod? (
-		media-libs/libgpod
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/hal-0.5
-	)"
-
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS"
-
-pkg_setup() {
-	if use daap ; then
-		if built_with_use net-dns/avahi python ; then
-			einfo "Avahi Python bindings found ..."
-		else
-			eerror "Please rebuild net-dns/avahi with python support enabled!"
-			eerror "Try USE=\"python\" emerge net-dns/avahi,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge net-dns/avahi."
-			die "USE flag \"python\" must be enabled in net-dns/avahi"
-		fi
-	fi
-
-
-	if use ipod ; then
-		if built_with_use media-libs/libgpod python ; then
-			einfo "libgpod Python bindings found ..."
-		else
-			eerror "Please rebuild media-libs/libgpod with python support enabled!"
-			eerror "Try USE=\"python\" emerge media-libs/libgpod,"
-			eerror "or add \"python\" to your USE string in /etc/make.conf and"
-			eerror "emerge media-libs/libgpod."
-			die "USE flag \"python\" must be enabled in media-libs/libgpod"
-		fi
-	fi
-
-	addpredict /root/.gconf:/root/.gconfd:/root/.gstreamer-0.10
-}
-
-pkg_postinst() {
-
-	einfo "After first run of the box, edit elisa.conf and add some media"
-	einfo "locations in [movies], [music] and [pictures] config sections"
-	einfo "e.g."
-	einfo "[plugins.pictures]"
-	einfo "locations = ['file://./sample_data/pictures',]"
-	einfo ""
-	einfo "[plugins.movies]"
-	einfo "locations = ['file://./sample_data/movies', 'file:///data/movies/', 'smb://mediaserver/movies/']"
-	einfo ""
-	einfo "[plugins.music]"
-	einfo "locations = ['file://./sample_data/music', 'file:///data/music/']"
-
-}
diff --git a/media-video/elisa/elisa-0.3.4.ebuild b/media-video/elisa/elisa-0.3.5.ebuild
index 8c834e1..cc81bbe 100644
--- a/media-video/elisa/elisa-0.3.4.ebuild
+++ b/media-video/elisa/elisa-0.3.5.ebuild
@@ -13,7 +13,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE="daap doc dvd ipod lirc"
+IUSE="daap doc dvd hal ipod flash lirc"
 
 MAKEOPTS="-j1"
 
@@ -40,6 +40,11 @@ RDEPEND=">=dev-lang/python-2.5
 		>=media-libs/gst-plugins-ugly-0.10
 		dev-python/tagpy
 	)
+	flash? (
+		>=media-plugins/gst-plugins-ffmpeg-0.10
+		>=media-libs/gst-plugins-bad-0.10
+		dev-python/gdata
+	)
 	lirc? (
 		app-misc/lirc
 		dev-python/pylirc
@@ -50,11 +55,12 @@ RDEPEND=">=dev-lang/python-2.5
 		>=dev-python/dbus-python-0.71
 		>=net-dns/avahi-0.6
 	)
+	hal? (
+		>=sys-apps/hal-0.5
+		>=dev-python/dbus-python-0.71
+	)
 	ipod? (
 		media-libs/libgpod
-		>=sys-apps/dbus-1
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/hal-0.5
 	)"
 
 
@@ -104,5 +110,9 @@ pkg_postinst() {
 	einfo "locations = ['file://./sample_data/pictures', 'file:///media/videos']"
 	einfo ""
 	einfo "If you get failures loading plugins, delete ~/.elisa"
+	einfo ""
+	einfo "Please replace gstreamer:gst_metadata_client with"
+	einfo "gstreamer:gst_metadata in your ~/.elisa/elisa.conf to get song"
+	einfo "metadata scanning"
 
 }
diff --git a/media-video/elisa/files/digest-elisa-0.1.3 b/media-video/elisa/files/digest-elisa-0.1.3
deleted file mode 100644
index 53c21cb..0000000
--- a/media-video/elisa/files/digest-elisa-0.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3cfee4e375ac2f7aca21230d412a74fa elisa-0.1.3.tar.gz 11457436
-RMD160 c46b32839dbfc618df0854178216fb7b0ca2d6fb elisa-0.1.3.tar.gz 11457436
-SHA256 f1b43d6694f3595ecbc19c43021fad915ec8b822569c9f0a21ee3dfbee917954 elisa-0.1.3.tar.gz 11457436
diff --git a/media-video/elisa/files/digest-elisa-0.1.4.1 b/media-video/elisa/files/digest-elisa-0.1.4.1
deleted file mode 100644
index fa9cb82..0000000
--- a/media-video/elisa/files/digest-elisa-0.1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7d3c2521ebf67388b699d16774a7a264 elisa-0.1.4.1.tar.gz 12134145
-RMD160 053c133450bd0463f72be2c96dad0ea3e86ccb8e elisa-0.1.4.1.tar.gz 12134145
-SHA256 eb0c41f71dee41228aec2f1e8896fb82934bcdda41a7c3891d8b4764228585c6 elisa-0.1.4.1.tar.gz 12134145
diff --git a/media-video/elisa/files/digest-elisa-0.1.4.2 b/media-video/elisa/files/digest-elisa-0.1.4.2
deleted file mode 100644
index e997cf6..0000000
--- a/media-video/elisa/files/digest-elisa-0.1.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fe9bfb723c8565e62ebf4d2e21588aab elisa-0.1.4.2.tar.gz 13327257
-RMD160 287c6f9852567f329f36a45c6c1a2ec3b8c4e65a elisa-0.1.4.2.tar.gz 13327257
-SHA256 717e814a8ed5a31fd42da5921e1378dfce751b994302f14f9cb5c5233a14ddfa elisa-0.1.4.2.tar.gz 13327257
diff --git a/media-video/elisa/files/digest-elisa-0.1.5 b/media-video/elisa/files/digest-elisa-0.1.5
deleted file mode 100644
index 8da6eba..0000000
--- a/media-video/elisa/files/digest-elisa-0.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 988807e75a27c756f92b29d8c10daeb5 elisa-0.1.5.tar.gz 13333109
-RMD160 d4222a5462cdd07f05acacfaccc1c9704aa1a81a elisa-0.1.5.tar.gz 13333109
-SHA256 0fd0184c44b62fff35ab53a89193a781ea03f941e592c38157fcddf5535e6856 elisa-0.1.5.tar.gz 13333109
diff --git a/media-video/elisa/files/digest-elisa-0.1.6 b/media-video/elisa/files/digest-elisa-0.1.6
deleted file mode 100644
index 5b022fb..0000000
--- a/media-video/elisa/files/digest-elisa-0.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fd2ff4b1616089c335b6b64e5232376a elisa-0.1.6.tar.gz 13333863
-RMD160 c3324b87117778ae3cc9bddbc514f426d5694047 elisa-0.1.6.tar.gz 13333863
-SHA256 5911b63ae71f7fbf50870f2feeeebc3179b33cbb2e1f009d730a77d86083d682 elisa-0.1.6.tar.gz 13333863
diff --git a/media-video/elisa/files/digest-elisa-0.3.2 b/media-video/elisa/files/digest-elisa-0.3.2
deleted file mode 100644
index 655da86..0000000
--- a/media-video/elisa/files/digest-elisa-0.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d890953304832586216d34baafa01faf elisa-0.3.2.tar.gz 11102424
-RMD160 ea100d5aa9529b431cf0829a0b36b0cab3dd9b1b elisa-0.3.2.tar.gz 11102424
-SHA256 79e30103192da60ccb6e33f198b88e9790f0715d86f603d36922223eee879260 elisa-0.3.2.tar.gz 11102424
diff --git a/media-video/elisa/files/digest-elisa-0.3.2_p1 b/media-video/elisa/files/digest-elisa-0.3.2_p1
deleted file mode 100644
index 612dac8..0000000
--- a/media-video/elisa/files/digest-elisa-0.3.2_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 92c5796c5d7fc1b9323bc1c07512e277 elisa-0.3.2_p1.tar.gz 12412080
-RMD160 0515229195f513bdce16664f0bc2a8157dbad399 elisa-0.3.2_p1.tar.gz 12412080
-SHA256 2339562a17122c9813aace9666c70e7a08223d52ca8e87af54b91ab7426aff7a elisa-0.3.2_p1.tar.gz 12412080
diff --git a/media-video/elisa/files/digest-elisa-0.3.3 b/media-video/elisa/files/digest-elisa-0.3.3
deleted file mode 100644
index 3f7ce24..0000000
--- a/media-video/elisa/files/digest-elisa-0.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 44397c8c0c70fcf3eabae5bad9fd514d elisa-0.3.3.tar.gz 22564562
-RMD160 1042cda8033dec4e8ce91aefb58822426e9d551d elisa-0.3.3.tar.gz 22564562
-SHA256 98c28abcc4dfcdd41b559d6b214b671fa7d31782bd0bc5411e2b47de5ed017e3 elisa-0.3.3.tar.gz 22564562
diff --git a/media-video/elisa/files/digest-elisa-0.3.4 b/media-video/elisa/files/digest-elisa-0.3.4
deleted file mode 100644
index 3f7ce24..0000000
--- a/media-video/elisa/files/digest-elisa-0.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 44397c8c0c70fcf3eabae5bad9fd514d elisa-0.3.3.tar.gz 22564562
-RMD160 1042cda8033dec4e8ce91aefb58822426e9d551d elisa-0.3.3.tar.gz 22564562
-SHA256 98c28abcc4dfcdd41b559d6b214b671fa7d31782bd0bc5411e2b47de5ed017e3 elisa-0.3.3.tar.gz 22564562