Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

5 files changed, 77 insertions, 21 deletions

diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog
index b991882857df..e40a3933d896 100644
--- a/net-libs/telepathy-qt/ChangeLog
+++ b/net-libs/telepathy-qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/telepathy-qt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.39 2015/05/15 13:25:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.40 2015/06/16 01:16:53 pesa Exp $
+
+*telepathy-qt-0.9.6.1 (16 Jun 2015)
+
+  16 Jun 2015; Davide Pesavento <pesa@gentoo.org>
+  +files/0.9.6.1-default-source.patch, +files/0.9.6.1-yes-release.patch,
+  +telepathy-qt-0.9.6.1.ebuild, -telepathy-qt-0.9.6.ebuild:
+  Version bump.
 
 *telepathy-qt-0.9.6 (15 May 2015)
 
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 5444898aea9f..80e8102d659e 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.9.6.1-default-source.patch 834 SHA256 f45fdbd96f872063d62180a254c11fd78af179c5fa77ac286ba6504092696098 SHA512 f95052bc2d71f25a629746613e68963f90be6c7ae3adec4b63e18604ec8ee0261107638688e18dd18432a33f74348f7a248f79b1aa4f1916843b6599036ca51f WHIRLPOOL e1475f564ffb20eb20abdbb5ef03deeff20ed17652a88ec641bf14ac9f9b135a0119101fa481f60167861d838ca3b68bb109e7148506e2ca5286d0260bcc0bbb
+AUX 0.9.6.1-yes-release.patch 578 SHA256 9ff91927a01d1d34060f42463c2b64bc280d7babab2a8cf80601f0d55d5547f3 SHA512 c0c3e3e6b698aa5410d33653f36a1dac044054fa03830f1c78c1a1d82aa74e24ef84d4ccfc8b3ce295e655f2618aa318c863b8b49303097d5774e789efb4cc80 WHIRLPOOL b20bf88549fc3d5ebf0d99d7f50fce0bfae9f07b35b56cf79b9f61f989a183e758d0c345ec73fe9916f08c1857cee736c2856a17cd42dd0e764c9617cc50dcf0
 DIST telepathy-qt-0.9.5.tar.gz 5862803 SHA256 93474858efe55bf45ee9352f88b852d4a24505939dc81a3a3c6fa5a686809c8e SHA512 2cc141037fbd2cc993f16e2ba52b3f6dda7841ff150f9d40d9e659eafdee67dd23563662954247f46bd8a34db7d87b7ec770da90725a19f634cd396a2d74e34b WHIRLPOOL cfef1a61725d0e07b65995155def64120d7d6993772511971eb7c8f7bcd956ed462544afbf52559cf2d5cc1825aeb1ce1f17371700d5a5e7f540b69da38d0709
-DIST telepathy-qt-0.9.6.tar.gz 6066461 SHA256 0c57dd7bf7adcf24e6c60f1f52d22b159c17b30257ac61214baf74560ad0f048 SHA512 77ce011e427d079be5bada46f266c9fc1d206e4a9e3f3bd8cc5a42c88283fce3465cf70e3e5432846a73cfa693902f675d6b47ee3fa0f8dbc6548f72976f0cbc WHIRLPOOL ae2edaf53b4c7e7f7a7816ca300213a696bd68ccbb3cf09d4e2a89655b98e3c83bde73acb4386a2a51cde955b7f298816079be431ed0c7406b70173a39aaa5c3
+DIST telepathy-qt-0.9.6.1.tar.gz 6067468 SHA256 496eb4951ea9b181d7d68a2122a885474c4f73b519319496aa1b97d9b361a1f8 SHA512 d15bdf94ef2b546270130012e8636fb2801b0c4fb50513ac0dbc0e1f6255d84da6df12195b3d26dc6df5a9466929a1073e87d2a9e600c7bf26c3e1aa112113b7 WHIRLPOOL 621137fc10ce3db1d834711aaf876adf98056a5ca8bab22c011e881e71522060cd6110733880db4f6646872501b870305d3590428ea3d809b4b512bbc21e653b
 EBUILD telepathy-qt-0.9.5.ebuild 2062 SHA256 2277ef0704962f4c8a8aa8d56b14bb9ece5d676b36a0d1b2b4ba919f7a5ebecc SHA512 6ddda7266089951245844e9b8a0e1fe3165abddeff2b77af29a165c1252c630e5250195edbc9c19f0ef68646500a0820522f6a3a116c91cb5b872ea03a83b16c WHIRLPOOL 7672d6a4349f289c99deb537f0c718bc468f1a3bacfa64805d6397754ce7a46c9ad09e3dff854e9a619285ce6c2feff0bc720eefe718243a61dbe86ba445ced3
