As per bug #113449, disable ability to build vlc with wxGTK built without unicode, as 2.6 version has non-experimental support, and vlc 0.8.4 seems to require it strictly.

Package-Manager: portage-2.0.53

4 files changed, 21 insertions, 23 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 083be1fee475..289b1afacc9b 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.125 2005/12/02 16:55:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.126 2005/12/08 12:29:51 flameeyes Exp $
+
+  08 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4.ebuild,
+  vlc-0.8.4-r1.ebuild:
+  As per bug #113449, disable ability to build vlc with wxGTK built without
+  unicode, as 2.6 version has non-experimental support, and vlc 0.8.4 seems to
+  require it strictly.
 
   02 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4-r1.ebuild:
   Added patch from Giandomenico De Tullio for enabing avahi support on 0.6
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 35c833a3aad7..d51a372ff50f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5f7f481e2f3168d1a23ed891e9a3647a ChangeLog 25328
+MD5 17deee59da7862ebcfb27e34256f04b1 ChangeLog 25601
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
@@ -11,12 +11,12 @@ MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
 MD5 b55b715634893ca4626128bb6b2764f8 vlc-0.8.1-r1.ebuild 6024
 MD5 34c899e9870f05ff49336006f2a0ab92 vlc-0.8.2-r1.ebuild 7576
 MD5 06b1c25d0b8b20d67db5a61f4c8078f5 vlc-0.8.2-r2.ebuild 7458
-MD5 01a3276db8cf1bd686d367f7e285288a vlc-0.8.4-r1.ebuild 7123
-MD5 c7260ce34328b0bb07e6c71813959374 vlc-0.8.4.ebuild 7045
+MD5 dbd0b1586f037dcefeb407aa993aede4 vlc-0.8.4-r1.ebuild 6989
+MD5 4f9e51043d86b120c8fbaf19fc194b59 vlc-0.8.4.ebuild 6911
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDkHyvAiZjviIA2XgRAsKKAKDLWrAtETyTQsEj3Q/WinqYt9sB+ACfSs+t
-VO3w1aZYyT6ZGcL5/3Ujgkk=
-=dhdJ
+iD8DBQFDmCdeAiZjviIA2XgRAp1HAJ0SiCgGgdoo584z180xuVeuCJdQ1ACfWh2Y
+hK7bSA+6S9PFTxlXvT+7G28=
+=u3xo
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.8.4-r1.ebuild b/media-video/vlc/vlc-0.8.4-r1.ebuild
index 968df503ec44..79b7046b3464 100644
--- a/media-video/vlc/vlc-0.8.4-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4-r1.ebuild,v 1.3 2005/12/02 16:55:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4-r1.ebuild,v 1.4 2005/12/08 12:29:51 flameeyes Exp $
 
 inherit eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska
 dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga
 oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick stream
 mp3 xv bidi sdl png xml2 samba daap corba screen mod speex nsplugin shout real
@@ -101,11 +101,7 @@ S="${WORKDIR}/${MY_P}"
 pkg_setup() {
 	if use wxwindows; then
 		WX_GTK_VER="2.6"
-		if use unicode; then
-			need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
-		else
-			need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
-		fi
+		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
 	fi
 
 	if use skins && ! use freetype; then
@@ -149,7 +145,6 @@ src_compile () {
 
 	econf \
 		$(use_enable altivec) \
-		$(use_enable unicode utf8) \
 		$(use_enable stream sout) \
 		$(use_enable httpd) \
 		$(use_enable vlm) \
@@ -210,6 +205,7 @@ src_compile () {
 		--disable-portaudio \
 		--disable-slp \
 		--disable-x264 \
+		--enable-utf8 \
 		${myconf} || die "configuration failed"
 
 	if [[ $(gcc-major-version) == 2 ]]; then
diff --git a/media-video/vlc/vlc-0.8.4.ebuild b/media-video/vlc/vlc-0.8.4.ebuild
index 513a442cba8d..543dd22a46ad 100644
--- a/media-video/vlc/vlc-0.8.4.ebuild
+++ b/media-video/vlc/vlc-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4.ebuild,v 1.1 2005/11/27 15:00:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4.ebuild,v 1.2 2005/12/08 12:29:51 flameeyes Exp $
 
 inherit eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska
 dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga
 oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick stream
 mp3 xv bidi sdl png xml2 samba daap corba screen mod speex nsplugin shout real
@@ -99,11 +99,7 @@ S="${WORKDIR}/${MY_P}"
 pkg_setup() {
 	if use wxwindows; then
 		WX_GTK_VER="2.6"
-		if use unicode; then
-			need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
-		else
-			need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
-		fi
+		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
 	fi
 }
 
@@ -148,7 +144,6 @@ src_compile () {
 
 	econf \
 		$(use_enable altivec) \
-		$(use_enable unicode utf8) \
 		$(use_enable stream sout) \
 		$(use_enable httpd) \
 		$(use_enable vlm) \
@@ -208,6 +203,7 @@ src_compile () {
 		--disable-hal \
 		--disable-x264 \
 		--disable-bonjour \
+		--enable-utf8 \
 		${myconf} || die "configuration failed"
 
 	if [[ $(gcc-major-version) == 2 ]]; then