Snapshot bump, add dga X11 dep, bug 213390, fix ssa subtitle memory leak, bug 213638, move cpu optimization flags inside custom-cflags check

Package-Manager: portage-2.1.4.4

3 files changed, 535 insertions, 2 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 5a6e7b0b751b..b04568fd77ee 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.558 2008/02/23 13:22:55 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.559 2008/03/17 14:24:28 beandog Exp $
+
+*mplayer-1.0_rc2_p26258 (17 Mar 2008)
+
+  17 Mar 2008; Steve Dibb <beandog@gentoo.org>
+  +mplayer-1.0_rc2_p26258.ebuild:
+  Snapshot bump, add dga X11 dep, bug 213390, fix ssa subtitle memory leak,
+  bug 213638, move cpu optimization flags inside custom-cflags check
 
 *mplayer-1.0_rc2_p25993-r1 (23 Feb 2008)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1573871de52f..8e8b416ba44b 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,8 +3,10 @@ DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer-1.0_rc2_p25993.tar.bz2 7949013 RMD160 47d580a2254d7f149f6d4b1db6f7937dd395380c SHA1 376579bf5413b023452c32722cbe3e15d6e18cad SHA256 ddc10dca3feeb713414f711e2982d6790565206c353c18f4052f39776f980c3a
+DIST mplayer-1.0_rc2_p26258.tar.bz2 7961981 RMD160 6e9f0a865c4638aa490beeaf51ff237319f0cfa5 SHA1 f1c6c3f520d6f57acddbace7a49b2423e5e15f0f SHA256 8998c1260e138bd0ba985011d62b94c2cd23b53c50da96c34d1f37024bc8a4b5
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
 EBUILD mplayer-1.0_rc2_p25993-r1.ebuild 15972 RMD160 f6afe8deba568374c31d2e7bfee6abae62f65359 SHA1 b950115c59f257bbc7a2064004f75746b3485978 SHA256 73c692859eddde70e5192fd789e58816495a7ffae1ce8f05c97f407047a29344
 EBUILD mplayer-1.0_rc2_p25993.ebuild 16085 RMD160 8bf7b35be60ab07ecf4a4840c3297ba0866e95d0 SHA1 c02562cbbd3d32382fc3a5e91e7d926f3349f458 SHA256 9ad1c3ccd6c0fa7b6218ba506f829b050b430b2a40f523c4b8c1aa829fbe111c
