Removed deprecated oggvorbis useflag. Made vlc-0.8.1-r1 install all the docs by dodoc instead of installing it on /usr/share/doc/vlc.

(Portage version: 2.0.51.19)

6 files changed, 34 insertions, 24 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 0c13b85f932b..00ef486fc2d3 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.78 2005/04/18 23:59:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.79 2005/04/20 13:45:35 flameeyes Exp $
+
+  20 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.6.2.ebuild,
+  vlc-0.6.2-r1.ebuild, vlc-0.7.2.ebuild, vlc-0.8.1.ebuild,
+  vlc-0.8.1-r1.ebuild:
+  Removed deprecated oggvorbis useflag. Made vlc-0.8.1-r1 install all the docs
+  by dodoc instead of installing it on /usr/share/doc/vlc.
 
   18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
   -vlc-0.6.0-r1.ebuild, -vlc-0.6.1.ebuild, vlc-0.6.2.ebuild,
diff --git a/media-video/vlc/vlc-0.6.2-r1.ebuild b/media-video/vlc/vlc-0.6.2-r1.ebuild
index 7848d67e219d..e418d23cc4c1 100644
--- a/media-video/vlc/vlc-0.6.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.2-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.6.2-r1.ebuild,v 1.19 2005/04/18 01:25:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2-r1.ebuild,v 1.20 2005/04/20 13:45:35 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -25,7 +25,7 @@ SLOT="0"
 KEYWORDS="~alpha ~x86"
 IUSE="3dfx X aalib alsa altivec arts debug dvb dvd dvdread esd aac fbcon flac
 	ggi gnome gtk imlib joystick kde lirc mad matroska mmx mozilla ncurses nls
-	oggvorbis oss qt sdl slp svga truetype v4l wxwindows xosd xv xvid"
+	ogg vorbis oss qt sdl slp svga truetype v4l wxwindows xosd xv xvid"
 
 RDEPEND="X? ( virtual/x11 )
 	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
@@ -49,7 +49,8 @@ RDEPEND="X? ( virtual/x11 )
 	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	ogg? ( >=media-libs/libogg-1.0 )
 	qt? ( x11-libs/qt )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	slp? ( >=net-libs/openslp-1.0.10 )
