Upstream requested minor changes

4 files changed, 477 insertions, 28 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index eb8107e099a6..311b201960a1 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.137 2004/05/28 09:42:42 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.138 2004/05/28 15:13:51 lu_zero Exp $
+
+*mplayer-1.0_pre4-r4 (28 May 2004)
+
+  28 May 2004; Luca Barbato <lu_zero@gentoo.org> +mplayer-1.0_pre4-r4.ebuild:
+  Upstream requested change to the ebuild
 
   28 May 2004; Patrick Kursawe <phosphan@gentoo.org>
   mplayer-1.0_pre4-r3.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 42daaef974e1..4a6ce1c69447 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,37 +1,39 @@
-MD5 633cbda54fcb59b371bbfb86f475bd84 mplayer-1.0_pre3-r4.ebuild 11851
-MD5 8ca704b669f89e2d885d627782ed8418 mplayer-1.0_pre4-r3.ebuild 12443
-MD5 744333b8c3656249f927f7a5891c0def mplayer-1.0_pre4.ebuild 11137
-MD5 95426d21a3f8920fc3b0d94ade8ad0bd mplayer-1.0_pre3-r3.ebuild 11549
-MD5 f98bc5b521254207cb231a9eb853f522 mplayer-1.0_pre2-r1.ebuild 11435
-MD5 e1ea94156aa7baa33df978435e05e0d1 mplayer-1.0_pre4-r2.ebuild 11548
-MD5 1a08c3bbc9cc90150bcf0228848ec76f mplayer-1.0_pre3-r5.ebuild 11525
-MD5 06a993cb89fac55613aad364670c41fb mplayer-0.92-r1.ebuild 11570
-MD5 46f0ac1b829e4fd20984aeb107afd83a ChangeLog 23894
+MD5 42e7e6f580bf87a16ba83643d9e594b8 mplayer-1.0_pre3-r4.ebuild 11850
+MD5 478e4b17cfe16f6adff05bb0fd866acc mplayer-1.0_pre4-r4.ebuild 12629
+MD5 fd6437156cfead4247c2b4b4e08c20c3 ChangeLog 24049
+MD5 5dc20651798bb3dcc125427211a8d98a mplayer-1.0_pre2-r1.ebuild 11434
+MD5 5ea7e2a3121876d59a2158fec7be7d35 mplayer-1.0_pre3-r5.ebuild 11524
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 bafb9c82fa8f3a39f28bb8f1c2eea2f4 mplayer-1.0_pre4-r1.ebuild 11368
-MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
-MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767
+MD5 f87543074f51892187178c0251597f6d mplayer-1.0_pre4.ebuild 11136
+MD5 7cc1ebe91f6f7e5d8255c52028cdba26 mplayer-1.0_pre4-r3.ebuild 12442
+MD5 928df6c9487ff437e4f4e1d5247b4e05 mplayer-1.0_pre3-r3.ebuild 11548
+MD5 c47fa1f702e7caadf3262a2836dff653 mplayer-1.0_pre4-r2.ebuild 11547
+MD5 76aa828e05d115624c4e5b51acead4f6 mplayer-0.92-r1.ebuild 11569
+MD5 f24932d24447e0bf5987bdcfa57a662a mplayer-1.0_pre4-r1.ebuild 11367
+MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
+MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
 MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
-MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299
 MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
-MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358
+MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
+MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
+MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
+MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767
 MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
-MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
+MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299
 MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
+MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
+MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010
+MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358
-MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
+MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r4 358
+MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358
+MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
+MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358
+MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
+MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358
-MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
-MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010
-MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r4 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r4
new file mode 100644
index 000000000000..7d0a61f16837
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r4
@@ -0,0 +1,5 @@
+MD5 83ebac0f05b192516a41fca2350ca01a MPlayer-1.0pre4.tar.bz2 4913390
+MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
+MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
+MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
+MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild
new file mode 100644
index 000000000000..0f7733dc70db
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild
@@ -0,0 +1,437 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.1 2004/05/28 15:13:51 lu_zero Exp $
+
+IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2 live bidi mad xvid divx4linux png"
+
+inherit eutils flag-o-matic kmod
+
+# NOTE to myself:  Test this thing with and without dvd/gtk+ support,
+#                  as it seems the mplayer guys dont really care to
+#                  make it work without dvd support.
+
+# Handle PREversions as well
+MY_PV="${PV/_/}"
+S="${WORKDIR}/MPlayer-${MY_PV}"
+SRC_URI="mirror://mplayer/releases/MPlayer-${MY_PV}.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-1.9.17-mplayer.tar.bz2 )
+	gtk? ( mirror://mplayer/Skin/Blue-1.0.tar.bz2 )"
+# Only install Skin if GUI should be build (gtk as USE flag)
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+# 'encode' in USE for MEncoder.
+RDEPEND="xvid? (
+		ppc? ( >=media-libs/xvid-0.9.0 )
+		amd64? ( >=media-libs/xvid-0.9.0 )
+		x86? ( >=media-libs/xvid-0.9.0 )
+		)
+	x86? ( divx4linux? (  >=media-libs/divx4linux-20030428 )
+		 >=media-libs/win32codecs-0.60 )
+	png? ( media-libs/libpng )
+	gtk? ( media-libs/libpng
+	       virtual/x11
+			=x11-libs/gtk+-1.2*
+			=dev-libs/glib-1.2* )
+	jpeg? ( media-libs/jpeg )
+	gif? ( media-libs/giflib
+	       media-libs/libungif )
+	truetype? ( >=media-libs/freetype-2.1 )
+	esd? ( media-sound/esound )
+	ggi? ( media-libs/libggi )
+	sdl? ( media-libs/libsdl )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	nas? ( media-libs/nas )
+	lirc? ( app-misc/lirc )
+	aalib? ( media-libs/aalib )
+	svga? ( media-libs/svgalib )
+	encode? ( media-sound/lame
+	          >=media-libs/libdv-0.9.5 )
+	xmms? ( media-sound/xmms )
+	matroska? ( >=media-libs/libmatroska-0.6.0 )
+	opengl? ( virtual/opengl )
+	directfb? ( dev-libs/DirectFB )
+	oggvorbis? ( media-libs/libvorbis )
+	nls? ( sys-devel/gettext )
+	media-sound/cdparanoia
+	mpeg? ( media-libs/faad2 )
+	samba? ( >=net-fs/samba-2.2.8a )
+	theora? ( media-libs/libtheora )
+	live? ( >=media-plugins/live-2004.01.05 )
+	mad? ( media-libs/libmad )
+	bidi? ( dev-libs/fribidi )
+	>=sys-apps/portage-2.0.36"
+#	dvd? ( media-libs/libdvdnav )
+# Hardcode paranoia support for now, as there is no
+# related USE flag.
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	app-arch/unzip"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 -ia64 -hppa ~sparc"
+
+
+pkg_setup() {
+	echo
+	einfo "Please note that we do not use C[XX]FLAGS from /etc/make.conf"
+	einfo "or the environment, as the MPlayer guys then do not give support"
+	einfo "in case of bug reports!."
+	echo
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	sleep 3
+}
+
+src_unpack() {
+
+	unpack MPlayer-${MY_PV}.tar.bz2 \
+		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2
+
+	use svga && unpack svgalib_helper-1.9.17-mplayer.tar.bz2
+
+	use gtk && unpack Blue-1.0.tar.bz2
+
+	cd ${S}
+
+	# Fix head/tail call for new coreutils
+	epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
+
+	# Fix mencoder segfaulting with bad arguments
+	# Already fixed by upstream
+	# epatch ${FILESDIR}/mencoder-segfault.patch
+
+	# GCC 3.4 fixes
+	epatch ${FILESDIR}/${P}-alsa-gcc34.patch
+
+	# fixes for mga driver with kernel 2.6
+	get_kernel_info
+	epatch ${FILESDIR}/mga-kernel-2.6.patch
+	sed -i -e "s/KERNEL_VERSION_HERE/${KV_VERSION_FULL}/" drivers/Makefile \
+		|| die "sed failed on kernel version substitution"
+
+	# preparing build for 2.6 mga kernel module
+	cp ${KV_OUTPUT}/.config ${T}/
+	ln -s /usr/src/linux/scripts ${T}/
+	ln -s /usr/src/linux/include ${T}/
+	sed -e "s:SUBDIRS:O=${T} SUBDIRS:" -i drivers/Makefile \
+		|| die "sed failed setting O=${T}"
+	sed -e "s:^MDIR = .*:MDIR = ${D}/lib/modules/${KV_VERSION_FULL}/kernel/drivers/char/:" -i drivers/Makefile \
+		|| die "sed failed correcting module install path"
+	sed -e "s:depmod -a::" -i drivers/Makefile \
+		|| die "sed failed removing depmod"
+
+	# Fix hppa detection
+	# Already fixed upstream
+	# [ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${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
+		cd ${S}/libdha
+		sed -i -e "s/^#CFLAGS/CFLAGS/" Makefile
+	fi
+}
+
+src_compile() {
+
+	filter-flags -fPIC
+
+	use matrox && check_KV
+
+	local myconf=
+
+	use 3dnow \
+		|| myconf="${myconf} --disable-3dnow --disable-3dnowex"
+
+	use sse \
+		|| myconf="${myconf} --disable-sse --disable-sse2"
+
+	# Only disable MMX if 3DNOW or SSE is not in USE
+	use mmx || use 3dnow || use sse \
+		|| myconf="${myconf} --disable-mmx --disable-mmx2"
+
+	# Only disable X if gtk is not in USE
+	use X || use gtk \
+		|| myconf="${myconf} --disable-gui --disable-x11 --disable-xv \
+				--disable-xmga"
+
+	use png || use gtk \
+		|| myconf="${myconf} --disable-png"
+
+	( use matrox && use X ) \
+		&& myconf="${myconf} --enable-xmga" \
+		|| myconf="${myconf} --disable-xmga"
+
+	use gtk \
+		&& myconf="${myconf} --enable-gui --enable-x11 \
+		                     --enable-xv --enable-vm --enable-png"
+	use png \
+		&& myconf="${myconf} --enable-png"
+
+	myconf="${myconf} `use_enable encode mencoder`"
+	use encode && myconf="${myconf} --enable-tv"
+
+	myconf="${myconf} `use_enable dvd mpdvdkit`"
+	use dvd || myconf="${myconf} --disable-dvdread"
+
+	# Disable dvdnav support as its not considered to be
+	# functional anyhow, and will be removed.
+
+	myconf="${myconf} `use_enable dvb`"
+	use dvb || myconf="${myconf} --disable-dvbhead"
+
+	mconf="${myconf} `use_enable xvid`"
+	( use xvid && use 3dfx ) \
+		&& myconf="${myconf} --enable-tdfxvid" \
+		||  myconf="${myconf} --disable-tdfxvid"
+
+	use gif \
+		|| myconf="${myconf} --disable-gif"
+
+	use debug \
+		&& myconf="${myconf} --enable-debug"
+
+	if [ -d /opt/RealPlayer9/Real/Codecs ]
+	then
+		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
+		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
+	elif [ -d /opt/RealPlayer8/Codecs ]
+	then
+		einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..."
+		REALLIBDIR="/opt/RealPlayer8/Codecs"
+	else
+		REALLIBDIR="/usr/lib/real"
+	fi
+
+	if [ -e /dev/.devfsd ]
+	then
+		myconf="${myconf} --enable-linux-devfs"
+	fi
+
+	has_pic && CC="${CC} `test_flag -fno-pic` `test_flag -nopie`"
+
+	# Crashes on start when compiled with most optimizations.
+	# The code have CPU detection code now, with CPU specific
+	# optimizations, so extra should not be needed and is not
+	# recommended by the authors
+	unset CFLAGS CXXFLAGS
+	./configure --prefix=/usr \
+		--datadir=/usr/share/mplayer \
+		--confdir=/usr/share/mplayer \
+		--disable-runtime-cpudetection \
+		--enable-largefiles \
+		--enable-menu \
+		--enable-real \
+		--with-reallibdir=${REALLIBDIR} \
+		--with-x11incdir=/usr/X11R6/include \
+		`use_enable xinerama` \
+		`use_enable oggvorbis vorbis` \
+		`use_enable esd` \
+		`use_enable truetype freetype` \
+		`use_enable opengl gl` \
+		`use_enable sdl` \
+		`use_enable nls i18n` \
+		`use_enable samba smb` \
+		`use_enable aalib aa` \
+		`use_enable oss ossaudio` \
+		`use_enable ggi` \
+		`use_enable svga` \
+		`use_enable directfb` \
+		`use_enable fbcon fbdev` \
+		`use_enable alsa` \
+		`use_enable arts` \
+		`use_enable lirc` \
+		`use_enable joystick` \
+		`use_enable theora` \
+		`use_enable nas` \
+		`use_enable 3dfx tdfxfb` \
+		`use_enable matrox mga` \
+		`use_enable xmms` \
+		`use_enable ipv6 inet6` \
+		`use_enable live` \
+		`use_enable v4l tv-v4l` \
+		`use_enable v4l2 tv-v4l2` \
+		`use_enable mpeg external-faad` \
+		`use_enable jpeg` \
+		`use_enable divx4linux` \
+		${myconf} || die
+	# Breaks with gcc-2.95.3, bug #14479:
+	#  --enable-shared-pp \
+	# Enable untested and currently unused code:
+	#  --enable-dynamic-plugins \
+
+	# emake borks on fast boxes - Azarah (07 Aug 2002)
+	einfo "Make"
+	make all || die "Failed to build MPlayer!"
+	einfo "Make completed"
+
+	# We build the shared libpostproc.so here so that our
+	# mplayer binary is not linked to it, ensuring that we
+	# do not run into issues ... (bug #14479)
+	cd ${S}/libavcodec/libpostproc
+	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
+
+	if use matrox
+	then
+		unset ARCH
+		local driverwasbuilt="ok"
+		local dirtytrick="no"
+		local oldwrite="${SANDBOX_WRITE}"
+		cd ${S}/drivers
+		if [ ${KV_MAJOR}.${KV_MINOR} = "2.6" -a ${KV_PATCH} -le 5 ]; then
+			einfo "Kernel < 2.6.6, have to remove your include/asm and .config"
+			einfo "temporarily. Putting them into ${T}, will try to restore them later."
+			dirtytrick="yes"
+			addwrite /usr/src/linux/
+			mv /usr/src/linux/.config ${T}/savedconfig
+			mv /usr/src/linux/include/asm ${T}/savedasm
+			SANDBOX_WRITE="${oldwrite}"
+		fi
+		make all || driverwasbuilt="no"
+		if [ ${dirtytrick} = "yes" ]; then
+			addwrite /usr/src/linux
+			mv ${T}/savedconfig /usr/src/linux/.config
+			mv ${T}/savedasm /usr/src/linux/include/asm
+			SANDBOX_WRITE="${oldwrite}"
+		fi
+		if [ ${driverwasbuilt} = "no" ]; then
+			die "Failed to build matrox driver!"
+		fi
+	fi
+}
+
+src_install() {
+
+	einfo "Make install"
+	make prefix=${D}/usr \
+	     BINDIR=${D}/usr/bin \
+		 LIBDIR=${D}/usr/lib \
+	     CONFDIR=${D}/usr/share/mplayer \
+	     DATADIR=${D}/usr/share/mplayer \
+	     MANDIR=${D}/usr/share/man \
+	     install || die "Failed to install MPlayer!"
+	einfo "Make install completed"
+
+	if use matrox; then
+		cd ${S}/drivers
+		insinto /lib/modules/${KV}/kernel/drivers/char
+		doins mga_vid.${KV_OBJ}
+	fi
+
+	# libpostproc is now installed by >=ffmpeg-0.4.8.20040222
+#	cd ${S}/libavcodec/libpostproc
+#	make prefix=${D}/usr \
+#	     SHARED_PP="yes" \
+#	     install || die "Failed to install libpostproc.so!"
+#	cd ${S}
+
+	dodoc AUTHORS ChangeLog README
+	# Install the documentation; DOCS is all mixed up not just html
+	find ${S}/DOCS -type d | xargs -- chmod 0755
+	cp -r ${S}/DOCS ${D}/usr/share/doc/${PF}/ || die
+
+	# Copy misc tools to documentation path, as they're not installed
+	# directly
+	find ${S}/TOOLS -type d | xargs -- chmod 0755
+	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
+
+	# 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
+
+		# Fix the symlink
+		rm -rf ${D}/usr/bin/gmplayer
+		dosym mplayer /usr/bin/gmplayer
+	fi
+
+	if use gnome
+	then
+		insinto /usr/share/pixmaps
+		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
+		insinto /usr/share/gnome/apps/Multimedia
+		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-??-iso-*')
+	do
+		cp -Rd ${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
+
+	insinto /etc
+	newins ${S}/etc/example.conf mplayer.conf
+	dosed -e 's/include =/#include =/' /etc/mplayer.conf
+	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
+	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
+
+	insinto /usr/share/mplayer
+	doins ${S}/etc/codecs.conf
+	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_postinst() {
+
+	if [ -n "`use ppc`" ]
+	then
+		echo
+		einfo "When you see only GREEN salad on your G4 while playing"
+		einfo "a DivX, you should recompile _without_ altivec enabled."
+		einfo "Further information: http://bugs.gentoo.org/show_bug.cgi?id=18511"
+		echo
+		einfo "If everything functions fine with watching DivX and"
+		einfo "altivec enabled, please drop a comment on the mentioned bug!"
+		echo
+		einfo "libpostproc is no longer installed by mplayer. If you have an"
+		einfo "application that depends on it, install >=ffmpeg-0.4.8.20040222"
+	fi
+
+	depmod -a &>/dev/null || :
+}
+
+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
+}
+