Remove versions with conflicting SRC_URIs.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 7 insertions, 182 deletions

diff --git a/x11-misc/googleearth/ChangeLog b/x11-misc/googleearth/ChangeLog
index 8b4adbe8a5e4..eb70feed059f 100644
--- a/x11-misc/googleearth/ChangeLog
+++ b/x11-misc/googleearth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/googleearth
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.44 2009/05/26 09:16:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.45 2009/05/26 09:18:46 jer Exp $
+
+  26 May 2009; Jeroen Roovers <jer@gentoo.org>
+  -googleearth-5.0.11337.1968_beta.ebuild,
+  -googleearth-5.0.11729.1014.ebuild:
+  Remove versions with conflicting SRC_URIs.
 
 *googleearth-5.0.11733.9347 (26 May 2009)
 
diff --git a/x11-misc/googleearth/Manifest b/x11-misc/googleearth/Manifest
index 4768503e1341..77e8d878dc0a 100644
--- a/x11-misc/googleearth/Manifest
+++ b/x11-misc/googleearth/Manifest
@@ -1,13 +1,9 @@
 AUX mime-magic.patch 572 RMD160 e49ddaf43ca7de3cfabf08754f4f4d21864a3489 SHA1 e6689a0f970cfc677749e1ee3aeeaa3b8f5605fc SHA256 302bfab0aa2edd09a2a83f7040de4dcc09998e822555b85242e2e8cb05fb3a12
 DIST GoogleEarthLinux-4.3.7284.3916.bin 20554977 RMD160 de8f92a45b72d37ba66bc33dd20b2bd59df79fad SHA1 35b883f75ca0da4cc4b5888d345ed5ec2a53123e SHA256 aeb71c8e191df4b3689ef45e6b2346b4b7c3910738f92deadb265a044e68277e
-DIST GoogleEarthLinux-5.0.11337.1968_beta.bin 25338751 RMD160 a215323b37baacad3fa404c381fcbd3a9fd3b3ad SHA1 c98d15b21159f799092cf7a1cd29258eeb5e7fbc SHA256 acc5e40684a1b1c26164423e4b1b62719031c3915fced94f5277dcd9560609c0
-DIST GoogleEarthLinux-5.0.11729.1014.bin 25602325 RMD160 da38adfa2eb8766dacf4f7822778335d8bfbc389 SHA1 9fde78e8b68261c968b8898f8dc935540ff85d8d SHA256 5a191f3023c6100035dd76cfa22f7c146ca9fbf735490dd6c4300b8e1e97abf0
 DIST GoogleEarthLinux-5.0.11733.9347.bin 25606194 RMD160 ba61c88c38eefad655cf0de4b17f033640783a2c SHA1 4aa2b565523dc6ee9592a0f96760297fc06f762c SHA256 fde44633607cb762810e14e8fe7c9755a1c9b04c10fbb712c2ab899274716b9a
 DIST GoogleEarthLinux.bin 23048189 RMD160 bf8994f6aa9f4204510023ac629c331789e3969b SHA1 25b4b546625423b2e570ff8aae5ee7eff49a1b97 SHA256 da7d22cb13cc5f047dea6ae241bb33c5ac1789a9f601e09dcb025fe574df4516
 EBUILD googleearth-4.2.205.5730.ebuild 2071 RMD160 8192bab1be53ac5ec031b25e38153132b5f750fd SHA1 b2b977a8829960f4fbeba2f4eadb0b2dce4a8fed SHA256 07ab620ee20456354574fb5b083eed4b5ad0027856ff45c80ec958c1834f7e3c
 EBUILD googleearth-4.3.7284.3916.ebuild 2158 RMD160 b76715d8f85b564cd289a586042ce0676bbb6d76 SHA1 7894219bf4848fcc9f8e35725b685a0e2a9b1b93 SHA256 3a30847bd9321b94ce94e053f5207746b2c74607906fbd17c68cd586d4ef9864
-EBUILD googleearth-5.0.11337.1968_beta.ebuild 2137 RMD160 256de0fe033c2975d1b3de67098f5101cb230f37 SHA1 1869cff3bd14c0f5036cef4f6a926898d831d11a SHA256 85fdf27d70e498303eb716f2cbbedf7d7ba90d3072e9ae6ffa8672f5c4dd74a5
-EBUILD googleearth-5.0.11729.1014.ebuild 2455 RMD160 2d9574efc853336f563b55d0ce38f02dc146d5ae SHA1 47ee4f18856706dcc6be638ae7c99ce655d855ec SHA256 1cfd1967c14b4956f03346e243b158e8e085f34734e5cb1ca95c53252b1d9d3c
 EBUILD googleearth-5.0.11733.9347.ebuild 2452 RMD160 68cce05d167a78713907341b5578e65b7570f97c SHA1 ae2e10e3c13a2bb1b4c918b7078462be4feff6b7 SHA256 229a3c7ecc19d15c0e4b9bbf902bb21d14a3502bff85a39f8393edec211c01a8
-MISC ChangeLog 7840 RMD160 807cae85264c710fd7c5dc5b0b5e167045eb9341 SHA1 0dacaaca73947434cf1346023e14aa2d78c22e84 SHA256 94626dd1d3a873048f0b3d0a9ea5c09b1fcabc0595ea2a6dd84e1ed768295966
+MISC ChangeLog 8014 RMD160 f5efa3c8b12d0115fca31d2727ae1b11c46807f6 SHA1 020ef5f63e5aea0cffa281ff85e00a2e89e5a8c9 SHA256 d4e1247651e3ab7eced18607e9c525ed677b4bffffdc0f6d393238da37f73150
 MISC metadata.xml 325 RMD160 a7051f86b61260d8a682b108bf6a7eed0edc7bd1 SHA1 93b04166fd686b8af24c69b0acee7c1781110883 SHA256 4029c778cbc31db5f49fd0467781a733e1be2530c3d88484d8d5c817a4ea2840