@@ -202,7 +203,7 @@ src_compile() {
 		`use_enable joystick` `use_enable lirc` \
 		`use_enable qt` `use_enable kde` `use_enable arts` \
 		`use_enable gtk` `use_enable gnome` \
-		`use_enable oggvorbis ogg` `use_enable oggvorbis vorbis` \
+		`use_enable ogg` `use_enable vorbis` \
 		`use_enable matroska mkv` \
 		`use_enable truetype freetype` \
 		`use_enable svga svgalib` \
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index 6245d5f4f190..55959cde66d0 100644
--- a/media-video/vlc/vlc-0.6.2.ebuild
+++ b/media-video/vlc/vlc-0.6.2.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.6.2.ebuild,v 1.25 2005/04/18 23:59:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.26 2005/04/20 13:45:35 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha x86"
 IUSE="3dfx X aalib alsa altivec arts debug dvb dvd dvdread esd aac fbcon ggi
-	gnome gtk imlib joystick kde lirc mad matroska mozilla ncurses nls oggvorbis oss
+	gnome gtk imlib joystick kde lirc mad matroska mozilla ncurses nls ogg vorbis oss
 	qt sdl slp svga truetype v4l wxwindows xosd xv xvid"
 
 RDEPEND="X? ( virtual/x11 )
@@ -42,7 +42,8 @@ RDEPEND="X? ( virtual/x11 )
 	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	ogg? ( >=media-libs/libogg-1.0 )
 	qt? ( x11-libs/qt )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	slp? ( >=net-libs/openslp-1.0.10 )
@@ -157,7 +158,7 @@ src_compile(){
 		`use_enable joystick` `use_enable lirc` \
 		`use_enable qt` `use_enable kde` `use_enable arts` \
 		`use_enable gtk` `use_enable gnome` \
-		`use_enable oggvorbis ogg` `use_enable oggvorbis vorbis` \
+		`use_enable ogg` `use_enable vorbis` \
 		`use_enable matroska mkv` \
 		`use_enable truetype freetype` \
 		`use_enable svga svgalib` \
diff --git a/media-video/vlc/vlc-0.7.2.ebuild b/media-video/vlc/vlc-0.7.2.ebuild
index d58728e6217f..a1840824dff9 100644
--- a/media-video/vlc/vlc-0.7.2.ebuild
+++ b/media-video/vlc/vlc-0.7.2.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.7.2.ebuild,v 1.11 2005/03/23 16:18:35 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.12 2005/04/20 13:45:35 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86"
 IUSE="arts ncurses dvd gtk nls 3dfx svga fbcon esd X alsa ggi speex
-	oggvorbis gnome xv oss sdl aalib slp bidi truetype v4l lirc
+	ogg vorbis gnome xv oss sdl aalib slp bidi truetype v4l lirc
 	wxwindows imlib matroska dvb mozilla debug aac theora
 	xosd png"
 
@@ -43,8 +43,8 @@ RDEPEND="X? ( virtual/x11 )
 	mozilla? ( >=www-client/mozilla-1.4 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( >=sys-devel/gettext-0.12.1 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0
-		>=media-libs/libogg-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	ogg? ( >=media-libs/libogg-1.0 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	slp? ( >=net-libs/openslp-1.0.10 )
 	bidi? ( >=dev-libs/fribidi-0.10.4 )
@@ -159,7 +159,7 @@ src_compile() {
 		$(use_enable joystick) $(use_enable lirc) \
 		$(use_enable arts) \
 		$(use_enable gtk) $(use_enable gnome) \
-		$(use_enable oggvorbis ogg) $(use_enable oggvorbis vorbis) \
+		$(use_enable ogg) $(use_enable vorbis vorbis) \
 		$(use_enable theora) \
 		$(use_enable speex) \
 		$(use_enable matroska mkv) \
diff --git a/media-video/vlc/vlc-0.8.1-r1.ebuild b/media-video/vlc/vlc-0.8.1-r1.ebuild
index 86ad2f859557..aee1e2cb476d 100644
--- a/media-video/vlc/vlc-0.8.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.1-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.1-r1.ebuild,v 1.4 2005/04/17 21:15:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.5 2005/04/20 13:45:35 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -15,7 +15,7 @@ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg oggvorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick mozilla hal stream mad xv bidi gtk2 sdl threads ssl portaudio"
+IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb 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 mozilla hal stream mad xv bidi gtk2 sdl threads ssl portaudio"
 
 DEPEND="hal? ( >=sys-apps/hal-0.2.97 )
 		cdio? ( >=dev-libs/libcdio-0.70 )
@@ -34,7 +34,7 @@ DEPEND="hal? ( >=sys-apps/hal-0.2.97 )
 		dts? ( media-libs/libdts )
 		flac? ( media-libs/flac )
 		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		oggvorbis? ( media-libs/libvorbis )
+		vorbis? ( media-libs/libvorbis )
 		theora? ( media-libs/libtheora )
 		X? ( virtual/x11 )
 		xv? ( virtual/x11 )
@@ -145,7 +145,7 @@ src_compile () {
 		$(use_enable ogg) \
 		$(use_enable matroska mkv) \
 		$(use_enable flac) \
-		$(use_enable oggvorbis vorbis) \
+		$(use_enable vorbis) \
 		$(use_enable theora) \
 		$(use_enable X x11) \
 		$(use_enable xv xvideo) \
@@ -202,13 +202,15 @@ src_compile () {
 src_install() {
 	make DESTDIR="${D}" install || die "Installation failed!"
 
-	dodoc ABOUT-NLS AUTHORS MAINTAINERS INSTALL HACKING THANKS TODO NEWS README
+	dodoc ABOUT-NLS AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
+		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
 
 	rm -r ${D}/usr/share/vlc/vlc*.png ${D}/usr/share/vlc/vlc*.xpm ${D}/usr/share/vlc/vlc*.ico \
 		${D}/usr/share/vlc/kvlc*.png ${D}/usr/share/vlc/kvlc*.xpm ${D}/usr/share/vlc/qvlc*.png \
 		${D}/usr/share/vlc/qvlc*.xpm ${D}/usr/share/vlc/gvlc*.png ${D}/usr/share/vlc/gvlc*.xpm \
 		${D}/usr/share/vlc/gvlc*.ico ${D}/usr/share/vlc/gnome-vlc*.png \
-		${D}/usr/share/vlc/gnome-vlc*.xpm ${D}/usr/share/vlc/skins2
+		${D}/usr/share/vlc/gnome-vlc*.xpm ${D}/usr/share/vlc/skins2 \
+		${D}/usr/share/doc/vlc
 
 	for res in 16 32 48; do
 		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
diff --git a/media-video/vlc/vlc-0.8.1.ebuild b/media-video/vlc/vlc-0.8.1.ebuild
index 1c85459c19e9..b377fad4c210 100644
--- a/media-video/vlc/vlc-0.8.1.ebuild
+++ b/media-video/vlc/vlc-0.8.1.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.1.ebuild,v 1.12 2005/03/23 16:18:35 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1.ebuild,v 1.13 2005/04/20 13:45:35 flameeyes Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -15,7 +15,7 @@ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg oggvorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick mozilla hal stream mad xv bidi"
+IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb 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 mozilla hal stream mad xv bidi"
 
 DEPEND="hal? ( >=sys-apps/hal-0.2.97 )
 		cdio? ( >=dev-libs/libcdio-0.70 )
@@ -34,7 +34,7 @@ DEPEND="hal? ( >=sys-apps/hal-0.2.97 )
 		dts? ( media-libs/libdts )
 		flac? ( media-libs/flac )
 		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		oggvorbis? ( media-libs/libvorbis )
+		vorbis? ( media-libs/libvorbis )
 		theora? ( media-libs/libtheora )
 		X? ( virtual/x11 )
 		xv? ( virtual/x11 )
@@ -125,7 +125,7 @@ src_compile () {
 	$(use_enable ogg) \
 	$(use_enable matroska mkv) \
 	$(use_enable flac) \
-	$(use_enable oggvorbis vorbis) \
+	$(use_enable vorbis) \
 	$(use_enable theora) \
 	$(use_enable X x11) \
 	$(use_enable xv xvideo) \