Version bump, remove old.

(Portage version: 2.1.11/cvs/Linux x86_64)

3 files changed, 13 insertions, 72 deletions

diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index 03780232acc2..08fa30cf5ff8 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/telepathy-gabble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.98 2012/04/23 01:06:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.99 2012/06/23 09:35:55 pacho Exp $
+
+*telepathy-gabble-0.16.1 (23 Jun 2012)
+
+  23 Jun 2012; Pacho Ramos <pacho@gentoo.org> +telepathy-gabble-0.16.1.ebuild,
+  -telepathy-gabble-0.12.7.ebuild, -telepathy-gabble-0.15.5.ebuild:
+  Version bump, remove old.
 
 *telepathy-gabble-0.16.0 (23 Apr 2012)
 
@@ -532,4 +538,3 @@
   22 Oct 2006; Piotr Jaroszyński <peper@gentoo.org> +metadata.xml,
   +telepathy-gabble-0.4.0.ebuild:
   Import from voip overlay.
-
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.12.7.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.12.7.ebuild
deleted file mode 100644
index 01f76041fc03..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.12.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.12.7.ebuild,v 1.5 2011/10/30 17:31:20 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit python
-
-DESCRIPTION="A Jabber/XMPP connection manager, this handles single and multi user chats and voice calls."
-HOMEPAGE="http://telepathy.freedesktop.org"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="debug test"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=sys-apps/dbus-1.1.0
-	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.14.5
-	>=net-libs/libnice-0.0.11
-	>=net-libs/gnutls-2.10.2
-
-	dev-db/sqlite:3
-	dev-libs/libxml2
-
-	|| ( net-libs/libsoup:2.4[ssl]
-		 >=net-libs/libsoup-2.33.1 )
-
-	!<net-im/telepathy-mission-control-5.5.0"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	test? ( >=dev-python/twisted-0.8.2
-		>=dev-python/twisted-words-0.8.2
-		>=dev-python/dbus-python-0.83 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable debug handle-leak-debug)
-}
-
-src_test() {
-	# Twisted tests fail, upstream bug #30565
-	emake -C tests check-TESTS || die "tests failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS NEWS ChangeLog README || die "dodoc failed"
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.15.5.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.16.1.ebuild
index ed97f1229ef5..0eaee3a5800e 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.15.5.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.16.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.15.5.ebuild,v 1.1 2012/04/21 21:27:45 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.1.ebuild,v 1.1 2012/06/23 09:35:55 pacho Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
 
-inherit python
+inherit python eutils
 
 DESCRIPTION="A Jabber/XMPP connection manager, this handles single and multi user chats and voice calls."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -16,10 +16,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 IUSE="+jingle test"
 
-RDEPEND=">=dev-libs/glib-2.24:2
+RDEPEND=">=dev-libs/glib-2.30:2
 	>=sys-apps/dbus-1.1.0
 	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.17.7
+	>=net-libs/telepathy-glib-0.18
 	>=net-libs/libnice-0.0.11
 	>=net-libs/gnutls-2.10.2
 
@@ -59,7 +59,6 @@ src_test() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS NEWS ChangeLog README
-	find "${D}" -name '*.la' -exec rm -f {} +
+	default
+	prune_libtool_files
 }