Bump for GLSA and no-lib32 fixes

Package-Manager: portage-2.0.51.22-r2

5 files changed, 37 insertions, 6 deletions

diff --git a/media-video/mplayer-bin/ChangeLog b/media-video/mplayer-bin/ChangeLog
index 0757b61641e9..6dd0c3f61af2 100644
--- a/media-video/mplayer-bin/ChangeLog
+++ b/media-video/mplayer-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mplayer-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/ChangeLog,v 1.5 2005/09/02 13:03:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/ChangeLog,v 1.6 2005/09/02 19:38:54 dang Exp $
+
+*mplayer-bin-1.0_pre7-r2 (02 Sep 2005)
+
+  02 Sep 2005; <dang@gentoo.org> -mplayer-bin-1.0_pre7.ebuild,
+  +mplayer-bin-1.0_pre7-r2.ebuild:
+  Include fix for bug #103555; Fix quoting on scripts, so mplayer-bin can play
+  files with spaces; move linked win32codecs dir to /opt/mplayer-bin/lib/win32
+  and symlink that to the correct location
 
   02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   mplayer-bin-1.0_pre7-r1.ebuild:
diff --git a/media-video/mplayer-bin/Manifest b/media-video/mplayer-bin/Manifest
index 65d9c38836e9..9087d24937e5 100644
--- a/media-video/mplayer-bin/Manifest
+++ b/media-video/mplayer-bin/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d9ec6c5a0cd8021bea43b1d8abccdf01 mplayer-bin-1.0_pre7-r1.ebuild 829
 MD5 7d5ef1bf2dded91f3fd2b5e2effbb964 ChangeLog 1322
 MD5 d138fbd38b04f78fe9b3766051723a5b metadata.xml 218
 MD5 a0691f774ab61203db6fe0c3b05f45ac mplayer-bin-1.0_pre7-r2.ebuild 1107
 MD5 31fa5b3a7f08192c5f7c2b6f56c96e2c files/digest-mplayer-bin-1.0_pre7-r1 77
 MD5 3b5cbccfff9e3a30c952716ad4a600d1 files/digest-mplayer-bin-1.0_pre7-r2 77
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGKp6omPajV0RnrERAhKSAJ4nDlVjktMBExM43D3I6P4R+J9tewCeIM+e
+3lII2JXvnrbU5PDd0Xwy2Xw=
+=hcm4
+-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer-bin/files/digest-mplayer-bin-1.0_pre7 b/media-video/mplayer-bin/files/digest-mplayer-bin-1.0_pre7
deleted file mode 100644
index 393c1ce5d454..000000000000
--- a/media-video/mplayer-bin/files/digest-mplayer-bin-1.0_pre7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72f9930c98c41a1fd4863432a750762d mplayer-bin-1.0_pre7.tar.bz2 6381047
diff --git a/media-video/mplayer-bin/files/digest-mplayer-bin-1.0_pre7-r2 b/media-video/mplayer-bin/files/digest-mplayer-bin-1.0_pre7-r2
new file mode 100644
index 000000000000..ce25f44b3e61
--- /dev/null
+++ b/media-video/mplayer-bin/files/digest-mplayer-bin-1.0_pre7-r2
@@ -0,0 +1 @@
+MD5 552a958bd7b2b9081c4d58c3a1f79a1f mplayer-bin-1.0_pre7-r2.tar.bz2 6791906
diff --git a/media-video/mplayer-bin/mplayer-bin-1.0_pre7.ebuild b/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r2.ebuild
index 7319ea93b3ef..e006a4adbbc6 100644
--- a/media-video/mplayer-bin/mplayer-bin-1.0_pre7.ebuild
+++ b/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r2.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/mplayer-bin-1.0_pre7.ebuild,v 1.3 2005/08/30 21:59:11 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r2.ebuild,v 1.1 2005/09/02 19:38:54 dang Exp $
+
+inherit multilib
 
 DESCRIPTION="Pre-build mplayer binary for amd64 systems"
 HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,11 +17,22 @@ RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
 	>=app-emulation/emul-linux-x86-soundlibs-2.1
 	>=app-emulation/emul-linux-x86-gtklibs-2.1
 	>=app-emulation/emul-linux-x86-sdl-2.1
-	>=app-emulation/emul-linux-x86-medialibs-1.0
+	>=app-emulation/emul-linux-x86-medialibs-1.1
 	>=media-libs/win32codecs-20050412"
 
 S=${WORKDIR}
 
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Daniel Gryniewicz <dang@gentoo.org>
+	has_multilib_profile || die
+	ABI="x86"
+}
+
 src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
+	cp -pPRvf ${WORKDIR}/* ${D}/
+	dosym /opt/mplayer-bin/bin/mplayer-bin /opt/mplayer-bin/bin/gmplayer-bin
+	dodir /opt/mplayer-bin/lib
+	dosym /usr/$(get_libdir)/win32 /opt/mplayer-bin/lib/win32
 }