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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

7 files changed, 84 insertions, 89 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/Manifest b/net-libs/telepathy-glib/Manifest
index 46e524ba6296..b81dbca7f296 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST telepathy-glib-0.16.5.tar.gz 3113658 SHA256 7d15d608ad5d960e3aa0bd9c76f6ead0008a5eb0fe1fa5bdc90f9dd913b48478 SHA512 f85224f528fe78b39d1b8f3a90bc80c593c6e13ac6f3b2c7aa5404e30acbc23e02e8c6d4804eaeadfa56993edcc2e2c0b67b545c6596bea6e7c22151ca9fda49 WHIRLPOOL 28b52106a5c679a4247de33bfc4b74e33e039a6768efe9c311b9f8cb78f762370df8f5460896ca3929a197db4ecd83814bfee683392451565060a271ece13585
 DIST telepathy-glib-0.18.1.tar.gz 3537671 SHA256 3738256689e34c22ddf9c4eb33f44ce7505c18fb1a14c53b8e56dd9c262f4c6d SHA512 a9897a86fe27310bd8d553e05b1d91efbb982fdf415dab13bd65250dbae53c503ca8ddc8458d7743786463212a48835b815a998cda196f6201365fbdeaf7d32d WHIRLPOOL 5f5d3c31f852f11d920dabcd85887192fe40c5e955e190a7f7d29366df4e0990a6c3b0bb112811b653b6de71f8a971587f4fcbce962dc2eff908fd58760b4554
 DIST telepathy-glib-0.18.2.tar.gz 3539165 SHA256 372375578be8053398f9fb1e12188a8b472d6d897e0ac73b230d31e112c68b3f SHA512 3f3d805c8c683596e92d60907dead975e378363d13a2c5b073e068809be24f0a07f433d952cf92a95fa29ced259b06334d69cad006d859f7c1f7bcc63added4d WHIRLPOOL 9f3ee0464e945f879917d0a490fe4e11073ab431835b1b5eb643a0ab8440bddfcabe0f7118b9b2574d7ca6f7de90c9066ec82f9e37e5d1376784f2fc9981879f