-EBUILD telepathy-qt-0.9.6.ebuild 2066 SHA256 3cbab782d6a316e335a402857123eb724bd89c1735a374cc6f561e85883617db SHA512 bcda9659989fa1a6d40b02f5e5e1833168fa06c59efabcf579bd173a9ef5ee4188ea5c7b007008bc7aa3cfcca8831f4f61ea0ce393d32d2566dafff7d4484175 WHIRLPOOL 50c894dd7367b022f7ee8861b26608c8f4ee6972b4d008b735e7c63b691054043cea4550cab8cf7d115d096273ad919ae0d650a1c7e89009178b221551616235
-MISC ChangeLog 7989 SHA256 f05c570ddef2a2283af018c6e9359e2b06bf0ad6169c7edee51bc38208540b15 SHA512 4d1b18852ef60d0fd8b45559fc4b32cd36380250c407a6a84141ff8596443b575ed42a538c98ef93b1f087408cd24d244e21880c53847182e259f1b9e42fdf9c WHIRLPOOL fe0f57734e7dd2a87527498ac1ad0c0c0995ff4dd9a7dcec4e96733efb0f8a7e4a3cdcb37e6c4e62474d7831f6f1c122b5326a4cf2265278222636476748c4c7
+EBUILD telepathy-qt-0.9.6.1.ebuild 2131 SHA256 6068f0c8e4ce9b3276c8ffd0fd0ec826f53fdaaf679607360b9af4c8658fe58d SHA512 8a7db8b2144687df1d5eba8702a636d11c15330110e27520febd28a0faaef90a6416a19368163a0672f300ce5bbfdb0a1beb8e648f0a755d669fef00b187b6af WHIRLPOOL b9431267e7ad3e4bc15204aef6705225ef83a218d65b803ac332dcc890d0db3ffc66364170b66773075e21d67c6611f506fb66b2253b9227b9e9da3b551d7d28
+MISC ChangeLog 8224 SHA256 092aaefc81e46cd5ea9b7b1300d4d85934f4092e47684de533d35791d2b839f1 SHA512 f0c238dd82dec9d5a8a488ad03578264789a8002d9ef7a69ed570ff1e03d43f4d05a8c7625caa23e64b2586a7a3dea89404deb1e0ccf81a7062d98950f13e3d1 WHIRLPOOL 25752e3762e455d480e3e517fc981cc03f767291e401c4b2b7a818f6a13d9f5e6254dd6f0a01dc6ca03ce2c06ebdfe534777de80a710a31656f759e8534a1b97
 MISC metadata.xml 272 SHA256 b1a0e608561c47e26b774c17f9118677de0d6b6dfd4897d65e08f6e063507f8e SHA512 66e6bb81db3c838e6a94dfb614c9b2075c3055fdf8f0d7254d104276b8385ee9bc2dbb27e543db4fa58958485c0d250f5963c5d77257d5398be1603974e9c2e9 WHIRLPOOL e9a05ecba5716465fa88e392aeeb0c9d0b2f9e3ced219d0487718d08685dbd1057e25b27ce3a881b4d17c80168e259631d9508a8ee1cb2ee7813a5a5673913f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVVfO1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOUgAP/3d1FJ80SM7Ty4k3KbyC2vkW
-gBAQvsi2WG21iaTsl7szttClurGhuKTWEH+oli+41e6B3nCFrZD0c70g/5mw2gle
-S3PHX/O1SjLsWcfryJ3aHJJEM3dozKf5k1mHgaA9ANDUTkWy+UdCUipjE1mCXbTk
-Dh+UqEdIpJaXu4rnWc1QzgDzenlDvOknIzC2YVuvEk5syuY+7JmRF/1HJk4iM37e
-JloXDgAi7ODpJQz2SYBxjtaYe4WxKyeZGwfUkehQvHb86NHYzloCYjK0lj16RvMK
-2JYBIuI6s2BIHsZp1JspXC5eMAjD1S/KTre3NUxQDOVcdzIc7QMoNuGyIzOk8aab
-DgIXAwlmVxKM5OEtcuuBpLeaDR50o8ooDyIXpuajp6ziPjbaSDZ195kllIAleyO2
-QhCqMC3vaXetPE98XMBk6gNF5hEC6jo3ruL4qwgMCIHCDytykuKftlpXr2g/UO0O
-M73yBQCr9heol5aPr3dYn9Fw4BAxI85pW7XemnjZMvwB1zBvvLIYF1cgr1/ah7+v
-JaNuXruo4UoUJ3/GI+XumAXAXTTMPMYlw+Ha9oZcymQmdeWOLfcjz5FSmqHbVTBv
-wvkGdpDfr9ALol/hzM5mmB8Elgo8Q8hXpTXOVyqmu9UCnlSvZQQu6TSaF22ghvUm
-R+evVZd1ZhJ7dZRO5xpD
-=QPez
+iQJ8BAEBCABmBQJVf3kGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9jOEP+wXrIC1pQFWRQiw/v2Ik4esn
+0+qWJVrni/3nHrICjCh56ueHQR95COrMsXixhZKcikI0MyUJ59LUC040xuWgNyv2
+CUBZdhO78DebG2/whDpeLE9098U7ZrXIOIno3wZ9o7Fc10fi6QDf6Fd4Thx8NAkc
+XDTXhQj5RNzaLmg/AyYYCcrfPLUpo+eVWtWrEd/melDUOZKpa4uzOtt+hLybsU9p
+SyW6pBohrj/X7D2Sh2jc6Ik+pCcrnq3ykGSjUT1jIvvtrrmX8GdFJhKYpTRoV0Hk
+7TjLqhfvBT3o5GqMPZLiB9kx6pUcGFlMQD/Xf64Nlc8u7nsBhh3LnQjPPdJbJk63
+ijKWJOdlVWm3LxypQslTGn+7ryl8Xt9E1eTdGkaqUI4MIPl237t6TpvN3J+6ZcjW
+cxVz3JUHYxRHJj4hN0k31rwot/jmfsyug/y/m7OM7SBLomZckztq4YmmDhKiekmZ
+i9bpJUY3e8yJczH1cWFWSfgOleFyqfA981ks6Vvemx9S4ftsuJ/7OdkkIcmI1QM9
+M7/K94zmb6ubjWRwu+M1JuEZaI2UGi7LH32IUD6i7ZDWsSSwvFUxaowNVvbJ3gD8
+lJNN33WSEe9RsLur9UdrUgY2rjWvNNbQEjB3dLypD7rI6cj29wf2XRWS2Gw30Oni
+ARsGrEqKofZmZggs/dx7
+=OkEC
 -----END PGP SIGNATURE-----
