diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-05-16 23:22:05 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-05-16 23:22:05 +0000 |
| commit | fafc268169856d0c289e2bd2e2ae1cfa5581c306 (patch) | |
| tree | 25d68529c78e8d6594cc104936e950349424ed05 /sci-geosciences/googleearth | |
| parent | Version bump, bug #320065. Progress on lib unbundling thanks to tommy, bug #2... (diff) | |
| download | historical-fafc268169856d0c289e2bd2e2ae1cfa5581c306.tar.gz historical-fafc268169856d0c289e2bd2e2ae1cfa5581c306.tar.bz2 historical-fafc268169856d0c289e2bd2e2ae1cfa5581c306.zip | |
Add nss-mdns dep on x86 instead of bundled library.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences/googleearth')
| -rw-r--r-- | sci-geosciences/googleearth/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/googleearth/Manifest | 4 | ||||
| -rw-r--r-- | sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog index 6b95e36c338c..16fc9df818a8 100644 --- a/sci-geosciences/googleearth/ChangeLog +++ b/sci-geosciences/googleearth/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/googleearth # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.4 2010/05/16 23:07:07 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.5 2010/05/16 23:22:05 caster Exp $ + + 16 May 2010; Vlastimil Babka <caster@gentoo.org> + googleearth-5.1.3535.3218.ebuild: + Add nss-mdns dep on x86 instead of bundled library. *googleearth-5.1.3535.3218 (16 May 2010) diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest index cc9f1254fa84..92f84ce129af 100644 --- a/sci-geosciences/googleearth/Manifest +++ b/sci-geosciences/googleearth/Manifest @@ -9,6 +9,6 @@ EBUILD googleearth-4.2.205.5730.ebuild 2061 RMD160 cc75ccf1886e5f55e6f523a6defa2 EBUILD googleearth-4.3.7284.3916.ebuild 2147 RMD160 78c1b7c4c8c59097d8a8058df9f149c530512d8d SHA1 9d088ab4f4faf42be813ad0db9d597b38472f15a SHA256 44163550eda61ec3528b892f2e6c017fae1f4bcec81c909db3883bb5ce8b3f16 EBUILD googleearth-5.0.11733.9347.ebuild 2530 RMD160 00d41a87cd831a78d08e888c706c18c73b0dfa88 SHA1 ebc64b053aa0ae76451a317214986bf4384f81b3 SHA256 57b67c2f630e40011128d69e53c98e2c8144ded973ab7ee483b20309abc434e4 EBUILD googleearth-5.1.3533.1731-r1.ebuild 3321 RMD160 f02f2e4ef6db95fadc74d90d78dea48f44591544 SHA1 efb8ecd1e7a581519f332f93353c32b7e7281a97 SHA256 89e2a46541f947038a65d6ce06a06c48bdbd24fe6911adcab80ac2b470bab4b3 -EBUILD googleearth-5.1.3535.3218.ebuild 3739 RMD160 fec64c34a7f65ad724eadcf6ccd5e7fe34b5da9d SHA1 375c6593fd7465b1ee664c53351bb251df0de4a1 SHA256 7e161cf99ec9f59dee998b11c82514a61d59d64325e621f6482d578d8743bae0 -MISC ChangeLog 11527 RMD160 21ef4a5800ec60bfa464525cff0a4a417589a5b8 SHA1 1b27b31e20b75f87298057ccc973bfe00063638b SHA256 2d97c6b4e8f42981f87885b1dcd02e1c531425636fa6fc672e0e47791d3c0602 +EBUILD googleearth-5.1.3535.3218.ebuild 3606 RMD160 9975793d21335ca502773282d92a0457bea4e453 SHA1 c41b65273641ceea83d366a8728d8e48f0029683 SHA256 d71dcd9478af519df57ff75ab562365ba17ef324027bd0c095fb549730b451ef +MISC ChangeLog 11669 RMD160 9f9540cd0e2a337f6d380a9fed002499743e2c11 SHA1 061f5cc9ac2df1ef1f1f30c1bf0d24f0c8c64349 SHA256 65577e07a4b3e89230e2690b552512d8f76838e6af6f5bd091036005044be7e5 MISC metadata.xml 626 RMD160 a86edde5c7fb06ad02761f159bc05239b2507521 SHA1 8bc7bd3f1767aea50d396a696a83ddbc660f3fbd SHA256 cbe80f8dd2f6cf2dc88c03bc2765a171f705502c6f1513cdd41b285aac87660c diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild index 59bc32aa44fe..aec6dbafebd1 100644 --- a/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild +++ b/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild,v 1.1 2010/05/16 23:07:07 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild,v 1.2 2010/05/16 23:22:05 caster Exp $ EAPI=2 @@ -43,6 +43,7 @@ RDEPEND=">=sys-devel/gcc-${GCC_NEEDED}[-nocxx] ) net-misc/curl sci-libs/gdal + sys-auth/nss-mdns ) amd64? ( >=app-emulation/emul-linux-x86-xlibs-20081109 @@ -120,12 +121,7 @@ src_install() { if ! use qt-bundled; then rm -rvf libQt{Core,Gui,Network,WebKit}.so.4 plugins/imageformats qt.conf || die fi - rm -rvf libGLU.so.1 libcurl.so.4 - if use amd64; then - # provided by emul-baselibs for amd64 - # on x86 need to sort out collision between mDNSresponder and nss-mdns first - rm -rvf libnss_mdns4_minimal.so.2 || die - fi + rm -rvf libGLU.so.1 libcurl.so.4 libnss_mdns4_minimal.so.2 || die if use x86; then # no 32 bit libs for gdal rm -rvf libgdal.so.1 || die |