Stabilise 0.9.2 as it works. Punt older.

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

5 files changed, 22 insertions, 152 deletions

diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog
index 41aed7fd6441..20ad5b949847 100644
--- a/net-libs/telepathy-qt/ChangeLog
+++ b/net-libs/telepathy-qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/telepathy-qt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.12 2012/07/15 16:55:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.13 2012/07/31 07:08:47 scarabeus Exp $
+
+  31 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> -telepathy-qt-0.8.0.ebuild,
+  -telepathy-qt-0.9.1.ebuild, telepathy-qt-0.9.2.ebuild:
+  Stabilise 0.9.2 as it works. Punt older.
 
 *telepathy-qt-0.9.3 (15 Jul 2012)
 
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 7eb9972c66e7..d02b3d063f3f 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -4,24 +4,26 @@ Hash: SHA256
 AUX telepathy-qt-0.8.0-automagicness.patch 7516 SHA256 c37d92e8fe846a914a652c4db170ddbd5a9dd2f6899bc240cb89eed4797c182b SHA512 556a11aae6f65d1eec4599ab6c48b69ab5ee35cb13667a0559a4c4675a5b4e68e6519a8254f218b1eae917191818c75dea97c7aa8952cddf77834066dc97bbc7 WHIRLPOOL df31807c563ff0de48974e43164f3c14e8a5677d4630ac49669e7962ba783b55e00723d6cdb903c9b24fa7cfb7f25b987e5bb78286b594846f55c58c47f1b1e3
 AUX telepathy-qt-0.9.1-automagicness.patch 4801 SHA256 e1c931affeb6bd8b9118b605866c067f48bfc9ecc611c2bd92b9d37d627ba353 SHA512 66e341bac067e89a431c97047048fd36579f43662a2239fb8eb9ebbf878e2c0885a292102df31893f4f3096560a97b405559ea026f323c83c5e4acd3a4d50497 WHIRLPOOL a56cdbd39ac96707a650992e99c9bb334562e5859c430ab73fc3a308cb15ae5d62e4e945dd61a37dcf23dbfe75391b8e8511e2b0995c88afee53b16c2696a005
 AUX telepathy-qt-0.9.1-gcc-4.7.patch 2305 SHA256 034e0074c695c9334f26c865d3ab85e1e3bf6d580a80b2fd2947d99ceb7aece5 SHA512 225e75bfbbc993f2df0dc348e04995aaf305010e75a8a72b6612ddf9c42c01426661f783f3f2bb7b10967427757c27c2a98e0a8237511f59d31067ca21d365ba WHIRLPOOL e35580119d498b2582e139656fcc65d6ebb40211b927b9d75190dab3c72362621737013b0b07215130c0a350dff372c24e2ac18a33d698e9d23a8810dbf43d35
-DIST telepathy-qt-0.9.1.tar.gz 4624632 SHA256 d097b49a3912fed0e9ef0f295740b4002aedf2c1013cbdeb20d91063a6ec9e67 SHA512 87deb821edace88774d170045c99a6cc5bc5a803df7c02a8fddda6ca2d2a1c5a3f01dce3bb73832b9701c4291bee77513fc3b445e06113bfb3138bba5aa2b053 WHIRLPOOL cf58b866cf06dbe16d7eadbb3501e5404c2f510612d04a03118aded4f17dff50b277c8e54f40927b3ee45e4914afd02af45d89c990ff2b45b4d5c6b5f44e713f
 DIST telepathy-qt-0.9.2.tar.gz 4402089 SHA256 260b044680663c7057d700fd2bd1aafce2babe917063929777d169bdf9801d01 SHA512 8fcf55512d3733248763327dbf9d7a990cc4855ad3ee2b91c22e0266f80c989920d8622cfe2e77b546d33d5696d2562363b3f8271f538b5795aee43e660a4823 WHIRLPOOL 384e1543b1bbe8a439d5cb89fd5747a27ac3cdee1d479feb807c114edfe49afbf8f905a3fbe12f56d22ff2d54728e295a5a950bd6460fb727d5ee5a549fe7d70
 DIST telepathy-qt-0.9.3.tar.gz 4414599 SHA256 c0ff57bea79b86ad343e184c16941d05f6d6d7dfd03876b44502f11935f44bf9 SHA512 46e370c9a2b8ee486cd99e5226a0098e8d04d2db105434097d617eda106e9f6f70b7de349646f46480792ed374984b8d3adff28b6d18f6ef6c979d4282902cb2 WHIRLPOOL d0bd45a772782dfaf2362a42265ee55ef47e4c80279b88d5ab2e2ef30dc9dc40b8423ff80ef451a33dc782253e53af9594f60d6e3299dadd8b073671200f0ed2