-EBUILD telepathy-glib-0.16.5.ebuild 1608 SHA256 22000423c0db9f10ade8aa510e9e34c2547e7d74485a713ff7a7bf863193a448 SHA512 2d9bc92fa38f9e86c3f761421f48399189a5efecb09b3e9e09947a7a9a2ec9c42003c82b72946f7e174612716b17ed9aefc3058de0498d3f49e9a632ab56a47a WHIRLPOOL a0233b5cbfc26d0138915d6dfc826bdded8c30d11f69148e74c3eee833c14d323c6edec96723fa3c34ce2c5d89f522e17b102bc3826a177dcadb08d8c6fbc935
-EBUILD telepathy-glib-0.18.1.ebuild 1610 SHA256 aa30e2726a132c25eb338ca87a9da359ba8fac0d14d0382cac07eea8c828f2f6 SHA512 8c6cb6645eded8ba6154aeaa3aad57079f2e2be4c9ffed4fffe748c0d1b8eb08e3d0760741b814eb7637b028e75ddf4dccb50bc18c7b689a06706fb43037794a WHIRLPOOL 28c5a74d49b50b471855b2bc94c6b41df3d53432bde2f2866bd9f3d638737c1cff562a42e789bfd148bbc369dd46812e83f129501450ceb8a54a1ac287d126e7
-EBUILD telepathy-glib-0.18.2.ebuild 1559 SHA256 485f530a4ae44eeaf9f646e17cff0ff02301bf02b3d5e4671ba0ec35b95cc6c9 SHA512 65c2deb3b5c1df4a2ff9b5732c7f2e2b52006f4713e90fddfbf3b9ff056c8137b8242a0cd2c547b7a6df200f0ce6659f5efb569ac5b04181efa9b4b17a4ce71f WHIRLPOOL 1a7074b5a9d7455a5c796044b33eb49caf7ebd4e64cd32b584f504c01160f3227b14d83eaab3b4b6ff8650c6986cc4d03457cdb11adbf73ad23b5e7d8fbbe05d
-MISC ChangeLog 19152 SHA256 45eb0315cfb11a66903a5b8948900ebcaac15a012ef3144b7affc8cf1203054c SHA512 d5a2b80c9034b57ec57226cc6be9d5a62e03d7ba90c60b01e9cf32df518ed98fe9bd0b5cdae8ddf3cff8a411fe80a65e01722d8fc6df051cc82912914fd467a3 WHIRLPOOL 9ec484fa313339f3f3bc80f83eaec888dffa5fa0dc2985c48adebbdfe29ac0aad2b19fc62316ffe723e9f5d50e8b1e01b0bdde2efd9d1be0bae6241d0d678747
-MISC metadata.xml 514 SHA256 490f0833fb21d4e784b15e8b2a090c7d487badc59ca7bef13cd2912a39b9118a SHA512 40b99f0c10ac293b2615bed0b8e50bffc45119589c7b1eaf1435e3fb2281702b4c2d8129c8d4c1ab10cf28c19a824b4718bd25857df7bb85e6093c1797f5acd2 WHIRLPOOL 4cc09e699c3c432323c0ce74e5f68bc22dfca2e1247d12eedcb4d8489707e735b0a87a790b780f28f2ab96033c0b1a7a06950159561631039efbd88f53429ef3
+DIST telepathy-glib-0.20.1.tar.gz 3755290 SHA256 01a0343f61fbd389fed9c819751aa75914150aa567472dcb480ced7f4ed261b6 SHA512 41407a40a6dc81cef17cbc4d5c558bd90ae6db57445acbb9fad2188b04b4ba95456232b9e1565336af271db0379b295a660af845cf6d535b3518e75577496bac WHIRLPOOL 9f875102d4553bcc2aa3f78c1901bed48f5eddf38cd1558c036c84cd8ff7eea6d7a116081fb9973b0fe9f1ebbf4fe558c627eb3e8f374ab4407e6cbadac459ee
+EBUILD telepathy-glib-0.18.1.ebuild 1595 SHA256 884b33079dda94a0dd4a2bde79d856d79c1ced961a057009bd0d191bf12d5358 SHA512 ec2fc4fc9aa3fed3b78d5f8c86b345069bce2f5526be6411e4318244f8cf8d2a0bae4940958df26334d864058cface77c6621c46f9d624af118a25e2b2c36de1 WHIRLPOOL 92a73680763298ce8affe9a30e21dd91504ab3118969f8a1e9c0d8a17e6df5aca44d9327919e354608121e2100304a181dcf7fa681253f14c1659af1ff0faa44
+EBUILD telepathy-glib-0.18.2.ebuild 1513 SHA256 ccb8d7dfc3319a29ead6f70532bf7de2e7b0277c52449f2325e5d844e7c7e544 SHA512 db3c63dfd60f68b0ca8a7334f8e3b2d9ed1551840d4fa72cba379076c50763f1127fef674d676bf65d06dbc0b2b14a9b03061f6e5eaf388a4fcc73b8dfc7da44 WHIRLPOOL 224545d406f0d0b37eb982eb806a83d0468135ee7b72e7e61cf883e95cee1bb8d4222a79f426d9783eb1f0991247d20647ecb943fb2a748f027501529c57a114
+EBUILD telepathy-glib-0.20.1-r1.ebuild 1476 SHA256 092bc1df9ff9c3f5561dce635cedc006ea534f239a9bd25f5a750f85ff1415ba SHA512 1d0ac9554e68acf8dc467e2d7c998bbc050649ff4a281b9e6e929a1cfe3747df1f7b6ecee6899aa33f563cafa889fd8439512d9a4d3f681711b89f90ea56caff WHIRLPOOL 6ae99bce65ddf7142c616358f52f94ade44fe645596d71dbcb09542749539821bcd6706cbdb8b00f5ffc4a1a09b775e2b145b5bd491b1c14c8bf6279bd6b2e3c
+MISC ChangeLog 19514 SHA256 3954797458ec16ccdcbc4c0ab57a67c34258a61d62231eb70ae2dae379cd937d SHA512 385625870f84efb7f46910820d215099edeff746cd20cebd705f69c5c049a5c7f6ca9a9bdaf0be7e0302337deb731168514249a1f45fbf8558d2cf28fba4deb3 WHIRLPOOL d6e5024bc4a5777d6053347fe82e952135bc125c14ffefe2622db2da951ec12dc2305da5a8bf4587b0706d98ba1858ffd47497cca45509fda1ebd2a0071198c2
+MISC metadata.xml 362 SHA256 93e64911531bed5fcd04bbdb4ed6eb97d9bf11b3d64c8fe88282ba32bb6e8b81 SHA512 2dde9d2033c304f7f59f0fbb3a3e9cd63137f66de994532d20c59401bd3364240b1154473a4a0bf64b8667c92f985019da1f91f92b591a789be3d19d7c3b2b3f WHIRLPOOL 2860a43b4f7b8bd14fd81f6c1bd6c5e6965fa112ad418dfebab512aa1e4aaaa6b32c31cb9d0dc3b0cfae97b858b9ec3fa77d224d327189836cb525b02a74de5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNXWcACgkQuQc30/atMkDDmgCglh/YID8zzXitOoQOOSG3oEcV
-XWIAnjWJ5iDZPsbF97rT75CF/DReLYyV
-=ousA
+iEYEAREIAAYFAlDU0MwACgkQ1fmVwcYIWAZayACgp8y0ahuK9CAVKrPzU0CP13MQ
+i/EAnR/+LSuslEWDg3858NeACs4ZZkMh
+=90bu
 -----END PGP SIGNATURE-----
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
+}