More preparations for 2.1.0 version bump: Added missing line continuation characters which absence caused the econf command to split. Made sure qt5 being disabled doesnt

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 42 insertions, 18 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 6acdb167d75a..669907f4d964 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.855 2013/10/21 19:15:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.856 2013/10/24 23:34:33 tomwij Exp $
+
+  24 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/vlc-2.1.0-fix-libtremor-libs.patch, vlc-9999.ebuild:
+  More preparations for 2.1.0 version bump: Added missing line continuation
+  characters which absence caused the econf command to split. Made sure qt5
+  being disabled doesnt
 
   21 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
   -files/vlc-2.1.0-freetype-proper-default-font.patch, metadata.xml,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index d3f7634d0deb..f5fc3fc9ce3d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vlc-2.1.0-fix-libtremor-libs.patch 453 SHA256 5b2d4272b0258b30d1e34717ad83ebe2bcea78a5247798a74c0b86ace6d39463 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae WHIRLPOOL 39d9d1670e244169087ecc81654b1d6407c9e5f0f0da1bb1b15d7c89a7dab232b9a174c2a5e9ed2586a57a370f3cd9d2c9434381387a1fbc70b7f7bd8de2ef85
 AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236486a885b9f64b4c80004db7964b2b931c1 SHA512 74cba8136b2abb7a78b5ee8c8b5a9b3509a4a16ff9d4f136a3a7e2d6ff634ce20e34b8d140810ac63dd6cd3115d71cbb87a6e213fb172485494e55ade1b5230a WHIRLPOOL 1d2e747f4097c7903b798d7dfd17e11de41c01e903afda0b2c766ef5d7977da32362c52e5bc41c93a1f801a93c857c08d2cee3840f76a55afe0b2a768250073e
 AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa6443e5e9f69528f1d668bfc53d SHA512 e13541f116a11e27ffc25a25ff3e94c7122dcfdbe4eed8ad97abe3b672df135648523716eb2d0cd191caf0b59af010b4aab48202b3fbf5f1f7d6ab2144093122 WHIRLPOOL 8c0278e069ea73593a57d013b045380fe99ff7cfb79ffbca08d9cd761ee5b3ebccbcaaaab939861016af38dee35b9c327bb573ee8bef36934c64bf3ab8207d86
 DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
@@ -11,18 +12,18 @@ EBUILD vlc-2.0.5.ebuild 10964 SHA256 a16425b3ac14d440e2929a5bc9cabd15e3ef23f1d3d
 EBUILD vlc-2.0.6.ebuild 11027 SHA256 04bbf069ffbfdbcc82afb16192003cfe0c0453a5e14eb2473c9199675c6ef4ad SHA512 cf577b8824ba8414e9c9ab263d5e97e78b7d836f79b032871b2ad9efecac670d0d4f724327964c50db548aacc943930107f41a4ff211c7c727931c3881554fd9 WHIRLPOOL e82ba709ec6f764fa589fb1d182e3fbfdd097d663deaf8628d2fa4f2f9c317f1d711fa67a990768df0d8bfd04f1b176e52bc17975a0a254d23ad1178a05f1e85
 EBUILD vlc-2.0.7.ebuild 11017 SHA256 889c22514ff968c2d89637a2b207ebb41e98e44b4384956be850bbf42083952a SHA512 681039b0b1c1f3ac7ea27c21e81100d23f7fe726d060220c6c9a86ef454dfb551450e3a097063391b88b5c00b008421723d8ec84de6901ed4b3675df009a37e0 WHIRLPOOL 3bd88ccc00e6db6e5eeff3186b08873ecc38743393c7978091ffce446a975a6fdfe2801f918f8d1a5101f0b07213d0eebd34dd84150aabfd6cf0401ea9d536df
 EBUILD vlc-2.0.9999.ebuild 10801 SHA256 41eff317fa08d5a0e2fa5d6fa0cb75fb1a2ed9dc5c4b70c675821bef968b7c70 SHA512 7076090ce2aa458b040bac489f9a3e96244a45b65d2e0cd56ec78f43e7dd3ed5c06526b9909ccc78f98ac32300adf5a433e99934296cff7ec0fd4e8f4b142c19 WHIRLPOOL e7b8104fa83682f65c2be25bceb129c451661647bb38a3f8ae8ba7e2e79e412a5dfbc02b7001a2a55b2f66ddde5cf83ad6b8516d54310c3ccf61e3b78957541c
