Version bump for Gnome 3.6. Switch to EAPI=5 and python-any-r1. Fix license and wrong call to default. Drop old revisions.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

6 files changed, 75 insertions, 80 deletions

diff --git a/net-libs/telepathy-glib/ChangeLog b/net-libs/telepathy-glib/ChangeLog
index e0e1e8742119..8b75dfeaec6b 100644
--- a/net-libs/telepathy-glib/ChangeLog
+++ b/net-libs/telepathy-glib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/telepathy-glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.123 2012/10/28 16:29:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.124 2012/12/21 21:12:43 eva Exp $
+
+*telepathy-glib-0.20.1-r1 (21 Dec 2012)
+
+  21 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -telepathy-glib-0.16.5.ebuild, telepathy-glib-0.18.1.ebuild,
+  telepathy-glib-0.18.2.ebuild, +telepathy-glib-0.20.1-r1.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5 and python-any-r1. Fix license
+  and wrong call to default. Drop old revisions.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> telepathy-glib-0.18.1.ebuild:
   ia64/sparc stable wrt #427544
diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml
index 1bef2fe27933..a34f24c057bb 100644
--- a/net-libs/telepathy-glib/metadata.xml
+++ b/net-libs/telepathy-glib/metadata.xml
@@ -7,12 +7,7 @@
 		<email>peper@gentoo.org</email>
 		<name>Piotr Jaroszyński</name>
 	</maintainer>
-	<longdescription lang="en">
-	</longdescription>
 	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
 </pkgmetadata>
-
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.16.5.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.16.5.ebuild
deleted file mode 100644
index 93fc71e1b34b..000000000000
--- a/net-libs/telepathy-glib/telepathy-glib-0.16.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.16.5.ebuild,v 1.8 2012/07/15 18:20:30 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-
-inherit python virtualx
-
-DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
-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 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux"
-IUSE="debug +introspection +vala"
-
-RDEPEND=">=dev-libs/glib-2.28.0:2
-	>=dev-libs/dbus-glib-0.82
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	vala? (
-		>=dev-lang/vala-0.14.0:0.14[vapigen]
-		>=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-src_prepare() {
-	python_convert_shebangs -r 2 examples tests tools
-	default_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	if use vala; then
-		myconf="--enable-introspection
-			VALAC=$(type -p valac-0.14)
-			VAPIGEN=$(type -p vapigen-0.14)"
-	fi
-
-	econf --disable-static \
-		PYTHON=$(PYTHON -2 -a) \
-		$(use_enable debug backtrace) \
-		$(use_enable debug handle-leak-debug) \
-		$(use_enable debug debug-cache) \
-		$(use_enable introspection) \
-		$(use_enable vala vala-bindings) \
-		${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Needs dbus for tests (auto-launched)
-	Xemake -j1 check
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild
index 6b782432795f..7c2b8fe48b98 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild,v 1.10 2012/10/28 16:29:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.1.ebuild,v 1.11 2012/12/21 21:12:43 eva Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -11,7 +11,7 @@ DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug +introspection +vala"
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	python_convert_shebangs -r 2 examples tests tools
-	default_src_prepare
+	default
 }
 
 src_configure() {
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
index 0c32bfcf6180..187b7e5df806 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild,v 1.2 2012/09/16 00:15:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild,v 1.3 2012/12/21 21:12:43 eva Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -13,7 +13,7 @@ DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug +introspection +vala"
@@ -30,20 +30,17 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	python_convert_shebangs -r 2 examples tests tools
 	use vala && vala_src_prepare
-	default_src_prepare
+	default
 }
 
 src_configure() {
-	local myconf
-
 	econf --disable-static \
 		--disable-installed-tests \
 		PYTHON=$(PYTHON -2 -a) \
 		$(use_enable debug backtrace) \
 		$(use_enable debug debug-cache) \
 		$(use_enable introspection) \
-		$(use_enable vala vala-bindings) \
-		${myconf}
+		$(use_enable vala vala-bindings)
 }
 
 src_test() {
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..517626943ffe
--- /dev/null
+++ b/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild,v 1.1 2012/12/21 21:12:43 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{5,6,7} )
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2-utils python-r1 vala virtualx
+
+DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
+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 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/dbus-glib-0.90
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	${PYTHON_DEPS}
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	python_export_best
+	econf --disable-static \
+		--disable-installed-tests \
+		$(use_enable debug backtrace) \
+		$(use_enable debug debug-cache) \
+		$(use_enable introspection) \
+		$(use_enable vala vala-bindings)
+}
+
+src_test() {
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Needs dbus for tests (auto-launched)
+	Xemake -j1 check
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}