Fix other packaging issues

Package-Manager: portage-2.1.2_pre3-r8

3 files changed, 40 insertions, 38 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f4d4147ca8ea..f9b522dabdaa 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.430 2006/10/31 11:54:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.431 2006/10/31 14:32:57 lu_zero Exp $
+
+  31 Oct 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_rc1.ebuild:
+  Fix some packaging issue part II
 
   31 Oct 2006; Luca Barbato <lu_zero@gentoo.org>
   -mplayer-1.0_pre20060810.ebuild, -mplayer-1.0_pre20061019.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 28cd6042437c..d021ac4d8940 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -27,14 +27,14 @@ EBUILD mplayer-1.0_pre8.ebuild 15502 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c
 MD5 db980765b40b1685613b1c2b3f91ecbc mplayer-1.0_pre8.ebuild 15502
 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c1143 mplayer-1.0_pre8.ebuild 15502
 SHA256 064f4421b0e091fba4c575b09cedd21cf6c4b8757bdc4608519d63d5b2dd5c9e mplayer-1.0_pre8.ebuild 15502
-EBUILD mplayer-1.0_rc1.ebuild 15708 RMD160 fa56737aa60b5e0fd142af331a56638c309e5409 SHA1 66064975025a8fc3ef508e96372e52673bb4f221 SHA256 aa06fede31610265f1d83b292b33640bf0e6fe8365d9986970f87db46c0f8832
-MD5 1b012b84f5998ef0db5f690cd13710c9 mplayer-1.0_rc1.ebuild 15708
-RMD160 fa56737aa60b5e0fd142af331a56638c309e5409 mplayer-1.0_rc1.ebuild 15708
-SHA256 aa06fede31610265f1d83b292b33640bf0e6fe8365d9986970f87db46c0f8832 mplayer-1.0_rc1.ebuild 15708
-MISC ChangeLog 77836 RMD160 4210dcfd4b935db1d871aa1b9ff5ea4ed3523d58 SHA1 dadd51882c9fa597c2781e5faf98bf1319450cef SHA256 a512632a497538e0425fca42772894efcb47dd6fce6c7b246f9aeb0d68e2f1b2
-MD5 e3b1ba3a6c8e0efe6c15baf5adfde7a0 ChangeLog 77836
-RMD160 4210dcfd4b935db1d871aa1b9ff5ea4ed3523d58 ChangeLog 77836
-SHA256 a512632a497538e0425fca42772894efcb47dd6fce6c7b246f9aeb0d68e2f1b2 ChangeLog 77836
+EBUILD mplayer-1.0_rc1.ebuild 15509 RMD160 6eee33e317e5f37bc031f59e4c53e5ced2ab8be7 SHA1 9553e92abf5a66fa22c3c3bcb4601b3becf2a4f4 SHA256 a6fdd08d03518779e89e28aa076c5589144a77381bfcc0d8cb57622f33cca171
+MD5 f842530e4110b564545547e3f91acd71 mplayer-1.0_rc1.ebuild 15509
+RMD160 6eee33e317e5f37bc031f59e4c53e5ced2ab8be7 mplayer-1.0_rc1.ebuild 15509
+SHA256 a6fdd08d03518779e89e28aa076c5589144a77381bfcc0d8cb57622f33cca171 mplayer-1.0_rc1.ebuild 15509
+MISC ChangeLog 77945 RMD160 9d8b26933bea0de4afb05eb2434f4fc65a009968 SHA1 57d503b54d0d27a72c86188d592ba27ecc92a30e SHA256 572dbc191753f4f1fc31f1d79dbd7f5e148bd1842fe589451c96773073b13e90
+MD5 bf45cb8f2eb4dedff0e99bbf4427fef3 ChangeLog 77945
+RMD160 9d8b26933bea0de4afb05eb2434f4fc65a009968 ChangeLog 77945
+SHA256 572dbc191753f4f1fc31f1d79dbd7f5e148bd1842fe589451c96773073b13e90 ChangeLog 77945
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/mplayer/mplayer-1.0_rc1.ebuild b/media-video/mplayer/mplayer-1.0_rc1.ebuild
index 63ba15e63695..bb1425d03ede 100644
--- a/media-video/mplayer/mplayer-1.0_rc1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.9 2006/10/31 11:48:39 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.10 2006/10/31 14:32:57 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,8 +9,8 @@ IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec amr arts bidi bl bindist
 cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd
 dv dvdread enca encode esd fbcon gif ggi gtk iconv ipv6 jack joystick jpeg
 libcaca lirc live livecd lzo mad matrox mmx mmxext musepack nas unicode