diff --git a/net-libs/telepathy-qt/files/0.9.6.1-default-source.patch b/net-libs/telepathy-qt/files/0.9.6.1-default-source.patch
new file mode 100644
index 000000000000..0366b0fa7f37
--- /dev/null
+++ b/net-libs/telepathy-qt/files/0.9.6.1-default-source.patch
@@ -0,0 +1,25 @@
+From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001
+From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
+Date: Fri, 5 Jun 2015 12:47:13 +0200
+Subject: CMake: Fixed deprecated _BSD_SOURCE.
+
+Since glibc-2.20 _DEFAULT_SOURCE definition is also required.
+
+Reviewed-by: Alexandr Akulich
+
+diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
+index d34b24d..dc98697 100644
+--- a/cmake/modules/TelepathyDefaults.cmake
++++ b/cmake/modules/TelepathyDefaults.cmake
+@@ -108,7 +108,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+     endif(${NOT_RELEASE} EQUAL 1)
+ 
+     if(CMAKE_SYSTEM_NAME MATCHES Linux)
+-        add_definitions(-D_BSD_SOURCE)
++        add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE)
+     endif(CMAKE_SYSTEM_NAME MATCHES Linux)
+ 
+     # Compiler coverage
+-- 
+cgit v0.10.2
+
diff --git a/net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch b/net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch
new file mode 100644
index 000000000000..97a880c72ca7
--- /dev/null
+++ b/net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch
@@ -0,0 +1,17 @@
+diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
+index d34b24d..eb51454 100644
+--- a/cmake/modules/TelepathyDefaults.cmake
++++ b/cmake/modules/TelepathyDefaults.cmake
+@@ -59,11 +59,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+         set(DEPRECATED_DECLARATIONS_FLAGS)
+     endif (CXX_DEPRECATED_DECLARATIONS)
+ 
+-    if(${TP_QT_NANO_VERSION} EQUAL 0)
+-        set(NOT_RELEASE 0)
+-    else(${TP_QT_NANO_VERSION} EQUAL 0)
+-        set(NOT_RELEASE 1)
+-    endif(${TP_QT_NANO_VERSION} EQUAL 0)
++    set(NOT_RELEASE 0)
+ 
+     set(desired
+         all
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
index 00255a063fff..5c262cca06b7 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.6.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.6.ebuild,v 1.1 2015/05/15 13:25:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild,v 1.1 2015/06/16 01:16:53 pesa Exp $
 
 EAPI=5
 
@@ -50,8 +50,14 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
+PATCHES=(
+	"${FILESDIR}/${PV}-default-source.patch"
+	"${FILESDIR}/${PV}-yes-release.patch"
+)
+
 pkg_setup() {
 	python-any-r1_pkg_setup
+
 	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
@@ -62,7 +68,6 @@ src_configure() {
 			$(cmake-utils_use_enable farstream)
 			$(cmake-utils_use_enable test TESTS)
 			-DENABLE_EXAMPLES=OFF
-			-ENABLE_SERVICE_SUPPORT=ON
 		)
 		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
 			mycmakeargs+=(-DDESIRED_QT_VERSION=4)