-EBUILD vlc-9999.ebuild 13200 SHA256 c0c3864ea8e5bde4f7d13aa7fe8d6fefb46494866431ed7355b1de02023927bb SHA512 2a9970eed8539e2c5bfddb9bde33acdaa3a8ce757dd5c5859c879890a4e5441657abf02779f309f544cb5ba75506efc49faf43ea34c654dc7e647b36a7284638 WHIRLPOOL 9e8ead065a019dc285b5788a9e9db1886005d04b64eae6ec30cbf45f20d0fc1ddaffbb649959381da063157fedf98bea10a4681dc85c534730e7d235c14d31e2
-MISC ChangeLog 14435 SHA256 8f2c5be4ffb148446aa4f861b3dc2ead1ff1a2c013158577001b9b5c72cc1e56 SHA512 6a498e486b179f2f38adfa881d7760ce624e9a230834aeec00114f092e0b0c90e9788f6c43079f23d9ccd3c9c794da967f0fde560af5ad937b94006fc1adaeab WHIRLPOOL f574da7e415e26dcd56c5a3f26e53a4c14f8cefed2c510ea2085840a1548647598b974fd86fdae8a81655fcaecb9ba48b9e9eae7765799cadad0d653e64dcbc9
+EBUILD vlc-9999.ebuild 13291 SHA256 ace24d9adc10eaa78b01a15647925f8316e20485de0d68cc5912360cb17ed357 SHA512 686b03e841077c35664eb430bc8968915c35cde7449aab79bfda25327cbe511be5ed6c0f6a2f6e95a4698ddae8d5da9353e1f8fcd1010ab7e071dd6d06c72a49 WHIRLPOOL 5e388d2421c30aa1ee131a338779ceaf243d97273626dd98342e3923beb33aca1a87c8cde4ff92072a3b3645bf97ca701f64b5e1a04985050c34348a5d8edd5f
+MISC ChangeLog 14721 SHA256 f74edf288afd7e6b5b10401456a9d03ea6bec094164ba11843fea8668181109e SHA512 1ca647a4611335358c4e3f38971c537bb591375bcfa248163066fe2f452368ceda41e3363a9318b280c358864ca10b8cd1a8c17d25e0a942c9fb250c793e7c06 WHIRLPOOL 3c32f04116d2de10a8ef0c5e71c1c7afe5cbac3f8e31ae385fc5c316a4930962642f78ac4eebc1b96cbc3cd376d0c9eea51fb5befd8a2e3ed187ec3611d7670f
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6623 SHA256 376e9624176340c026c4c4ecd581cbcb287ebf80ca3d77a6853c947695225d64 SHA512 e9f83a04ba249562a33fb4d82ad4b9a16d9af49aa4b867b4a8163ccb11dbbc6853287a52a05701ca33a5d419c97d9189c7531d002a6f8ce60dd35a4d6ce8d34a WHIRLPOOL 7e9f6a8af857e424b04700b651cc7d3c2c33a699ff931a957b4d3227685cdefa38545ac944c607384eba629b35835eda020877ab07e368b8d80079bc2c160e48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSZX1LAAoJEJWyH81tNOV9j3cIAJ0OBkgoAWN6AHO+YuC9uFH/
-GfXoqoiSAFtZ3MWCHRPxLAPDAlwOvRoS40ndyI6LxNOWq5q8WalfmnLmD3P7x+HT
-UCQnVBuFU/9gzXNWsN6yS574wcV1uLdfYzYwrBDYoxFAHoYhi04ucE6+Nf+SmC/i
-2OwG1b9A6bqsIep+xCNYTsGPURlSTA5Mi74c4Tv+Lrba0wpwYkbqMm1sdYhAmFcu
-QceBvhdvQdoRol6Qcp0LI5seL+s9OJQKz7IJDCjkTicx83WUXKf4BAickQR6iBJF
-14Gfi8XLq428vz/6Lkt8JcFgUytvRZjxOrb3IGwmTfM78CNR2APnxNQb3FjD7dI=
-=DMv0
+iQEcBAEBCAAGBQJSaa58AAoJEJWyH81tNOV926MH/2NXOlxlqE0V3THtyYpWprl+
+JLVra4rmjahI/RPog7xC/Jq2ge8N/cKjoV9cpiyHWa+2Cjw3mbIBHsHcwso6esy+
+VEwiWAXzAqqJSUJjHpuMv1SSXnchK1tAnYxvLbkbPcaiLlFIa6memFt6Hd+aIBjR
+AJcDRceRhCLBWRZHHsOIMZr9PsYn5bZUs6WKWm7kQS7AVi3yLlbNppCrRaP1DF9I
+2+fd3qY37J4ybmyBy9L57NfR85WjAX+K465lKa6KtHfWVYW+1R63LIXLMz2BR0Tr
+pyv2jTMoFF1mgQGlfuLVBrrRA9q1WuwBe94Mh2DK3gUvNaIVNOlgZ0zxyDREu4M=
+=kBrE
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch b/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch
new file mode 100644
index 000000000000..8a58969d0d8e
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch
@@ -0,0 +1,11 @@
+--- a/modules/codec/Makefile.am
++++ b/modules/codec/Makefile.am
+@@ -215,7 +215,7 @@
+ libtremor_plugin_la_SOURCES = codec/vorbis.c
+ libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
+ libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
++libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS)
+ EXTRA_LTLIBRARIES += libtremor_plugin.la
+ codec_LTLIBRARIES += $(LTLIBtremor)
+ 
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index c699024e2fbb..6eb7ccb078f8 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.193 2013/10/21 19:15:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.194 2013/10/24 23:34:33 tomwij Exp $
 
 EAPI="5"
 
