Add USE flag for vlc player backend, fixes bug 464200

Package-Manager: portage-2.2.0_alpha170-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

4 files changed, 68 insertions, 9 deletions

diff --git a/media-libs/emotion/ChangeLog b/media-libs/emotion/ChangeLog
index 4fc3ef740318..611d9f50d53e 100644
--- a/media-libs/emotion/ChangeLog
+++ b/media-libs/emotion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/emotion
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/ChangeLog,v 1.9 2012/12/27 16:41:19 tommy Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/ChangeLog,v 1.10 2013/04/02 19:40:10 tommy Exp $
+
+*emotion-1.7.4-r1 (02 Apr 2013)
+
+  02 Apr 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +emotion-1.7.4-r1.ebuild, metadata.xml:
+  Add USE flag for vlc player backend, fixes bug 464200
 
   27 Dec 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> emotion-1.7.4.ebuild:
   Fix configure options for USE=doc
diff --git a/media-libs/emotion/Manifest b/media-libs/emotion/Manifest
index 585865ad6208..40ff3240295a 100644
--- a/media-libs/emotion/Manifest
+++ b/media-libs/emotion/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA256
 
 DIST emotion-1.7.4.tar.bz2 499639 SHA256 44fd9061ffa0939a99e238044efefc0077ac0422781ea51be2d94a6735008111 SHA512 d5ebdc975c02d904764ff0d9d8defe6ab68f5f5d5cfa323567a5a78883f3bf0fb605e5998d22d98bc0f8b8cb8ab8c929a228cb40f7a845f4b05d7531c49420a8 WHIRLPOOL 15040bb34d68c3d4fe53a3a1b87b2b85edd63b960937af469e6d501c82f29b62d0fb8d3e44ca05682f9aee10f48eb55e9b3826feb7009bb5bd1d9d8d1af52eb8
+EBUILD emotion-1.7.4-r1.ebuild 1231 SHA256 ceccda0e6d40c7f986cfd07ab5e51fac769b57f38fbfb0c31630d2796f6ad32c SHA512 6d1e6079999f5005467f3db620835c9201fcd1dc3e61a1c7bb0b0e3c841a6d948954e95c26e4bb4b8592bf4c86bc3d80ae329ba176da3dc3056ae7d9cef58861 WHIRLPOOL c3cfd1c1e542effde17f304d3af7e79251143ed233179660b1b7f6e528dcc418574e38a2d5b57f815125f0aa19763dc5eb3002bd5fc9cd270eab976e9b0973f0
 EBUILD emotion-1.7.4.ebuild 1120 SHA256 cc6dbbaecca7319578490d4561ed7ec890e65f8f425cf4f4bb4b2d795de0b5a4 SHA512 a1952f574b1a3ce4cb7d481373e2589c274aa65e879331708fa57d993176412a2ecc4de44676d61706fa394f26330835643cb40ce511f3c20edd68f4c93bf0de WHIRLPOOL 6da8ba76c4d6aace84c4b36bebbb86bc5613f9d1338b6ac9b5f05a68bc08add7637be6bba782c36dfb955ea028ff4341f4e6ce713a0ffa591a76068eeed9c163
