Version bump, remove old.

(Portage version: 2.1.10.57/cvs/Linux x86_64)

4 files changed, 27 insertions, 114 deletions

diff --git a/net-im/telepathy-mission-control/ChangeLog b/net-im/telepathy-mission-control/ChangeLog
index 89985fae0f31..d47d721f1656 100644
--- a/net-im/telepathy-mission-control/ChangeLog
+++ b/net-im/telepathy-mission-control/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/telepathy-mission-control
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.67 2012/04/14 22:08:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.68 2012/04/23 10:21:09 pacho Exp $
+
+*telepathy-mission-control-5.12.0 (23 Apr 2012)
+
+  23 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +telepathy-mission-control-5.12.0.ebuild,
+  -telepathy-mission-control-5.7.11.ebuild,
+  -telepathy-mission-control-5.8.0.ebuild,
+  -telepathy-mission-control-5.8.1.ebuild:
+  Version bump, remove old.
 
   14 Apr 2012; Zac Medico <zmedico@gentoo.org>
   telepathy-mission-control-5.10.1.ebuild:
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.8.1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.12.0.ebuild
index 59d9109d416f..18d9448bdfcf 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.8.1.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.8.1.ebuild,v 1.5 2011/10/30 17:22:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.12.0.ebuild,v 1.1 2012/04/23 10:21:09 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2:2.5"
 
 inherit python
@@ -13,13 +13,17 @@ 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="gnome-keyring"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gnome-keyring networkmanager +upower"
 # IUSE="test"
 
-RDEPEND=">=net-libs/telepathy-glib-0.13.14
+# Fixme: connman support
+RDEPEND=">=net-libs/telepathy-glib-0.17.5
 	>=dev-libs/dbus-glib-0.82
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
+	>=dev-libs/glib-2.30:2
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	upower? ( >=sys-power/upower-0.9.11 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-libs/libxslt"
@@ -31,6 +35,7 @@ RESTRICT="test"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -41,12 +46,13 @@ src_configure() {
 	# creds is not available and no support mcd-plugins for now
 	econf --disable-static\
 		--disable-mcd-plugins \
-		$(use_enable gnome-keyring)
+		--disable-schemas-compile \
+		$(use_enable gnome-keyring) \
+		$(use_with networkmanager connectivity nm) \
+		$(use_enable upower)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog || die
-
+	default
 	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
 }
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.7.11.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.7.11.ebuild
deleted file mode 100644
index 33d664e7b597..000000000000
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.7.11.ebuild
+++ /dev/null
@@ -1,51 +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/telepathy-mission-control/telepathy-mission-control-5.7.11.ebuild,v 1.5 2011/10/05 17:56:38 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit python
-
-DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework."
-HOMEPAGE="http://telepathy.freedesktop.org/wiki/Mission%20Control"
-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"
-IUSE="gnome-keyring test"
-
-RDEPEND=">=net-libs/telepathy-glib-0.13.14
-	>=dev-libs/dbus-glib-0.82
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	test? ( dev-python/twisted-words )"
-
-# Tests are broken, see upstream bug #29334
-# upstream doesn't want it enabled everywhere
-RESTRICT="test"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	# creds is not available and no support mcd-plugins for now
-	econf --disable-static\
-		--disable-mcd-plugins \
-		$(use_enable gnome-keyring)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-}
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.8.0.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.8.0.ebuild
deleted file mode 100644
index 69ea3753cb03..000000000000
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.8.0.ebuild
+++ /dev/null
@@ -1,51 +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/telepathy-mission-control/telepathy-mission-control-5.8.0.ebuild,v 1.2 2011/08/06 10:48:07 zmedico Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit python
-
-DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework."
-HOMEPAGE="http://telepathy.freedesktop.org/wiki/Mission%20Control"
-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="gnome-keyring test"
-
-RDEPEND=">=net-libs/telepathy-glib-0.13.14
-	>=dev-libs/dbus-glib-0.82
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	test? ( dev-python/twisted-words )"
-
-# Tests are broken, see upstream bug #29334
-# upstream doesn't want it enabled everywhere
-RESTRICT="test"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	# creds is not available and no support mcd-plugins for now
-	econf --disable-static\
-		--disable-mcd-plugins \
-		$(use_enable gnome-keyring)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-}