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 | 7b2c36efbfa146ca0abef9d3ea9174896a9f5497 (patch) | |
| tree | 7485bee2435b88118427d18bc26eef4559ecc2fd /sci-geosciences | |
| parent | Version bump, bug #320065. Progress on lib unbundling thanks to tommy, bug #2... (diff) | |
| download | gentoo-2-7b2c36efbfa146ca0abef9d3ea9174896a9f5497.tar.gz gentoo-2-7b2c36efbfa146ca0abef9d3ea9174896a9f5497.tar.bz2 gentoo-2-7b2c36efbfa146ca0abef9d3ea9174896a9f5497.zip | |
Add nss-mdns dep on x86 instead of bundled library.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/googleearth/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/googleearth/googleearth-5.1.3535.3218.ebuild | 10 |
2 files changed, 8 insertions, 8 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/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 |