-MISC ChangeLog 98066 RMD160 cc64210d6a3f7547b3aae59f6cb22437cb28d64a SHA1 dfb7506bd3558220a11190162ca7bbf0cdc0e28d SHA256 98059fe1da55f85558db129bf231482f522f0807c9d717d89d48eb34e4af4560
+EBUILD mplayer-1.0_rc2_p26258.ebuild 16349 RMD160 ffa889344d7ea56d151f4a588423c29305eae5e8 SHA1 7b2c1f371d8123391dc1126951dcd3087b620014 SHA256 2e71884d7f541ed34b0e8379133d2cdca2bd530664d6b69a3dc17a9b0f7ef0ff
+MISC ChangeLog 98332 RMD160 8886781dba424b9305c9c5907aff3c0377df7b75 SHA1 36a4b561f8c37750185f8e3645ff3bffc39cb277 SHA256 f4ae9bced6093bd537816500485220939e5f5f7dbfeca8822d1625a37e153729
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p26258.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p26258.ebuild
new file mode 100644
index 000000000000..46dc765e80af
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.0_rc2_p26258.ebuild
@@ -0,0 +1,524 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p26258.ebuild,v 1.1 2008/03/17 14:24:28 beandog Exp $
+
+inherit eutils flag-o-matic multilib
+
+RESTRICT="strip"
+EAPI="1"
+IUSE="3dnow 3dnowext +a52 aac -aalib +alsa altivec amrnb amrwb -arts bidi bl
+bindist -color-console cddb cdio cdparanoia cpudetection custom-cflags debug
+dga doc dts dvb directfb +dvd dv enca encode esd -fbcon ftp -gif ggi gtk iconv
+ipv6 jack joystick -jpeg kernel_linux ladspa -libcaca lirc live lzo +mad -md5sum
++mmx mmxext mp2 +mp3 musepack nas nemesi unicode +vorbis opengl openal oss -png
+-pnm pulseaudio quicktime radio -rar real rtc -samba sdl speex srt sse sse2
+ssse3 svga teletext tga +theora -tivo +truetype v4l v4l2 vidix win32codecs +X
+x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+
+VIDEO_CARDS="s3virge mga tdfx vesa"
+
+for x in ${VIDEO_CARDS}; do
+	IUSE="${IUSE} video_cards_${x}"
+done
+
+BLUV="1.7"
+SVGV="1.9.17"
+AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
+SRC_URI="mirror://gentoo/${P}.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 )
+	!iconv? ( 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 )
+	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
+	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+RDEPEND="sys-libs/ncurses
+	!bindist? (
+		x86? (
+			win32codecs? ( media-libs/win32codecs )
+			real? ( media-libs/win32codecs
+				media-video/realplayer )
+			)
+		amd64? ( real? ( media-libs/amd64codecs ) )
+	)
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	amrnb? ( media-libs/amrnb )
+	amrwb? ( media-libs/amrwb )
+	arts? ( kde-base/arts )
+	openal? ( media-libs/openal )
+	bidi? ( dev-libs/fribidi )
+	cdio? ( dev-libs/libcdio )
+	cdparanoia? ( media-sound/cdparanoia )
+	directfb? ( dev-libs/DirectFB )
+	dga? ( x11-libs/libXxf86dga  )
+	dts? ( media-libs/libdca )
+	dv? ( media-libs/libdv )
+	dvb? ( media-tv/linuxtv-dvb-headers )
+	encode? (
+		aac? ( media-libs/faac )
+		mp2? ( media-sound/twolame )
+		mp3? ( media-sound/lame )
+		x264? ( media-libs/x264-svn )
+		)
+	esd? ( media-sound/esound )
+	enca? ( app-i18n/enca )
+	gif? ( media-libs/giflib )
+	ggi? ( media-libs/libggi
+		media-libs/libggiwmh )
+	gtk? ( media-libs/libpng
+		x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-libs/libXi
+		=x11-libs/gtk+-2* )
+	jpeg? ( media-libs/jpeg )
+	ladspa? ( media-libs/ladspa-sdk )
+	libcaca? ( media-libs/libcaca )
+	lirc? ( app-misc/lirc )
+	lzo? ( >=dev-libs/lzo-2 )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-libs/libmpcdec-1.2.2 )
+	nas? ( media-libs/nas )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )
+	pnm? ( media-libs/netpbm )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( >=media-libs/speex-1.1.7 )
+	srt? ( >=media-libs/freetype-2.1
+		media-libs/fontconfig )
+	svga? ( media-libs/svgalib )
+	theora? ( media-libs/libtheora )
+	live? ( >=media-plugins/live-2007.02.20 )
+	truetype? ( >=media-libs/freetype-2.1
+		media-libs/fontconfig )
+	vidix? ( x11-libs/libXxf86vm
+			 x11-libs/libXext )
+	xanim? ( media-video/xanim )
+	xinerama? ( x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/libXext )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/libXext
+		xvmc? ( x11-libs/libXvMC ) )
+	xvid? ( media-libs/xvid )
+	X? ( x11-libs/libXxf86vm
+		x11-libs/libXext
+	)"
+
+DEPEND="${RDEPEND}
+	doc? ( >=app-text/docbook-sgml-dtd-4.1.2
+		app-text/docbook-xml-dtd
+		>=app-text/docbook-xml-simple-dtd-1.50.0
+		dev-libs/libxslt )
+	dga? ( x11-proto/xf86dgaproto )
+	xinerama? ( x11-proto/xineramaproto )
+	xv? ( x11-proto/videoproto
+		  x11-proto/xf86vidmodeproto )
+	gtk? ( x11-proto/xextproto
+		   x11-proto/xf86vidmodeproto )
+	X? ( x11-proto/xextproto
+		 x11-proto/xf86vidmodeproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	iconv? ( virtual/libiconv )"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )
+	mp2? ( >=sys-apps/portage-2.1.2 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+pkg_setup() {
+
+	if [[ -n ${LINGUAS} ]]; then
+		elog "For MPlayer's language support, the configuration will"
+		elog "use your LINGUAS variable from /etc/make.conf.  If you have more"
+		elog "than one language enabled, then the first one in the list will"
+		elog "be used to output the messages, if a translation is available."
+		elog "man pages will be created for all languages where translations"
+		elog "are also available."
+	fi
+
+	if use x86 || use amd64; then
+		if ! use mmx && use custom-cflags; then
+			ewarn "You have the 'mmx' use flag disabled for this package, which"
+			ewarn "means that no CPU optimizations will be used at all."
+			ewarn "The build will either break or encode very slowly.  Check your"
+			ewarn "/proc/cpuinfo for possible CPU optimization flags that"
+			ewarn "apply to this ebuild (mmx, mmxext, 3dnow, 3dnowext, sse, sse2,"
+			ewarn "pni/ssse3)."
+		fi
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if ! use truetype ; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+
+	use gtk && unpack "Blue-${BLUV}.tar.bz2"
+
+	use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.bz2"
+
+	cd "${S}"
+
+	# Fix hppa compilation
+	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"
+
+	if use svga; then
+		echo
+		einfo "Enabling vidix non-root mode."
+		einfo "(You need a proper svgalib_helper.o module for your kernel"
+		einfo "to actually use this)"
+		echo
+
+		mv "${WORKDIR}/svgalib_helper" "${S}/libdha"
+	fi
+
+	# Fix polish spelling errors
+	[[ -n ${LINGUAS} ]] && sed -e 's:Zarządano:Zażądano:' -i help/help_mp-pl.h
+}
+
+src_compile() {
+
+	local myconf=" --disable-tv-bsdbt848 \
+		--disable-faad-external"
+
+	# broken upstream, won't work with recent kernels
+	myconf="${myconf} --disable-ivtv --disable-pvr"
+
+	# MPlayer reads in the LINGUAS variable from make.conf, and sets
+	# the languages accordingly.  Some will have to be altered to match
+	# upstream's naming scheme.
+	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
+
+	################
+	#Optional features#
+	###############
+	use bidi || myconf="${myconf} --disable-fribidi"
+	use bl && myconf="${myconf} --enable-bl"
+	use color-console && myconf="${myconf} --enable-color-console"
+	use enca || myconf="${myconf} --disable-enca"
+	use ftp || myconf="${myconf} --disable-ftp"
+	use nemesi || myconf="${myconf} --disable-nemesi"
+	use tivo || myconf="${myconf} --disable-vstream"
+	use xscreensaver || myconf="${myconf} --disable-xss"
+
+	# libcdio support: prefer libcdio over cdparanoia
+	# don't check for cddb w/cdio
+	if use cdio; then
+		myconf="${myconf} --disable-cdparanoia"
+	else
+		myconf="${myconf} --disable-libcdio"
+		use cdparanoia || myconf="${myconf} --disable-cdparanoia"
+		use cddb || myconf="${myconf} --disable-cddb"
+	fi
+
+	# DVD support
+	# dvdread and libdvdcss are internal libs
+	# http://www.mplayerhq.hu/DOCS/HTML/en/dvd.html
+	# You can optionally use external dvdread support, but against
+	# upstream's suggestion.  We don't.
+	if ! use dvd; then
+		myconf="${myconf} --disable-dvdnav --disable-dvdread"
+		use a52 || myconf="${myconf} --disable-liba52"
+	fi
+
+	if use encode; then
+		use aac || myconf="${myconf} --disable-faac"
+		use dv || myconf="${myconf} --disable-libdv"
+		use x264 || myconf="${myconf} --disable-x264"
+	else
+		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
+			--disable-faac"
+	fi
+
+	# SRT (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	if ! use srt; then
+		myconf="${myconf} --disable-ass"
+		if ! use truetype; then
+			myconf="${myconf} --disable-freetype"
+			if ! use iconv; then
+				myconf="${myconf} --disable-iconv --charset=noconv"
+			fi
+		fi
+	fi
+	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"
+
+	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
+	myconf="${myconf} $(use_enable joystick)"
+	use ipv6 || myconf="${myconf} --disable-inet6"
+	use rar || myconf="${myconf} --disable-unrarexec"
+	use rtc || myconf="${myconf} --disable-rtc"
+	use samba || myconf="${myconf} --disable-smb"
+
+	# DVB / Video4Linux / Radio support
+	if { use dvb || use v4l || use v4l2 || use radio; }; then
+		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
+		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
+		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
+		use teletext || myconf="${myconf} --disable-tv-teletext"
+		if use radio && { use dvb || use v4l || use v4l2; }; then
+			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
+		else
+			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
+		fi
+	else
+		myconf="${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \
+			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848 \
+			--disable-dvb --disable-dvbhead --disable-tv-teletext"
+	fi
+
+	#########
+	# Codecs #
+	########
+	for x in gif jpeg live mad musepack pnm speex tga theora xanim xvid; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use aac || myconf="${myconf} --disable-faad-internal"
+	use amrnb || myconf="${myconf} --disable-libamr_nb"
+	use amrwb || myconf="${myconf} --disable-libamr_wb"
+	use dts || myconf="${myconf} --disable-libdca"
+	! use png && ! use gtk && myconf="${myconf} --disable-png"
+	use lzo || myconf="${myconf} --disable-liblzo"
+	use encode && use mp2 || myconf="${myconf} --disable-twolame \
+		--disable-toolame"
+	use mp3 || myconf="${myconf} --disable-mp3lib"
+	use quicktime || myconf="${myconf} --disable-qtx"
+	use vorbis || myconf="${myconf} --disable-libvorbis"
+	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
+	if use x86 || use amd64; then
+		# Real codec support, only available on x86, amd64
+		if use real && use x86; then
+			myconf="${myconf} --realcodecsdir=/opt/RealPlayer/codecs"
+		elif use real && use amd64; then
+			myconf="${myconf} --realcodecsdir=/usr/$(get_libdir)/codecs"
+		else
+			myconf="${myconf} --disable-real"
+		fi
+		if ! use bindist && ! use real; then
+			myconf="${myconf} $(use_enable win32codecs win32dll)"
+		fi
+	fi
+
+	#############
+	# Video Output #
+	#############
+	for x in directfb ggi md5sum sdl xinerama; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use aalib || myconf="${myconf} --disable-aa"
+	use dga || myconf="${myconf} --disable-dga1 --disable-dga2"
+	use fbcon || myconf="${myconf} --disable-fbdev"
+	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
+	use libcaca || myconf="${myconf} --disable-caca"
+	use opengl || myconf="${myconf} --disable-gl"
+	use video_cards_vesa || myconf="${myconf} --disable-vesa"
+	use vidix || myconf="${myconf} --disable-vidix-internal \
+		--disable-vidix-external \
+		--disable-vidix-pcidb"
+	use zoran || myconf="${myconf} --disable-zr"
+
+	# GTK gmplayer gui
+	myconf="${myconf} $(use_enable gtk gui)"
+
+	if use xv; then
+		if use xvmc; then
+			myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
+		else
+			myconf="${myconf} --disable-xvmc"
+		fi
+	else
+		myconf="${myconf} --disable-xv --disable-xvmc"
+	fi
+
+	if ! use kernel_linux && ! use video_cards_mga; then
+		 myconf="${myconf} --disable-mga --disable-xmga"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf="${myconf} $(use_enable video_cards_tdfx tdfxvid) \
+			$(use_enable fbcon tdfxfb)"
+	else
+		myconf="${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb"
+	fi
+
+	#############
+	# Audio Output #
+	#############
+	for x in alsa arts esd jack ladspa nas openal; do
+		use ${x} || myconf="${myconf} --disable-${x}"
+	done
+	use pulseaudio || myconf="${myconf} --disable-pulse"
+	if ! use radio; then
+		use oss || myconf="${myconf} --disable-ossaudio"
+	fi
+	#################
+	# Advanced Options #
+	#################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	if use x86 || use amd64 || use ppc; then
+		if use cpudetection || use bindist; then
+			myconf="${myconf} --enable-runtime-cpudetection"
+		fi
+	fi
+	# Letting users turn off optimizations results in epic build fail
+	# across the board.  MPlayer's build system by default will
+	# detect them and use them just fine, so don't let them change
+	# them unless they really know what they are doing anyway.
+	if use custom-cflags; then
+		if use mmx; then
+			for x in 3dnow 3dnowext mmxext sse sse2 ssse3; do
+				use ${x} || myconf="${myconf} --disable-${x}"
+			done
+		else
+			myconf="${myconf} --disable-mmx --disable-mmxext --disable-sse \
+			--disable-sse2 --disable-ssse3 --disable-3dnow \
+			--disable-3dnowext"
+		fi
+	fi
+
+	use debug && myconf="${myconf} --enable-debug=3"
+
+	myconf="${myconf} $(use_enable altivec)"
+
+	if use custom-cflags; then
+		# let's play the filtration game!  MPlayer hates on all!
+		strip-flags
+		# ugly optimizations cause MPlayer to cry on x86 systems!
+			if use x86 || use x86-fbsd ; then
+				replace-flags -O* -O2
+				filter-flags -fPIC -fPIE
+
+				use debug || append-flags -fomit-frame-pointer
+			fi
+		append-flags -D__STDC_LIMIT_MACROS
+	else
+		unset CFLAGS CXXFLAGS
+	fi
+
+	myconf="--cc=$(tc-getCC) \
+		--host-cc=$(tc-getBUILD_CC) \
+		--prefix=/usr \
+		--confdir=/etc/mplayer \
+		--datadir=/usr/share/mplayer \
+		--libdir=/usr/$(get_libdir) \
+		--enable-menu \
+		--enable-network \
+		${myconf}"
+	#echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
+	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"
+
+	emake || die "Failed to build MPlayer!"
+	use doc && make -C DOCS/xml html-chunked
+}
+
+src_install() {
+
+	make prefix="${D}/usr" \
+		 BINDIR="${D}/usr/bin" \
+		 LIBDIR="${D}/usr/$(get_libdir)" \
+		 CONFDIR="${D}/etc/mplayer" \
+		 DATADIR="${D}/usr/share/mplayer" \
+		 MANDIR="${D}/usr/share/man" \
+		 install || die "Failed to install MPlayer!"
+
+	dodoc AUTHORS Changelog README
+	# Install the documentation; DOCS is all mixed up not just html
+	if use doc ; then
+		find "${S}/DOCS" -type d | xargs -- chmod 0755
+		find "${S}/DOCS" -type f | xargs -- chmod 0644
+		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die "cp docs died"
+	fi
+
+	# Copy misc tools to documentation path, as they're not installed directly
+	# and yes, we are nuking the +x bit.
+	find "${S}/TOOLS" -type d | xargs -- chmod 0755
+	find "${S}/TOOLS" -type f | xargs -- chmod 0644
+	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die "cp docs died"
+
+	# Install the default Skin and Gnome menu entry
+	if use gtk; then
+		dodir /usr/share/mplayer/skins
+		cp -r "${WORKDIR}/Blue" \
+			"${D}/usr/share/mplayer/skins/default" || die "cp skins died"
+
+		# Fix the symlink
+		rm -rf "${D}/usr/bin/gmplayer"
+		dosym mplayer /usr/bin/gmplayer
+	fi
+
+	if ! use srt && ! 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/mplayer
+	newins "${S}/etc/example.conf" mplayer.conf
+
+	if use srt || use truetype;	then
+		cat >> "${D}/etc/mplayer/mplayer.conf" << EOT
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+EOT
+	fi
+
+	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+
+	dobin "${D}/usr/share/doc/${PF}/TOOLS/midentify"
+
+	insinto /usr/share/mplayer
+	doins "${S}/etc/input.conf"
+	doins "${S}/etc/menu.conf"
+}
+
+pkg_preinst() {
+
+	if [[ -d ${ROOT}/usr/share/mplayer/Skin/default ]]
+	then
+		rm -rf "${ROOT}/usr/share/mplayer/Skin/default"
+	fi
+}
+
+pkg_postrm() {
+
+	# Cleanup stale symlinks
+	if [ -L "${ROOT}/usr/share/mplayer/font" -a \
+		 ! -e "${ROOT}/usr/share/mplayer/font" ]
+	then
+		rm -f "${ROOT}/usr/share/mplayer/font"
+	fi
+
+	if [ -L "${ROOT}/usr/share/mplayer/subfont.ttf" -a \
+		 ! -e "${ROOT}/usr/share/mplayer/subfont.ttf" ]
+	then
+		rm -f "${ROOT}/usr/share/mplayer/subfont.ttf"
+	fi
+}