From d668c8fd1c34b780745dd9adffa485530bf84431 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 12 Dec 2010 22:46:17 +0000 Subject: [PATCH] redigest git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2780 6952d904-891a-0410-993b-d76249ca496b --- media-libs/libvpx/Manifest | 4 ++-- media-libs/libvpx/libvpx-0.9.5.ebuild | 4 ++++ media-libs/libvpx/libvpx-9999.ebuild | 4 ++++ x11-libs/qt-core/Manifest | 2 +- x11-libs/qt-core/qt-core-4.7.1-r1.ebuild | 2 ++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest index 9ee86f2e..85f6e056 100644 --- a/media-libs/libvpx/Manifest +++ b/media-libs/libvpx/Manifest @@ -1,5 +1,5 @@ DIST libvpx-v0.9.5.tar.bz2 1250422 RMD160 e90652a84e6047f5d5f8a0a110b07a324742a74c SHA1 223965ff16737251afb3377c0800d1f8b5f84379 SHA256 2e93968afcded113a7e218de047feecf6659a089058803a9e40fb687de5f9bfa -EBUILD libvpx-0.9.5.ebuild 1509 RMD160 8c72ace3128cbd381db04631e15a34c3189a8b20 SHA1 649a249f514e27ef7d1adc056eb7a457970aa2bb SHA256 28b27f7ae9e70e9cd9ea906ee3e6cae62195a6a75df89a542a362639ac41c7c8 -EBUILD libvpx-9999.ebuild 1509 RMD160 8c72ace3128cbd381db04631e15a34c3189a8b20 SHA1 649a249f514e27ef7d1adc056eb7a457970aa2bb SHA256 28b27f7ae9e70e9cd9ea906ee3e6cae62195a6a75df89a542a362639ac41c7c8 +EBUILD libvpx-0.9.5.ebuild 1656 RMD160 008165250f79d20ffde82d4de3b257130f1fc25c SHA1 98dd96444722076c700c96ca243e46cd0367b228 SHA256 a66be54aa947cb1076ee735f5a3be5b519d46c73258f85da0abfb25b4547da08 +EBUILD libvpx-9999.ebuild 1656 RMD160 008165250f79d20ffde82d4de3b257130f1fc25c SHA1 98dd96444722076c700c96ca243e46cd0367b228 SHA256 a66be54aa947cb1076ee735f5a3be5b519d46c73258f85da0abfb25b4547da08 MISC ChangeLog 1858 RMD160 68fbe46099bc5e0d87da4031bd2214256c0f23c8 SHA1 144351929090a50880c6e23167c99e21678ff112 SHA256 e8ba9f673025f9143f1679996e93ef47f881dc020ed42f2d626c774b829bee86 MISC metadata.xml 517 RMD160 5b8c2af107175fc8be0fd0f3d676dcb1fb1b2bc1 SHA1 a9164f13235a7bce3d266767c1d47bc2be4c3021 SHA256 b94ac8d73429cfe726eb618f80bf11865e682f5129d6268a3182c70b34325734 diff --git a/media-libs/libvpx/libvpx-0.9.5.ebuild b/media-libs/libvpx/libvpx-0.9.5.ebuild index a3140669..1e76a4a3 100644 --- a/media-libs/libvpx/libvpx-0.9.5.ebuild +++ b/media-libs/libvpx/libvpx-0.9.5.ebuild @@ -37,6 +37,9 @@ DEPEND="amd64? ( dev-lang/yasm ) src_configure() { tc-export CC + archparm="" + [ "$ABI" = "x86" ] && archparm="--target=x86-linux-gcc" + [ "$ABI" = "x86_64" ] && archparm="--target=x86_64-linux-gcc" ./configure \ --prefix=/usr \ --libdir=/usr/$(get_libdir) \ @@ -54,6 +57,7 @@ src_configure() { $(use_enable doc install-docs) \ $(use_enable postproc) \ $(use_enable threads multithread) \ + $archparm \ --as=yasm \ || die } diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild index a3140669..1e76a4a3 100644 --- a/media-libs/libvpx/libvpx-9999.ebuild +++ b/media-libs/libvpx/libvpx-9999.ebuild @@ -37,6 +37,9 @@ DEPEND="amd64? ( dev-lang/yasm ) src_configure() { tc-export CC + archparm="" + [ "$ABI" = "x86" ] && archparm="--target=x86-linux-gcc" + [ "$ABI" = "x86_64" ] && archparm="--target=x86_64-linux-gcc" ./configure \ --prefix=/usr \ --libdir=/usr/$(get_libdir) \ @@ -54,6 +57,7 @@ src_configure() { $(use_enable doc install-docs) \ $(use_enable postproc) \ $(use_enable threads multithread) \ + $archparm \ --as=yasm \ || die } diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest index b33ec8ed..8db749bf 100644 --- a/x11-libs/qt-core/Manifest +++ b/x11-libs/qt-core/Manifest @@ -6,6 +6,6 @@ AUX qt-4.6.2-alpha.patch 2913 RMD160 52ca59388d88c8e0ea2a40fd8d9d6721d324664e SH AUX rcc.pro 3440 RMD160 42e65efa8dc027f8a2b6c933243a91c1cac96092 SHA1 017ea0aea74a27012608f8be8f301d3cda3dd2b7 SHA256 b09c74046a97ec87b19a05abfe08d959040b737430e498269fb0d0c00bf0a38d AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff37256b5c966e4d21b0fb6cb64b717f3d07 SHA256 904084b6d936fb9bab33d3592ec69dc9872708a74834f0cb498e8153f784c7fc DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a -EBUILD qt-core-4.7.1-r1.ebuild 5073 RMD160 82fa110f7f737f50cc040fde4521fd0e5cbbafea SHA1 617293a38f97f81b7b93a5cc0a2d53c7b6c96407 SHA256 25142adaf04596bd2ffe51fdd6856e6e30e5a2efc4aea5bf67d109bce4bd0d88 +EBUILD qt-core-4.7.1-r1.ebuild 5180 RMD160 0edd1ca4915cc697098c9adaac8cb31733c1bc49 SHA1 a8d9a358cf0c66040a53b7f7e195665297f1acb8 SHA256 fc101e3a1b6bc9ad684b0d67b25e81e63857ee5fb8449368eae6ddfeeeb7162d MISC ChangeLog 15622 RMD160 88b29517686f501f38ee39186a036c84faba9b4b SHA1 bb733e98605a6fabd9c2cfe52e5f6d9e67db5fab SHA256 65b9b9946728be7c11c7da5a7857b9ffb71bf112f9da7d901d0e12b94dd9d896 MISC metadata.xml 802 RMD160 0341afae262322299759a5a33bae9a42e5b7801c SHA1 b564551c1b4a7902e09200255c6c0a6ede646a23 SHA256 a84f88402ece782e8ac52ad0b90eea94e5bd563ca0a7956e1d89f1263d7f2925 diff --git a/x11-libs/qt-core/qt-core-4.7.1-r1.ebuild b/x11-libs/qt-core/qt-core-4.7.1-r1.ebuild index 9588bb1a..c6f3a728 100644 --- a/x11-libs/qt-core/qt-core-4.7.1-r1.ebuild +++ b/x11-libs/qt-core/qt-core-4.7.1-r1.ebuild @@ -74,6 +74,8 @@ src_prepare() { "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" + sed -i -e "s:-m32::" \ + "${S}/config.tests/.qmake.cache" || die "sed qmake/Makefile.unix LDFLAGS failed" } src_configure() {