-DIST telepathy-qt4-0.8.0.tar.gz 4014194 SHA256 e4a4dee2a2fb88bebfdac50ed7341b5c927b0411b4df93209cd9291915a0e1dc SHA512 3f4c9d17190abfb372d7ba43ca9de86ea91dad646d64047a16cd158503acf54a6fb1ae0942adf869c4ce32c7eb7a95523b4de6692db1ae0be0759a89b5f39453 WHIRLPOOL 25839d0903f5551f34733cbba07f751b9cedcafbc35fb5c6e9b2b79edaa4b4769d9c10db32f112d76364a5918a8c72c831a7d3a16542371eba416a67079abe28
-EBUILD telepathy-qt-0.8.0.ebuild 1542 SHA256 88a6fa655da838f23e60bd3683494b6fab2db4d731e624163762fe13a1d10d5b SHA512 f5ce856c49076866bcdf3627195e58f86f204cc7ae206e0eb6f7f1cb0b9effb91fc59728a60a16ea99d1d7314b40db576aaf98e7889c3a633bc4b01abebf7997 WHIRLPOOL 92530d6fd875d0243032cadefd13d37ac17ae16a631d0ebce8f8d905ccf5762e093023b0855d751e89bd85db855c6cd1ceb7e2fdf970835872b2d8d43a9a7128
-EBUILD telepathy-qt-0.9.1.ebuild 1448 SHA256 893b4c7d05ddf171853eb2bbcd0e33d2f658f3a381bd09159fc2d0163441c6b1 SHA512 18ef9fe91887dfa769453788af40b760515f5ab650b253c6642b14143008ed52d09066eba6d2519cc7f32f5c9f4847c36c0dd087c18ccb9e3e00a6d4f8065732 WHIRLPOOL ebe6bdb90e64b91d721bd8e73c68a4bdd440e117df5f34606863dd6d0ec3ee09348f43284446fd5747ed56351addb930a9c0227cfe0adb5e9e04c4ae57acf558
-EBUILD telepathy-qt-0.9.2.ebuild 1321 SHA256 8d13830fa08c9d2fc8906640bde8326763574b7614b4c882ca3fde0dddf55e84 SHA512 cc091978a440c5fa8542f11555c915e232484c82280cd901cf69db777803209a2b852a320b361566fbb766b131fac904cee13d7ce370a0fd24546ae19e875e81 WHIRLPOOL 37d19c6fa7d6cfeef591ed172da64a7f8f612737dfa49af76d73f2cbe8bc011dc24ffa52d38b18150e91cdddefa8b0a36b7111dedeadfa66edc6a9b5f1a44b0b
+EBUILD telepathy-qt-0.9.2.ebuild 1318 SHA256 67de9fc4d54d7a9243dd319616de17781af03bca14b3d5932fd0fbfe1beaa470 SHA512 38ef158dc7d5b12576cb8c730c0c614daf12f4d9e75047d8c824eec5539dcf4ecc902edf396ea9f35a88196302542fe9c593f69bb590d3e4f84ac1aecbadd3d7 WHIRLPOOL 9d9daec6ae16a44a9e845c3d902ca0114fd648554391b80b4a4bfea0a573cfbe35300cecf5ead6f9ef8007aa7a91978a4d559d56f574b02dcebdcc5868832fca
 EBUILD telepathy-qt-0.9.3.ebuild 1315 SHA256 c072ec630988edb9128c9e30633b17acacc7631177c6d2d727fc99f047dd78c6 SHA512 7df07d4df254c7a7da7684f209656fdc7af1a6aa47872e33489359a09353d2508b296b80f6734dfed9e2af2d59e34d438b885dbc85b1001cb111afbb584f0a72 WHIRLPOOL c222d074dc8e72f7916bccfff6f04e6233f9f5ac93099114fb08b0d9d762ab713abefac07651cb5252bb9414c8437f970ca71b2aa4111f9154f9b23b5827a9bc