@@ -52,7 +52,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
 	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
-	vlm vnc	vorbis waveout vpx wma-fixed +X x264 +xcb xml xv zvbi"
+	vlm vnc	vorbis vpx wma-fixed +X x264 +xcb xml xv zvbi"
 
 RDEPEND="
 		dev-libs/libgpg-error:0
@@ -225,6 +225,9 @@ src_prepare() {
 	# We are not in a real git checkout due to the absence of a .git directory.
 	touch src/revision.txt || die
 
+	# Fix mistakes.
+	epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
 	# Patch up incompatibilities and reconfigure autotools.
 	epatch "${FILESDIR}"/${PN}-2.1.0-newer-rdp.patch
 	epatch "${FILESDIR}"/${PN}-2.1.0-libva-1.2.1-compat.patch
@@ -248,9 +251,14 @@ src_configure() {
 				--with-default-monospace-font-family=Monospace"
 	fi
 
+	local qt_flag=""
+	if use qt4 || use qt5 ; then
+		qt_flag="--enable-qt"
+	fi
+
 	econf \
 		${myconf} \
-		--enable-vlc
+		--enable-vlc \
 		--docdir=/usr/share/doc/${PF} \
 		--disable-dependency-tracking \
 		--disable-optimizations \
@@ -284,7 +292,7 @@ src_configure() {
 		$(use_enable dxva2) \
 		$(use_enable egl) \
 		$(use_enable encode sout) \
-		$(use_enable fdk fdkaac)
+		$(use_enable fdk fdkaac) \
 		$(use_enable flac) \
 		$(use_enable fluidsynth) \
 		$(use_enable fontconfig) \
@@ -328,14 +336,13 @@ src_configure() {
 		$(use_enable omxil) \
 		$(use_enable opencv) \
 		$(use_enable opengl glx) $(use_enable opengl glspectrum) \
-		$(use_enable opus)
+		$(use_enable opus) \
 		$(use_enable optimisememory optimize-memory) \
 		$(use_enable png) \
 		$(use_enable postproc) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
-		$(use_enable qt4 qt) \
-		$(use_enable qt5 qt) \
+		${qt_flag} \
 		$(use_enable rdp freerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
@@ -366,7 +373,6 @@ src_configure() {
 		$(use_enable vnc) \
 		$(use_enable vorbis) \
 		$(use_enable vpx) \
-		$(use_enable waveout) \
 		$(use_enable wma-fixed) \
 		$(use_with X x) \
 		$(use_enable x264) \