From: Piotr Jaroszyński Date: Sat, 23 Dec 2006 20:37:10 +0000 (+0000) Subject: Fix accidently derefenced symlinks for libfontconfig. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75d93e834385a2ca189399bd361be9fa57e740ac;p=gentoo.git Fix accidently derefenced symlinks for libfontconfig. Package-Manager: portage-2.1.2_rc4 --- diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest index 3704ad400347..e29b2ce1f863 100644 --- a/app-emulation/emul-linux-x86-xlibs/Manifest +++ b/app-emulation/emul-linux-x86-xlibs/Manifest @@ -3,7 +3,7 @@ Hash: SHA1 DIST emul-linux-x86-xlibs-7.0-r2.tar.bz2 3232574 RMD160 84a00d0359e05f7e62259871bfd9106bfa25b946 SHA256 97a3bf82aa66ed71068dbeac5531dd763eb082b01cad956886b3291e769b6279 DIST emul-linux-x86-xlibs-7.0-r3.tar.bz2 3221125 RMD160 a0acb4e4f67fe7a204e6f4ac74c517a942995fc3 SHA1 77758cfcccf34b795a41ce77aa526fce75ef5cae SHA256 b50346ea7f4d581c3bea982051936da3a3c9b4a66ea70f3f47af1bc6ad3c4b41 -DIST emul-linux-x86-xlibs-7.0-r4.tar.bz2 3235393 RMD160 e778ad9600bc573b650f87da440722ad680b9836 SHA1 2292dc98f4bea53dc794e5527b47b7a578cd2416 SHA256 36485a9841b35f1b2cb6543269e752d0bf74f90404cb69835370f7562c04f2c4 +DIST emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393 RMD160 e778ad9600bc573b650f87da440722ad680b9836 SHA1 2292dc98f4bea53dc794e5527b47b7a578cd2416 SHA256 36485a9841b35f1b2cb6543269e752d0bf74f90404cb69835370f7562c04f2c4 DIST emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164 RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d DIST emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803 RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f DIST emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975 RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe @@ -21,14 +21,14 @@ EBUILD emul-linux-x86-xlibs-7.0-r3.ebuild 2343 RMD160 d40c5662ca246a11f5afd4b757 MD5 82f98670d38c3c9883c53e5cf191a2e9 emul-linux-x86-xlibs-7.0-r3.ebuild 2343 RMD160 d40c5662ca246a11f5afd4b75712516951dcc7eb emul-linux-x86-xlibs-7.0-r3.ebuild 2343 SHA256 8bae410df1f97e3bd0a366a6f7cd010b3808b8df3e1a2a0eb29c1fc5a79d2b5f emul-linux-x86-xlibs-7.0-r3.ebuild 2343 -EBUILD emul-linux-x86-xlibs-7.0-r4.ebuild 2356 RMD160 c5ee638bd4ccabc0c1b460d83fcc6d21b2175290 SHA1 525b2b21c8901771a17eb4c592ce071dd67e9658 SHA256 e0557a2f745d4d8ee0c657372190b46f7892a4ec1cea8fff89fc133fb5e1df4a -MD5 c95dbb89b50508f3aa9469e8ac7f6e44 emul-linux-x86-xlibs-7.0-r4.ebuild 2356 -RMD160 c5ee638bd4ccabc0c1b460d83fcc6d21b2175290 emul-linux-x86-xlibs-7.0-r4.ebuild 2356 -SHA256 e0557a2f745d4d8ee0c657372190b46f7892a4ec1cea8fff89fc133fb5e1df4a emul-linux-x86-xlibs-7.0-r4.ebuild 2356 -MISC ChangeLog 9352 RMD160 a0eff6d0c50a186e539d317874e53467f4966dca SHA1 ed629ad4a33fe9264ae181e89f55739d95a4cac7 SHA256 589619a5fa9176252dca17b97b4e32da897a7c7f011ed30d2d7710f21dae6d51 -MD5 7c3cd92e11d2297360dc1d916b13e196 ChangeLog 9352 -RMD160 a0eff6d0c50a186e539d317874e53467f4966dca ChangeLog 9352 -SHA256 589619a5fa9176252dca17b97b4e32da897a7c7f011ed30d2d7710f21dae6d51 ChangeLog 9352 +EBUILD emul-linux-x86-xlibs-7.0-r5.ebuild 2356 RMD160 26c3b366306d34466cb93aef16c4f2fdecd11366 SHA1 8594c49b27090832efd053ae52564738ab6d7273 SHA256 da2cb099b24827c202665c8ed9b7971677076d7adc507a23710a377178d33c95 +MD5 e4a952cd9db9abb054958a4a9bb917ae emul-linux-x86-xlibs-7.0-r5.ebuild 2356 +RMD160 26c3b366306d34466cb93aef16c4f2fdecd11366 emul-linux-x86-xlibs-7.0-r5.ebuild 2356 +SHA256 da2cb099b24827c202665c8ed9b7971677076d7adc507a23710a377178d33c95 emul-linux-x86-xlibs-7.0-r5.ebuild 2356 +MISC ChangeLog 9582 RMD160 2e284695adcbfa2052fc22cf2aca4a4615d86589 SHA1 eb0e7f6e2eaa4bf0c7fb62732ed0dc6673bdccc4 SHA256 0a7dc934661dadacb2ecbb1871f55229935e35b4a9cb454a11b255ecf39a6833 +MD5 7bdbba4f873f503c28795b425908606b ChangeLog 9582 +RMD160 2e284695adcbfa2052fc22cf2aca4a4615d86589 ChangeLog 9582 +SHA256 0a7dc934661dadacb2ecbb1871f55229935e35b4a9cb454a11b255ecf39a6833 ChangeLog 9582 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290 @@ -39,13 +39,13 @@ SHA256 0c91f0332d41b16c6ee45f4a9c07872c8a5ddf123024c6d71fd17037b7857a78 files/di MD5 c7cb5205c7dc6694e94b8aa3622ada6a files/digest-emul-linux-x86-xlibs-7.0-r3 3043 RMD160 729235a49c2a2d94ec651c5f1bfeb5c6b628a242 files/digest-emul-linux-x86-xlibs-7.0-r3 3043 SHA256 7198b1ce59287fea9ccfd71290163bff930bba64c12f5d389c73838fdef62462 files/digest-emul-linux-x86-xlibs-7.0-r3 3043 -MD5 2a820051c250078c9003e1e8a5e6db48 files/digest-emul-linux-x86-xlibs-7.0-r4 3043 -RMD160 a7344c0d8c5917751207efbb9ad5f634bafa6ef5 files/digest-emul-linux-x86-xlibs-7.0-r4 3043 -SHA256 9d37b03fa888431dec836d013332606c09bb252868d48c16cab53af97603b27f files/digest-emul-linux-x86-xlibs-7.0-r4 3043 +MD5 d6ac52d78fef84600e7f95ff35e2e4cf files/digest-emul-linux-x86-xlibs-7.0-r5 3043 +RMD160 6e8b5a8c7800132ffd76ee3ca2d0b9aebb5a6444 files/digest-emul-linux-x86-xlibs-7.0-r5 3043 +SHA256 29ba1ff14bdbcc896053e01d170de02003d052a823870494b7316f2d5a8a2df4 files/digest-emul-linux-x86-xlibs-7.0-r5 3043 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFjZAxppoStNGKGywRAi1QAJ9HuMb8Yir3fOFMpt+PHNnUk5S3KACaA61v -RW6mL2zPoK45C9/4oB+YBzI= -=Dg/x +iD8DBQFFjZNzppoStNGKGywRAnFaAKCKqJtqM3xtZM1jnQZSlESwnjteXwCeIQZA +zC3f+lTRPJoCMvaTn/oV1YA= +=r/Q2 -----END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r4.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r4.ebuild deleted file mode 100644 index ba4c282d473c..000000000000 --- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r4.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r4.ebuild,v 1.1 2006/12/23 19:49:38 peper Exp $ - -inherit multilib - -DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${PF}.tar.bz2 - video_cards_i810? ( mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2 ) - video_cards_mach64? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 ) - video_cards_mga? ( mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2 ) - video_cards_r128? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 ) - video_cards_radeon? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 ) - video_cards_s3virge? ( mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2 ) - video_cards_savage? ( mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2 ) - video_cards_sis? ( mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2 ) - video_cards_tdfx? ( mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2 ) - video_cards_trident? ( mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2 ) - video_cards_via? ( mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2 )" - - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64" - -IUSE_VIDEO_CARDS=" - video_cards_i810 - video_cards_mach64 - video_cards_mga - video_cards_r128 - video_cards_radeon - video_cards_s3virge - video_cards_savage - video_cards_sis - video_cards_tdfx - video_cards_trident - video_cards_via" - -IUSE="opengl ${IUSE_VIDEO_CARDS}" - -DEPEND="" - -RDEPEND="opengl? ( app-admin/eselect-opengl ) - virtual/libc - >=app-emulation/emul-linux-x86-baselibs-2.5" - -S=${WORKDIR} - -RESTRICT="nostrip" - -pkg_preinst() { - # Check for bad symlink before installing, bug 84441. - if [ -L /emul/linux/x86/usr/lib/X11 ]; then - rm -f /emul/linux/x86/usr/lib/X11 - fi -} - -src_install() { - cp -RPvf ${WORKDIR}/* ${D}/ - - local libdir="lib32" - if has_multilib_profile; then - libdir=$(get_abi_LIBDIR x86) - fi - - dodir /usr/${libdir}/opengl - dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11 -} - -pkg_postinst() { - #update GL symlinks - if use opengl ; then - /usr/bin/eselect opengl set --use-old - fi -} - diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r4 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r4 deleted file mode 100644 index 271b94a91086..000000000000 --- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r4 +++ /dev/null @@ -1,30 +0,0 @@ -MD5 5c6bd3cd5efa00ad7a650a43f13b655e emul-linux-x86-xlibs-7.0-r4.tar.bz2 3235393 -RMD160 e778ad9600bc573b650f87da440722ad680b9836 emul-linux-x86-xlibs-7.0-r4.tar.bz2 3235393 -SHA256 36485a9841b35f1b2cb6543269e752d0bf74f90404cb69835370f7562c04f2c4 emul-linux-x86-xlibs-7.0-r4.tar.bz2 3235393 -MD5 bf2fa2e8b937b767bcf16a2be8afff74 emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164 -RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164 -SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164 -MD5 e36bba25dd4955e761c9099695aae319 emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803 -RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803 -SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803 -MD5 21a1f60641146ca5d3331ea982f97c7f emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975 -RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975 -SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975 -MD5 fe34e55e1dd5bc73904bbc4e96a3a134 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284 -RMD160 3df360b409e0432234f37c7662d8fca7fe74c5cd emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284 -SHA256 18fc5da1288a623ff2c0cd6ee5b177d90d3e634209c96675d244f8b435cdae93 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284 -MD5 ada4398fc3e8845683fc5d1fbd2d16b2 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433 -RMD160 9545cadecc0dfa9dec1a801850fed63cb92b9a37 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433 -SHA256 33e82602e7c57e42e86ebcd29fc3fd568a06ada9091ba8484d3cbfda9d2a6230 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433 -MD5 b0c2ebaea9b235b7c98287871ee3294f emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198 -RMD160 c980124403a183435ef7328c36decb857d4e344c emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198 -SHA256 b93c61db78c67de7188ac6e20edd8f39db5af9df58283c613e94d147742dac84 emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198 -MD5 57cf19d69012a5e682516ee214605cc4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194 -RMD160 6d70e3d16c903a8383a1168687363d7626318c8a emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194 -SHA256 e07cdf5f4d682c1856b83c5b06765b24ca51fb8f29f0d5c7ce7992ea499a0ca4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194 -MD5 cb538216fe6a7e5de5214a7715d3a6ef emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399 -RMD160 8460f56d6829d41c042c040bab830084dd1b9958 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399 -SHA256 d393ba2e1ba8cddd9b3861afdd7f19520b258400f76df8cd5c8fc056671256e5 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399 -MD5 b91b5b76579259e59f7593c4733fa772 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605 -RMD160 201d284ab22ac501ec7b20b2ca419696326f1532 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605 -SHA256 5a64d00eb39684e32f6b1aa045437fb6883e4a090303a70c8e6a7fc3f4e6a995 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605