From 7162920a320436e46d9234eae7e10a2738dbdd2e Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Mon, 29 Jan 2007 16:22:26 +0000 Subject: [PATCH] Fix bug #160335, thanks to Nicholas Doyle for reporting and SpanKY for fixing. Package-Manager: portage-2.1.2-r5 --- app-emulation/emul-linux-x86-compat/ChangeLog | 8 ++++- app-emulation/emul-linux-x86-compat/Manifest | 21 ++++++++----- .../emul-linux-x86-compat-1.0-r3.ebuild | 30 +++++++++++++++++++ .../files/digest-emul-linux-x86-compat-1.0-r3 | 3 ++ 4 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild create mode 100644 app-emulation/emul-linux-x86-compat/files/digest-emul-linux-x86-compat-1.0-r3 diff --git a/app-emulation/emul-linux-x86-compat/ChangeLog b/app-emulation/emul-linux-x86-compat/ChangeLog index 300285282a14..b1b3a8cfe57c 100644 --- a/app-emulation/emul-linux-x86-compat/ChangeLog +++ b/app-emulation/emul-linux-x86-compat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-compat # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.12 2007/01/03 07:34:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.13 2007/01/29 16:22:26 drizzt Exp $ + +*emul-linux-x86-compat-1.0-r3 (29 Jan 2007) + + 29 Jan 2007; Timothy Redaelli + +emul-linux-x86-compat-1.0-r3.ebuild: + Fix bug #160335, thanks to Nicholas Doyle for reporting and SpanKY for fixing. *emul-linux-x86-compat-1.0-r2 (03 Jan 2007) diff --git a/app-emulation/emul-linux-x86-compat/Manifest b/app-emulation/emul-linux-x86-compat/Manifest index 35ab5ce25cf1..b0217065ad15 100644 --- a/app-emulation/emul-linux-x86-compat/Manifest +++ b/app-emulation/emul-linux-x86-compat/Manifest @@ -14,10 +14,14 @@ EBUILD emul-linux-x86-compat-1.0-r2.ebuild 916 RMD160 fe8e31d18dbc32797bed1b5344 MD5 b844d8e50c57ef773f287e65e7f30dfe emul-linux-x86-compat-1.0-r2.ebuild 916 RMD160 fe8e31d18dbc32797bed1b53440959fca23a2e3d emul-linux-x86-compat-1.0-r2.ebuild 916 SHA256 2f6e4f8fa5650fec5b23605d09998ce78ec5ea12559feaf1f05b92ebaec5b75d emul-linux-x86-compat-1.0-r2.ebuild 916 -MISC ChangeLog 2047 RMD160 9d25dd4f7273f6b9e78f54d56a13771af8abb0f6 SHA1 46f0331e325bb2b70b6e88ac1cb562f6fe5ac09c SHA256 4b4ed92a8689a4d52c9dd850069b7cfe3fda0dc07543097fdbc033c36c7d00e1 -MD5 17daccabcddc940774a2763be1425230 ChangeLog 2047 -RMD160 9d25dd4f7273f6b9e78f54d56a13771af8abb0f6 ChangeLog 2047 -SHA256 4b4ed92a8689a4d52c9dd850069b7cfe3fda0dc07543097fdbc033c36c7d00e1 ChangeLog 2047 +EBUILD emul-linux-x86-compat-1.0-r3.ebuild 951 RMD160 3a43cda180ea82c71983c41e5434e00c98c21ca8 SHA1 b94c19dfe8a6c396d5d295b47dbab711c16ad264 SHA256 f9f3fb300c6b255d6d0771a4a10c9f5e3e045a8b7d18ae5e19ad56941ffcca70 +MD5 ea276b206c3d74e4059bc714fbfba8f2 emul-linux-x86-compat-1.0-r3.ebuild 951 +RMD160 3a43cda180ea82c71983c41e5434e00c98c21ca8 emul-linux-x86-compat-1.0-r3.ebuild 951 +SHA256 f9f3fb300c6b255d6d0771a4a10c9f5e3e045a8b7d18ae5e19ad56941ffcca70 emul-linux-x86-compat-1.0-r3.ebuild 951 +MISC ChangeLog 2266 RMD160 95f12faafdd6d5f23e30b25dfc24e9338a2f6fd4 SHA1 5a4ef36509b72e654bfc3bd7d98975669e9d2b06 SHA256 d9df2530b9b824beb1b9ac3f394040df58f2f67393191ac4dbfc8b8f904f39aa +MD5 c038f5a1fac5369b96600764afef0b2a ChangeLog 2266 +RMD160 95f12faafdd6d5f23e30b25dfc24e9338a2f6fd4 ChangeLog 2266 +SHA256 d9df2530b9b824beb1b9ac3f394040df58f2f67393191ac4dbfc8b8f904f39aa ChangeLog 2266 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290 @@ -28,10 +32,13 @@ SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/di MD5 c9fb4a2c6f68ff747501a9169d19b328 files/digest-emul-linux-x86-compat-1.0-r2 283 RMD160 bf7160a735daad1bc793a9d40b762e7e6b12b611 files/digest-emul-linux-x86-compat-1.0-r2 283 SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/digest-emul-linux-x86-compat-1.0-r2 283 +MD5 c9fb4a2c6f68ff747501a9169d19b328 files/digest-emul-linux-x86-compat-1.0-r3 283 +RMD160 bf7160a735daad1bc793a9d40b762e7e6b12b611 files/digest-emul-linux-x86-compat-1.0-r3 283 +SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/digest-emul-linux-x86-compat-1.0-r3 283 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFm1zq8bi6rjpTunYRAl6MAJ9+zkUtCHwGlTfDkJd9k3jz01qp9gCePlXB -6JbWqwyiZTBbnx64DSWoVS4= -=G+m3 +iD8DBQFFvh9JGDyatLGpTbYRAv74AJ99FyJjuY47kGJhFJq8LDN3n2kvsQCgmTVf +gMVcsndg73r9uV51kS5Yulw= +=qpL8 -----END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild new file mode 100644 index 000000000000..da35883b4bec --- /dev/null +++ b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild,v 1.1 2007/01/29 16:22:26 drizzt Exp $ + +DESCRIPTION="emul-linux-x86 version of lib-compat, with the addition of a 32bit libgcc_s and the libstdc++ versions provided by gcc 3.3 and 3.4 for non-multilib systems." +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="mirror://gentoo/emul-linux-x86-compat-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="" +RESTRICT="nostrip" + +S=${WORKDIR} + +src_unpack() { + unpack ${A} + cd "${S}" + mkdir usr + mv emul/linux/x86/usr/lib usr/lib32 || die + rm emul/linux/x86/usr/lib32 || die + rmdir emul/linux/x86/usr emul/linux/x86 emul/linux emul || die + rm usr/lib32/libsmpeg* || die + rm usr/lib32/libstdc++.so.[56]* || die "See bug #160335" +} + +src_install() { + cp -a "${WORKDIR}"/* "${D}"/ || die +} diff --git a/app-emulation/emul-linux-x86-compat/files/digest-emul-linux-x86-compat-1.0-r3 b/app-emulation/emul-linux-x86-compat/files/digest-emul-linux-x86-compat-1.0-r3 new file mode 100644 index 000000000000..0937f8bffd55 --- /dev/null +++ b/app-emulation/emul-linux-x86-compat/files/digest-emul-linux-x86-compat-1.0-r3 @@ -0,0 +1,3 @@ +MD5 ac439c666e1501e677211dbff915c406 emul-linux-x86-compat-1.0.tar.bz2 1228824 +RMD160 57089eafdf3c2c50e04be0bab0949f208e74850a emul-linux-x86-compat-1.0.tar.bz2 1228824 +SHA256 eea416e6e2ef8ea06f028ef2e8bcbf0326dfc22a66a3ab0cbfdd5d0de7efdc74 emul-linux-x86-compat-1.0.tar.bz2 1228824 -- 2.26.2