-MISC ChangeLog 890 SHA256 852069e1c24d754d5f80dd9bdd38be3bd590f782177239060b124cb571539ba8 SHA512 556723e98f05a7857efbc837b130dce90387162f93329008daf1184a48d453df414f95a6fd995e79b4a912b6b7dbf40d35d52c90d9d0a7f7bec1161f2152dd10 WHIRLPOOL eae54551cccec30c3699ee5604114eef8cc7f6279c168b3560d3ef005db3ebe4fde16385a7ad54d246c65803bbc7b8ebc0093762b0fd846b3b2d63405ad402aa
-MISC metadata.xml 166 SHA256 f6f84e7ad16649dcdcfe97ac44a4e858ac6e03efcf8d9e8e91264381632dbd0d SHA512 e489a45db03f6653ee0995e1c4262f3c5216a4e68b5afbdef69df8e80dca095d5a56461884541b27936241b17d4e0efdc0b821be45472eaef97ed6f0f9c4a461 WHIRLPOOL 0c51fe1dae0d5a3f76ef5c7e259aa2f6413b5bd21c633cc38d6313946de61cb58ff15864b1ee7b297afe751c1fbf9eebbee2f0e814f96d40f86e91ff03f0cd97
+MISC ChangeLog 1082 SHA256 6cc1884ddcc0eee72b5d5c34c42cbf98a6be8bce59187fbdffab22f61251d0a5 SHA512 e9b1848145b54773ad1e68b69f3b9317822352c80c30e815fb07052460cb167373a8fe1df8512d44882ab193ecc6cb20cb8a8918c623ff4e6b89d6147609bda6 WHIRLPOOL b6a47dd536f7641b9ffb3372c53b48a9289b8fd47c2f0ce3689dfdf43318d16e0d727c0748fd35166ecad058633116a4bc5b6d0825af4369a833cbe9f64dda0b
+MISC metadata.xml 269 SHA256 4c774df8cbf5c88c447ea6bd79bc991c64044cb138ae0b94e8b9126d826e0112 SHA512 2534b5b1d4cc4174cf3e2ea77190e5cb17b58c13185adc2be8d4991c23421beea9f1be51dcebc7fc7e3e2f8a31afe44d92bd544a3e0f427610af79e5aae6e64e WHIRLPOOL 4797f274190520689bd795fbadbda3bfabe67edcf694fb1b3f2cbcc80236c3c66e86a26655249918d0b97402d4528f7fb509a620433956fc778adea328fbdbe0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDcejUACgkQG7kqcTWJkGdZqQP/W//msYaUMGnJo7cz1HWdPxAC
-844WimrJxTeDVmIOYRBH3XMf9t6r8zThihN/CD5wZ6GCtbG6Y/6vtDrkaY5QGlNN
-DHnvSjp6excLqjYChyiiFP3bE90nEn9MOxIeERlAOsXbrRLljGTO088n5vBczTOq
-vXseJgSI8NI49gtuhbw=
-=pncC
+iJwEAQEIAAYFAlFbNB8ACgkQG7kqcTWJkGc68AP+OqQ7o/5Ji3YTxtaijcj9G7da
+GJrD42yJyYHfoA7gqtr8MEDk/Ec/hvv4rPHRn+sb6XDLcDpwMMnL6yLbRony7Trp
+ZVmaQ7gTgTamFYRifa3qPeC4l9gBmhxVouj1uN5eRwroFqxC2397P3Gboq2aiCGO
+jl+4GUWZce4YWbThrbg=
+=xJB3
 -----END PGP SIGNATURE-----
diff --git a/media-libs/emotion/emotion-1.7.4-r1.ebuild b/media-libs/emotion/emotion-1.7.4-r1.ebuild
new file mode 100644
index 000000000000..86cca377adaa
--- /dev/null
+++ b/media-libs/emotion/emotion-1.7.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/emotion-1.7.4-r1.ebuild,v 1.1 2013/04/02 19:40:10 tommy Exp $
+
+inherit enlightenment
+
+DESCRIPTION="video libraries for e17"
+SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer static-libs vlc xine"
+
+DEPEND=">=media-libs/evas-1.7.4
+	>=media-libs/edje-1.7.4
+	>=dev-libs/ecore-1.7.4
+	>=dev-libs/eeze-1.7.4
+	vlc? ( media-video/vlc )
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+	!gstreamer? ( !vlc? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) )
+	gstreamer? (
+		=media-libs/gstreamer-0.10*
+		=media-libs/gst-plugins-good-0.10*
+		=media-plugins/gst-plugins-ffmpeg-0.10*
+	)"
+RDEPEND=${DEPEND}
+
+src_compile() {
+	if ! use vlc && ! use xine && ! use gstreamer ; then
+		export MY_ECONF="--enable-xine --disable-gstreamer --disable-generic-vlc"
+	else
+		export MY_ECONF="
+			$(use_enable xine) \
+			$(use_enable gstreamer) \
+			$(use_enable vlc generic-vlc)
+		"
+	fi
+
+	MY_ECONF+="
+		$(use_enable doc)
+	"
+
+	if use gstreamer ; then
+		addpredict "/root/.gconfd"
+		addpredict "/root/.gconf"
+	fi
+
+	enlightenment_src_compile
+}
diff --git a/media-libs/emotion/metadata.xml b/media-libs/emotion/metadata.xml
index 99165add909f..282424f678d2 100644
--- a/media-libs/emotion/metadata.xml
+++ b/media-libs/emotion/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
+<use>
+ <flag name='vlc'>Enable support for the <pkg>media-video/vlc</pkg> player backend</flag>
+</use>
 </pkgmetadata>