-vorbis opengl openal oss png real rtc samba sdl speex sse sse2 subtitles svga
-tga theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xv xvid xvmc"
+vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga 
+theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xv xvid xvmc"
 
 LANGS="bg cs de da el en es fr hu ja ko mk nl no pl pt_BR ro ru sk tr uk zh_CN
 zh_TW"
@@ -27,9 +27,9 @@ MY_P="MPlayer-${PV/_/}"
 S="${WORKDIR}/${MY_P}"
 AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
 SRC_URI="mirror://mplayer/releases/${MY_P}.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+	!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+				 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+				 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
 	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
 	amr? ( ${AMR_URI}/26_series/26.104/26104-510.zip
@@ -126,11 +126,7 @@ pkg_setup() {
 		REALLIBDIR="/opt/RealPlayer/codecs"
 	fi
 
-	if use subtitles && ! ( use iconv && use truetype ); then
-		ewarn "If you want to enable support for SSA/ASS subtitles, then"
-		ewarn "you will need to enable both the 'truetype' and the 'iconv'"
-		ewarn "USE flags for this package."
-	elif use truetype && ! use iconv; then
+	if use truetype && ! use iconv; then
 		ewarn "You enabled the 'truetype' USE flag, but support will be"
 		ewarn "disabled unless you also use 'iconv'."
 	fi
@@ -138,9 +134,11 @@ pkg_setup() {
 
 src_unpack() {
 
-	unpack ${MY_P}.tar.bz2 \
-		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2 \
-		font-arial-cp1250.tar.bz2
+	unpack ${MY_P}.tar.bz2
+
+	use truetype || unpack font-arial-iso-8859-1.tar.bz2 \
+							font-arial-iso-8859-2.tar.bz2 \
+							font-arial-cp1250.tar.bz2
 
 	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
 
@@ -270,7 +268,6 @@ src_compile() {
 	use v4l  || myconf="${myconf} --disable-tv-v4l1"
 	use v4l2 || myconf="${myconf} --disable-tv-v4l2"
 	use jack || myconf="${myconf} --disable-jack"
-	use subtitles || myconf="${myconf} --disable-ass"
 
 	#########
 	# Codecs #
@@ -466,8 +463,8 @@ src_install() {
 
 	# Install the default Skin and Gnome menu entry
 	if use gtk; then
-		dodir /usr/share/mplayer/Skin
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
+		dodir /usr/share/mplayer/skin
+		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/skin/default || die
 
 		# Fix the symlink
 		rm -rf ${D}/usr/bin/gmplayer
@@ -478,18 +475,20 @@ src_install() {
 		insinto /usr/share/applications
 		doins ${FILESDIR}/mplayer.desktop
 	fi
-
-	dodir /usr/share/mplayer/fonts
-	local x=
-	# Do this generic, as the mplayer people like to change the structure
-	# of their zips ...
-	for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-	do
-		cp -pPR ${x} ${D}/usr/share/mplayer/fonts
-	done
-	# Fix the font symlink ...
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	if ! use truetype
+	then
+		dodir /usr/share/mplayer/fonts
+		local x=
+		# Do this generic, as the mplayer people like to change the structure
+		# of their zips ...
+		for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
+		do
+			cp -pPR ${x} ${D}/usr/share/mplayer/fonts
+		done
+		# Fix the font symlink ...
+		rm -rf ${D}/usr/share/mplayer/font
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	fi
 
 	insinto /etc
 	newins ${S}/etc/example.conf mplayer.conf