Get fonts to install properly again, fixing bug #30213.

5 files changed, 41 insertions, 19 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f026950375f7..892fbeceb783 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.86 2003/10/08 09:36:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.87 2003/10/08 23:36:38 azarah Exp $
+
+  09 Oct 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
+  Get fonts to install properly again, fixing bug #30213.
 
   08 Oct 2003; Luca Barbato<lu_zero@gentoo.org> mplayer-1.0_pre2.ebuild:
   ppc related fix.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index e75cbabb5f5d..581e17f8a0ae 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,16 +1,16 @@
-MD5 7d1bebbd745d081decfdb0cf0f1b7bb3 ChangeLog 15384
-MD5 2af12ce4ab186ed588879dbb3e7abce7 mplayer-0.92.ebuild 11314
-MD5 4e7badd332b3f3196229d8ab5d335fa8 mplayer-1.0_pre2.ebuild 10773
-MD5 a6c20e698443ec4e0a367cedc9ecf09a mplayer-1.0_pre1-r1.ebuild 10860
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
+MD5 c0bd20c18774572ac72f06eb91d10162 ChangeLog 15570
+MD5 33005f13a23f53dd2547cd92792edb54 mplayer-0.92.ebuild 11475
+MD5 05a262b3cb37c3330624779649241132 mplayer-1.0_pre1-r1.ebuild 11021
+MD5 7288cab66910ebdc419cabe40f3740b9 mplayer-1.0_pre2.ebuild 10934
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92 355
-MD5 9e064190a914d26b0392a266753161ed files/mplayer-0.90-ppc-benh.patch 2029
-MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
-MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
-MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
-MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
+MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
 MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
+MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
+MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
+MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
+MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
+MD5 9e064190a914d26b0392a266753161ed files/mplayer-0.90-ppc-benh.patch 2029
+MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
diff --git a/media-video/mplayer/mplayer-0.92.ebuild b/media-video/mplayer/mplayer-0.92.ebuild
index cf613c7e7f7f..fb377938200d 100644
--- a/media-video/mplayer/mplayer-0.92.ebuild
+++ b/media-video/mplayer/mplayer-0.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92.ebuild,v 1.2 2003/10/05 20:41:09 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92.ebuild,v 1.3 2003/10/08 23:36:38 azarah 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 gtk2 samba"
 
@@ -366,7 +366,13 @@ src_install() {
 	fi
 
 	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/font-arial* ${D}/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
diff --git a/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
index a9f70b60a655..683c3d162229 100644
--- a/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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_pre1-r1.ebuild,v 1.3 2003/10/08 09:36:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild,v 1.4 2003/10/08 23:36:38 azarah 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 gtk2 samba"
 
@@ -346,7 +346,13 @@ src_install() {
 	fi
 
 	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/font-arial* ${D}/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
diff --git a/media-video/mplayer/mplayer-1.0_pre2.ebuild b/media-video/mplayer/mplayer-1.0_pre2.ebuild
index d2f6d18b8df9..a9d85de9f353 100644
--- a/media-video/mplayer/mplayer-1.0_pre2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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_pre2.ebuild,v 1.2 2003/10/08 09:36:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2.ebuild,v 1.3 2003/10/08 23:36:38 azarah 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 gtk2 samba"
 
@@ -343,7 +343,13 @@ src_install() {
 	fi
 
 	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/font-arial* ${D}/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