diff --git a/x11-misc/googleearth/googleearth-5.0.11337.1968_beta.ebuild b/x11-misc/googleearth/googleearth-5.0.11337.1968_beta.ebuild
deleted file mode 100644
index 66927a82b509..000000000000
--- a/x11-misc/googleearth/googleearth-5.0.11337.1968_beta.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.0.11337.1968_beta.ebuild,v 1.1 2009/02/08 14:36:06 caster Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime
-
-DESCRIPTION="A 3D interface to the planet"
-HOMEPAGE="http://earth.google.com/"
-SRC_URI="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin
-			-> GoogleEarthLinux-${PV}.bin"
-
-LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip"
-IUSE=""
-
-RDEPEND="x86? (
-	dev-libs/openssl
-	media-libs/fontconfig
-	media-libs/freetype
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrender )
-	amd64? (
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-baselibs
-	|| (
-		>=app-emulation/emul-linux-x86-xlibs-7.0
-		x11-drivers/nvidia-drivers
-		<x11-drivers/ati-drivers-8.28.8 ) )
-	media-fonts/ttf-bitstream-vera"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_makeself
-	# make the postinst script only create the files; it's  installation
-	# are too complicated and inserting them ourselves is easier than
-	# hacking around it
-	sed -i -e 's:$SETUP_INSTALLPATH/::' \
-		-e 's:$SETUP_INSTALLPATH:1:' \
-		-e "s:^xdg-desktop-icon.*$::" \
-		-e "s:^xdg-desktop-menu.*$::" \
-		-e "s:^xdg-mime.*$::" postinstall.sh
-}
-
-src_install() {
-	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
-	./postinstall.sh
-	insinto /usr/share/mime/packages
-	doins ${PN}-mimetypes.xml
-	domenu Google-${PN}.desktop
-	doicon ${PN}-icon.png
-	dodoc README.linux
-
-	cd bin
-	tar xf "${WORKDIR}"/${PN}-linux-x86.tar
-	exeinto /opt/${PN}
-	doexe *
-
-	cd "${D}"/opt/${PN}
-	tar xf "${WORKDIR}"/${PN}-data.tar
-
-	# use system libcrypto, bundled one doesn't work with system libssl
-	rm libcrypto.so.*
-	# make sure we install with correct permissions
-	fowners -R root:root /opt/${PN}
-	fperms -R a-x,a+X /opt/googleearth/{xml,resources}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/googleearth/googleearth-5.0.11729.1014.ebuild b/x11-misc/googleearth/googleearth-5.0.11729.1014.ebuild
deleted file mode 100644
index 93d6956d9260..000000000000
--- a/x11-misc/googleearth/googleearth-5.0.11729.1014.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.0.11729.1014.ebuild,v 1.1 2009/04/29 18:55:44 caster Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime
-
-DESCRIPTION="A 3D interface to the planet"
-HOMEPAGE="http://earth.google.com/"
-# no upstream versioning, version determined from help/about
-# incorrect digest means upstream bump and a need for version bump
-SRC_URI="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin
-			-> GoogleEarthLinux-${PV}.bin"
-
-LICENSE="googleearth MIT X11 SGI-B-1.1 openssl as-is ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip"
-IUSE=""
-
-RDEPEND="x86? (
-	media-libs/fontconfig
-	media-libs/freetype
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrender )
-	amd64? (
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-baselibs
-	|| (
-		>=app-emulation/emul-linux-x86-xlibs-7.0
-		x11-drivers/nvidia-drivers
-		<x11-drivers/ati-drivers-8.28.8 ) )
-	media-fonts/ttf-bitstream-vera"
-
-S="${WORKDIR}"
-
-QA_TEXTRELS="opt/googleearth/libgps.so
-opt/googleearth/libgooglesearch.so
-opt/googleearth/libevll.so
-opt/googleearth/librender.so
-opt/googleearth/libinput_plugin.so
-opt/googleearth/libflightsim.so
-opt/googleearth/libcollada.so
-opt/googleearth/libminizip.so
-opt/googleearth/libauth.so
-opt/googleearth/libbasicingest.so
-opt/googleearth/libmeasure.so"
-
-src_unpack() {
-	unpack_makeself
-	# make the postinst script only create the files; it's  installation
-	# are too complicated and inserting them ourselves is easier than
-	# hacking around it
-	sed -i -e 's:$SETUP_INSTALLPATH/::' \
-		-e 's:$SETUP_INSTALLPATH:1:' \
-		-e "s:^xdg-desktop-icon.*$::" \
-		-e "s:^xdg-desktop-menu.*$::" \
-		-e "s:^xdg-mime.*$::" postinstall.sh
-}
-
-src_install() {
-	make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed"
-	./postinstall.sh
-	insinto /usr/share/mime/packages
-	doins ${PN}-mimetypes.xml
-	domenu Google-${PN}.desktop
-	doicon ${PN}-icon.png
-	dodoc README.linux
-
-	cd bin
-	tar xf "${WORKDIR}"/${PN}-linux-x86.tar
-	exeinto /opt/${PN}
-	doexe *
-
-	cd "${D}"/opt/${PN}
-	tar xf "${WORKDIR}"/${PN}-data.tar
-
-	fowners -R root:root /opt/${PN}
-	fperms -R a-x,a+X /opt/googleearth/{xml,resources}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}