Remove 2.34.0 ebuild since -r1 overshadows it.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

2 files changed, 3 insertions, 118 deletions

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index e5c01fe46596..54ba626ce81f 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -9,13 +9,12 @@ DIST empathy-2.34.0.tar.bz2 3361496 RMD160 a76e9633d88dbd48c5d494d3393566a88a5b3
 EBUILD empathy-2.30.2.ebuild 2646 RMD160 c8ce466144e4852829d6536ae826f23ae53aafd3 SHA1 49e6826f14edbb3838864406c3a8b404bc6e2d50 SHA256 d1b17410dd53395dac710fe3584590efc59ebad83794827aeb6998e51d6565d4
 EBUILD empathy-2.32.2.ebuild 3129 RMD160 432ea4a9ea354ff8c031a6e91b77f460f853f568 SHA1 02c8374d7368e1485f992df349441b316b12fcc9 SHA256 8c784893206ce642837dec44e29cfbbaa7ca6a57b55a65d847d02b5883fdbdad
 EBUILD empathy-2.34.0-r1.ebuild 3129 RMD160 e6a14724406646022b76fd82ddd26ae2ff53d609 SHA1 16e5f094cfbcc2041b5e3f65bb1b3138402517a5 SHA256 f5ee4c0536db1fe5e783ca9e34de1333fe9eba86659f3400028e2dbb6b0240f1
-EBUILD empathy-2.34.0.ebuild 3062 RMD160 c10b393cb6528127e3ff6c917b93cc90471976f2 SHA1 f881e6db1002deab99d63f012c78e94f47988ce9 SHA256 56631d688466f678b371c54402f63ea8339997463c1d80eb747501b19b87d7ba
 MISC ChangeLog 14899 RMD160 8972d9b821061cddf84d9e15d3d0424e180430b8 SHA1 9a97eb4a45291b7f1578f3e06cccf494e4c17e23 SHA256 7bc66aeeeb779a902755371089a880b55c34836676350052f4e5d280c21c2c5d
 MISC metadata.xml 940 RMD160 4e41d99236e8d53fc36a72411432766f084ef526 SHA1 7b36c712b8f94fd2c2cca3133249bdbeea2d35b2 SHA256 88ab29a94d21a18761bba19eb92f07aac4f4577951b0153b71a78ea3db24a23f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2cXkMACgkQ+Vqt1inD4uy+3gCdFsB3EapG6Tluv0TU5Hh2mAle
-DI4AoILYcghmrMsuHS5VL81X8CPsOPy5
-=Xmgh
+iEYEARECAAYFAk2cXrsACgkQ+Vqt1inD4uzgWgCfRBRElu7sneeHvrkEbhbKNX1B
+100AoJrynI+YpLT85v1yensGJL4QbXsG
+=AjVs
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.34.0.ebuild b/net-im/empathy/empathy-2.34.0.ebuild
deleted file mode 100644
index f872bcc26582..000000000000
--- a/net-im/empathy/empathy-2.34.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0.ebuild,v 1.2 2011/03/28 20:59:44 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2:2.4"
-
-inherit eutils gnome2 multilib python
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="eds map nautilus networkmanager spell test webkit"
-
-# FIXME: libnotify & libcanberra hard deps
-# gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-RDEPEND=">=dev-libs/glib-2.27.2:2
-	>=x11-libs/gtk+-2.22:2
-	>=dev-libs/dbus-glib-0.51
-	>=net-libs/telepathy-glib-0.14.1
-	>=media-libs/libcanberra-0.4[gtk]
-	>=x11-libs/libnotify-0.7
-	>=gnome-base/gnome-keyring-2.26
-	>=net-libs/gnutls-2.8.5
-	>=dev-libs/folks-0.4
-
-	>=dev-libs/libunique-1.1.6:1
-	net-libs/farsight2
-	>=media-libs/gstreamer-0.10.32:0.10
-	>=media-libs/gst-plugins-base-0.10.32:0.10
-	media-libs/gst-plugins-bad
-	media-plugins/gst-plugins-gconf
-	>=net-libs/telepathy-farsight-0.0.14
-	dev-libs/libxml2
-	x11-libs/libX11
-	net-voip/telepathy-connection-managers
-	>=net-im/telepathy-logger-0.2.0
-
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	map? (
-		>=media-libs/libchamplain-0.7.1:0.8[gtk]
-		>=media-libs/clutter-gtk-0.10:0.10 )
-	nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.16
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
-
-pkg_setup() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-	# call support needs unreleased telepathy-farstream
-	G2CONF="${G2CONF}
-		--enable-silent-rules
-		--disable-coding-style-checks
-		--disable-schemas-compile
-		--disable-static
-		--disable-call
-		--disable-location
-		--disable-control-center-embedding
-		--disable-Werror
-		$(use_enable debug)
-		$(use_with eds)
-		$(use_enable map)
-		$(use_enable nautilus nautilus-sendto)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable spell)
-		$(use_enable webkit)"
-
-	# Build time python tools needs python2
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	python_convert_shebangs -r 2 .
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed."
-}
-
-src_install() {
-	gnome2_src_install
-	# nautilus-sendto plugin doesn't need this
-	find "${ED}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-voip/telepathy-connection-managers"
-	elog "to install them."
-}