Add prefix support/keywords; die on failure

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 32 insertions, 21 deletions

diff --git a/media-libs/win32codecs/ChangeLog b/media-libs/win32codecs/ChangeLog
index 89a0446e0ea7..1a5de17d04f2 100644
--- a/media-libs/win32codecs/ChangeLog
+++ b/media-libs/win32codecs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/win32codecs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/ChangeLog,v 1.53 2009/12/13 09:59:28 abcd Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/ChangeLog,v 1.54 2010/01/08 06:47:49 abcd Exp $
+
+  08 Jan 2010; Jonathan Callen <abcd@gentoo.org>
+  win32codecs-20071007-r4.ebuild:
+  Add prefix support/keywords; die on failure
 
   13 Dec 2009; Jonathan Callen <abcd@gentoo.org>
   win32codecs-20071007-r4.ebuild:
diff --git a/media-libs/win32codecs/Manifest b/media-libs/win32codecs/Manifest
index d69fa8de89c9..c0b70ebbcb03 100644
--- a/media-libs/win32codecs/Manifest
+++ b/media-libs/win32codecs/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST all-20071007.tar.bz2 13864479 RMD160 dd413908b3217346f33d7845b4bc275471a44fd5 SHA1 39f6dae4919ba90ce7b12e719396373bd8c48877 SHA256 7aae7fc658d7a9a1766002435fd75436fead9c2d45eac3d67588c313cde0d8da
-EBUILD win32codecs-20071007-r4.ebuild 1417 RMD160 912de1af517a6dda62a3563930f1c01ea0a16b20 SHA1 3c701f61e6d5a36419db90539c06869d6b78b1ee SHA256 39624c8be073eb9392728799b96c0f5efc53cb13798acf50f526b0e068704684
-MISC ChangeLog 8620 RMD160 845c458d169b914ae1a267ab272de38b0f3c4205 SHA1 c457f40e6e2ff1f380a76e7e675ea0281ab80f2d SHA256 326516795d7e248ff8d0b1573dad2e2ddf1abc7396234ab4f9fe3b3d006a893a
+EBUILD win32codecs-20071007-r4.ebuild 1557 RMD160 e8c3d19469d9b375e2cbb4ca105acf393871626e SHA1 ac37c936a9addcc5ad54cb9a7b6c81c73641c511 SHA256 c72b4796dde37e2c2bdb00ebe3d3f4200ea23d785b0b2c952f1422eb5a97b9aa
+MISC ChangeLog 8750 RMD160 cfcf14aa0117431d32cc5123221f111050ed7d81 SHA1 dffe2f1f2d60b24189f6b5d27a5e48925c70f548 SHA256 9f6cfccaf5f8452a7b25ba70404891f30811fa34c3b66969af204e55741df804
 MISC metadata.xml 310 RMD160 0c2f6d9d5785fbf91f9a561a5d4d2b7e716537fa SHA1 ac63b512710a04d6e4cd65aaa2bb5f1d8928004d SHA256 d150937ac3cddb33e42d1c1fcd17216cdf33cd80827b0df390de5e2c88ef04d9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktG1R8ACgkQOypDUo0oQOolxQCfcGfHo2QdQH7lz+v10WfUiqBt
+pXUAoI2AwyWSFB0B9xYxBpWEoUxSWJlP
+=g+be
+-----END PGP SIGNATURE-----
diff --git a/media-libs/win32codecs/win32codecs-20071007-r4.ebuild b/media-libs/win32codecs/win32codecs-20071007-r4.ebuild
index 896990bdd4d4..ea176960f2e1 100644
--- a/media-libs/win32codecs/win32codecs-20071007-r4.ebuild
+++ b/media-libs/win32codecs/win32codecs-20071007-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/win32codecs-20071007-r4.ebuild,v 1.3 2009/12/13 09:59:28 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/win32codecs-20071007-r4.ebuild,v 1.4 2010/01/08 06:47:49 abcd Exp $
 
 inherit multilib
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://mplayer/releases/codecs/all-${PV}.tar.bz2"
 HOMEPAGE="http://www.mplayerhq.hu/"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86 ~x86-fbsd"
+KEYWORDS="-* ~amd64 x86 ~x86-fbsd ~x86-freebsd ~x86-linux"
 IUSE="real"
 
 RDEPEND="real? ( =virtual/libstdc++-3.3* )"
@@ -26,35 +26,32 @@ pkg_setup() {
 }
 
 src_install() {
-	# see #83221
-	insopts -m0644
-	dodir /usr/$(get_libdir)/win32
+	use prefix || EPREFIX=
+
+	insinto /usr/$(get_libdir)/win32
+	doins *.dll *.ax *.xa *.acm *.vwp *.drv *.DLL || die "Failed to install win32 codecs"
 
 	if use real
 	then
-		dodir /usr/$(get_libdir)/real
 		insinto /usr/$(get_libdir)/real
-		doins *so.6.0
+		doins *so.6.0 || die "Failed to install realplayer codecs"
 
 		# copy newly introduced codecs from realplayer10
 		# see the ChangeLog online
-		doins *.so
+		doins *.so || die "Failed to install realplayer10 codecs"
 
 		# fix bug #80321
 		local x
 		for x in *so.6.0 *.so; do
-			dosym ../real/$x /usr/$(get_libdir)/win32
+			dosym ../real/$x /usr/$(get_libdir)/win32 || die "Failed to make symlink to $x"
 		done
 	fi
 
-	insinto /usr/$(get_libdir)/win32
-
-	doins *.dll *.ax *.xa *.acm *.vwp *.drv *.DLL
-
 	dodoc README
 
-	dodir /etc/revdep-rebuild
-	cat - > "${D}/etc/revdep-rebuild/50win32codecs" <<EOF
-SEARCH_DIRS_MASK="/usr/$(get_libdir)/real /usr/$(get_libdir)/win32"
+	cat > "${T}/50${PN}" <<EOF
+SEARCH_DIRS_MASK="${EPREFIX}/usr/$(get_libdir)/real ${EPREFIX}/usr/$(get_libdir)/win32"
 EOF
+	insinto /etc/revdep-rebuild
+	doins "${T}/50${PN}"
 }