Update depends based on what the source actually uses/looks for, not what upstream's packaging scripts claim it needs.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 22 insertions, 21 deletions

diff --git a/media-plugins/mythplugins/ChangeLog b/media-plugins/mythplugins/ChangeLog
index f9ff1fe81287..c2f6e77e37ae 100644
--- a/media-plugins/mythplugins/ChangeLog
+++ b/media-plugins/mythplugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/mythplugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythplugins/ChangeLog,v 1.2 2012/07/09 00:07:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythplugins/ChangeLog,v 1.3 2012/07/12 01:51:54 cardoe Exp $
+
+  11 Jul 2012; Doug Goldstein <cardoe@gentoo.org> mythplugins-0.25.1.ebuild,
+  metadata.xml:
+  Update depends based on what the source actually uses/looks for, not what
+  upstream's packaging scripts claim it needs.
 
   08 Jul 2012; Doug Goldstein <cardoe@gentoo.org> mythplugins-0.25.1.ebuild:
   Fix some depend typos
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
index 2beb2b9d21f5..a932ae89adc0 100644
--- a/media-plugins/mythplugins/metadata.xml
+++ b/media-plugins/mythplugins/metadata.xml
@@ -6,8 +6,6 @@
 		<flag name='cdr'>Allows MythMusic to burn CD-Rs</flag>
 		<flag name='exif'>Allows MythGallery to read EXIF data from photos</flag>
 		<flag name='fftw'>Adds visual effects to MythMusic when playing back music</flag>
-		<flag name='opengl'>Adds OpenGL visualizations to MythMusic and transition support to MythGallery</flag>
-		<flag name='projectm'>Adds additional visualizations from Project M to MythMusic</flag>
 		<flag name='raw'>Allows MythGallery to view photos saved in RAW format</flag>
 
 		<flag name='mytharchive'>Allows you to archive recorded content to CD or DVD</flag>
diff --git a/media-plugins/mythplugins/mythplugins-0.25.1.ebuild b/media-plugins/mythplugins/mythplugins-0.25.1.ebuild
index d20f510cb7d2..f5b728eb76f7 100644
--- a/media-plugins/mythplugins/mythplugins-0.25.1.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.25.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythplugins/mythplugins-0.25.1.ebuild,v 1.2 2012/07/09 00:07:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythplugins/mythplugins-0.25.1.ebuild,v 1.3 2012/07/12 01:51:54 cardoe Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~x86"
 MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
 mythmusic mythnetvision mythnews mythweather"
 
-IUSE="${MYTHPLUGINS} cdr exif fftw opengl projectm raw"
+IUSE="${MYTHPLUGINS} cdda cdr exif fftw raw"
 
 DEPEND="!media-plugins/mytharchive
 	!media-plugins/mythbrowser
@@ -44,27 +44,24 @@ DEPEND="!media-plugins/mytharchive
 	)
 	mythgallery? (
 		media-libs/tiff
+		virtual/opengl
 		exif? ( >media-libs/libexif-0.6.9 )
-		opengl? ( virtual/opengl )
 		raw? ( media-gfx/dcraw )
 	)
 	mythmusic? (
-		dev-libs/libcdio
-		media-gfx/dcraw
 		>=media-libs/flac-1.1.2
-		>=media-libs/libmad-0.15.1b
 		>=media-libs/libvorbis-1.0
-		>=media-libs/taglib-1.4
-		cdr? ( virtual/cdrtools )
-		fftw? ( sci-libs/fftw )
-		opengl? ( virtual/opengl )
-		projectm? (
-			>=media-libs/libsdl-1.2.5[opengl]
-			=media-libs/libvisual-0.4*
-			media-plugins/libvisual-projectm
+		>=media-libs/taglib-1.6
+		media-sound/lame
+		virtual/opengl
+		cdda? (
+			dev-libs/libcdio
+			cdr? ( virtual/cdrtools )
 		)
+		fftw? ( sci-libs/fftw )
 	)
 	mythnetvision? (
+		=dev-lang/python-2*[xml]
 		dev-python/lxml
 		dev-python/mysql-python
 		dev-python/oauth
@@ -74,6 +71,7 @@ DEPEND="!media-plugins/mytharchive
 		dev-perl/DateManip
 		dev-perl/DateTime-Format-ISO8601
 		dev-perl/ImageSize
+		dev-perl/JSON
 		dev-perl/SOAP-Lite
 		dev-perl/XML-Simple
 		dev-perl/XML-Parser
@@ -83,12 +81,11 @@ DEPEND="!media-plugins/mytharchive
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="
-	cdr? ( mythmusic )
+	cdda? ( mythmusic )
+	cdr? ( mythmusic cdda )
 	exif? ( mythgallery )
 	fftw? ( mythmusic )
 	mythnews? ( mythbrowser )
-	opengl? ( || ( mythgallery mythmusic ) )
-	projectm? ( mythmusic )
 	raw? ( mythgallery )"
 
 pkg_setup() {
@@ -108,6 +105,7 @@ src_configure() {
 	./configure \
 		--prefix=/usr \
 		--python=python2 \
+		--enable-opengl \
 		--disable-mythzoneminder \
 		$(use_enable mytharchive) \
 		$(use_enable mythbrowser) \
@@ -117,9 +115,9 @@ src_configure() {
 		$(use_enable mythnetvision) \
 		$(use_enable mythnews) \
 		$(use_enable mythweather) \
+		$(use_enable cdda cdio) \
 		$(use_enable exif) \
 		$(use_enable exif new-exif) \
-		$(use_enable opengl) \
 		$(use_enable raw dcraw) \
 		|| die "configure failed"
 }