-MISC ChangeLog 3799 SHA256 2d707433ec5ac176ae19e4045c8dcf3c30b1ab46db2982eec400857b2e963b8b SHA512 15b5b3959cd67b8a45dcf14ea665af2b7883624b7c71d4015a7ce9178dd040a6ae0f651df5c2db93535c8b3f986bbdd7cae0a8ff69823fa44ad6a24f506120cf WHIRLPOOL 50606c05e8d16b6dabc05e43e81579d9dee37f70eee10b1f951e9785e5c22daccd6773bc19e89244a34e6f91bc73bba5cc10db1566284c855c13e793066f20a1
+MISC ChangeLog 3988 SHA256 951211d8153f1e2b63cb6fe237e9b836817354645417543e98dc710f9a40fa3b SHA512 b026ebd8297cfa6f3cba2295f2aa67388838c89526ab29a56efe402a1c2a077392de9f8e7cf3250f8d3bb99141e0b768402e950a9cb5bd256a5762e85ac14494 WHIRLPOOL eea3e9703ea38b1fad01f42bef092e42848b09d18a7852726179657ebb85914c72d55feb7986481ba7f53bc3ad017b4a40eb1d4f83173c383d1767fe11afe7b0
 MISC metadata.xml 418 SHA256 4e95653da793f24fb505bbd1cc5a92debccf6876a9b285857e8e278c38916f5b SHA512 8a3449e2ef0e773d76957455a2965507f3a20e8bf938c92454294ff088e5a2a3d7085238387da91c8e76ade475b568d60f1f24a0f9362b55a9c2f934288c47ef WHIRLPOOL 443159e335ae534ec0e4d7a0cd80e7c1288f9eb397133d95966614007aaabae4832c1e591a683e3d53305bd770415db2030aa8985d2e47281a4a56eb3a89e121
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQAvYcAAoJEO+t9ga+3I3aqTwIAKY11QlzFTDbcwGV1y6A+HR8
-2v9TY/bW99isNSPQyr7bCXuN/d1SfZlspeyOhYgr29bBMRZShjupxEaKLP+KwqVd
-lRTT0BoDyQJRKEsTixhRh5Dd8hCHKfAm9YNsk+5gW6aaZ5XzS3D/H9c6fmSMHhFP
-Cyjl7LgjcNcLMCC4sP0jQp3lURd55ORE4ihB3NyJvOT4vBN0YJVe0qlPUle3fIuA
-c+2WB29dv1/02RrPCNEeWuFDmr1XIyX2xeJub820KZNKik7dE444Z0Y5KxkITJeH
-Shr/qVtMVD0a5FYi9UiO3e79fmgnUboXG/lEdlatuDPlTqKlkoPYK90VBmCyjAo=
-=q1TZ
+iQIcBAEBCAAGBQJQF4SHAAoJEOSiRoyO7jvoaBIQAJCu0vS7YJ+MgI668ky4JyeX
+7XTPfsp5wYnHRI5vPUeDTOP2jtrVWm66g9ynZfFygG05IwDFNHP3ODFZTx3/c/5B
+fLicXS3m7rod2r53anQ8KttMPilRmqCOC9jO00VLh7r10BT5OvbOqA/q75PncUdZ
+hGvwYj1hnUoN+zji5LJ+I2x0H8XWlRIZ8Cy0oPhGhZbPD8q5MhucpAE2dogOM6MP
+e6cDqZQKDBLrcI+0LNiVoDaX3YvL8PD8BQlHoBCgxSE4jh2kAChoeIKxsn2QbE6r
+xlC8BqmyeN9t01NSL01eJJOV4OPlZ9lSkNrIuvqJTdeaMEq0mUpOXSuFzMdJjC99
+fHqTX3QFury/ZmolsD8wGPzMgxY8AeYn6ccAC49bF6ZZlziADEgY/EPg3CxNypaP
+GGMjTrxElSVQacqoNsL1tVZVfmD6oxgHOw3KZ9KGiGQsOn3aH0SWBmsAbXMenA9p
+6McvM+0N3sFwkVq0aglUZKBPIEf9kLUQXR6htUVNxvH50OMqj4HbdRjDG5QDMCxd
+Qd6V3KOffSyJyW412kxVoyvK12/xDyh+lLXSY9pPLbHIi7JLf/2fSyxUrGiidyXT
+K/58BagrwXkBia+JbVQLxG34Ja2K07yIs877u7Ckjpo6jxVMSPW4o3oOyqwlQrj7
+XQQzPpw87EkFuMNC406N
+=eP8I
 -----END PGP SIGNATURE-----
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
deleted file mode 100644
index 6677d7780ea7..000000000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
+++ /dev/null
@@ -1,70 +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-qt/telepathy-qt-0.8.0.ebuild,v 1.6 2012/07/02 18:11:44 johu Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-MY_PN=${PN}4
-inherit python base cmake-utils
-
-DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="http://telepathy.freedesktop.org/"
-SRC_URI="http://telepathy.freedesktop.org/releases/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug farsight glib test"
-
-RESTRICT="test" #423089
-
-RDEPEND="
-	dev-python/dbus-python
-	x11-libs/qt-core:4[glib?]
-	x11-libs/qt-dbus:4
-	farsight? (
-		dev-libs/dbus-glib
-		dev-libs/libxml2
-		media-libs/gstreamer
-		>=net-libs/telepathy-glib-0.15.1
-		net-libs/telepathy-farsight
-	)
-	glib? ( dev-libs/glib:2 )
-	!net-libs/telepathy-qt4
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( x11-libs/qt-test:4 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-
-	sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die
-
-	if ! use test ; then
-		sed -i -e '/^add_subdirectory(tests)$/d' CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-		$(cmake-utils_use_with glib)
-		$(cmake-utils_use_with farsight)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.1.ebuild
deleted file mode 100644
index 6e30f3e67967..000000000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.1.ebuild
+++ /dev/null
@@ -1,66 +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-qt/telepathy-qt-0.9.1.ebuild,v 1.3 2012/06/21 10:14:04 kensington Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-inherit python base cmake-utils
-
-DESCRIPTION="Qt4 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="~amd64 ~x86"
-IUSE="debug farsight farstream test"
-
-RDEPEND="
-	x11-libs/qt-core:4
-	x11-libs/qt-dbus:4
-	farsight? (
-		net-libs/telepathy-farsight
-	)
-	farstream? (
-		>=net-libs/telepathy-farstream-0.2.2
-		>=net-libs/telepathy-glib-0.17.5
-	)
-	!net-libs/telepathy-qt4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	farsight? (
-		>=net-libs/telepathy-glib-0.17.5
-	)
-	test? (
-		dev-libs/dbus-glib
-		dev-libs/glib
-		dev-python/dbus-python
-		x11-libs/qt-test:4
-	)
-"
-
-REQUIRED_USE="farsight? ( !farstream )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-automagicness.patch"
-	"${FILESDIR}/${P}-gcc-4.7.patch"
-)
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with farsight)
-		$(cmake-utils_use_with farstream)
-		$(cmake-utils_use_enable debug DEBUG_OUTPUT)
-		$(cmake-utils_use_enable test)
-		-DENABLE_EXAMPLES=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild
index 4912f00f8de3..5b4144731f81 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.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-qt/telepathy-qt-0.9.2.ebuild,v 1.1 2012/07/12 11:01:26 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.2.ebuild,v 1.2 2012/07/31 07:08:47 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug farsight farstream test"
 
 RDEPEND="