Revision bump: EAPI 5, fix bug #506614, patches by Alexander Golubev <fatzer2 AT gmail.com>, who will maintain this package through proxy maintainers. Drop old revision, drop qt herd from metadata

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

6 files changed, 196 insertions, 7 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index bfb995d9187d..d45f81f16600 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/qutim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.28 2014/08/05 18:34:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.29 2014/11/06 11:47:38 pinkbyte Exp $
+
+*qutim-0.3.1-r1 (06 Nov 2014)
+
+  06 Nov 2014; Sergey Popov <pinkbyte@gentoo.org> -qutim-0.3.1.ebuild,
+  +qutim-0.3.1-r1.ebuild, +files/qutim-0.3.1-cmake-2.8.12-kde-build.patch,
+  +files/qutim-0.3.1-cmake-2.8.12-qt-build.patch, metadata.xml:
+  Revision bump: EAPI 5, fix bug #506614, patches by Alexander Golubev <fatzer2
+  AT gmail.com>, who will maintain this package through proxy maintainers. Drop
+  old revision, drop qt herd from metadata
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> qutim-0.3.1.ebuild:
   Remove trailing '.' from DESCRIPTION.
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
index cdf41eb7d119..184aa4ff0c70 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX qutim-0.3.1-cmake-2.8.12-kde-build.patch 677 SHA256 5ab5117780d5260ed6be8a2853637196ac12f296b71dd2f7afbcc6d548d3d394 SHA512 e8a020d185cd776e6af614d2431c39358844c57f63fb7135ea76fd0cac7a98595b843053e9683dd1d4b7ccf56fe43f007233d0c8483a47e431029485831b8dc4 WHIRLPOOL 83a9867f348cf3a57d244b7084c696b39d31550dc934d0d242b876fccce86f3b757bb1343395cc8dd0a19fc7d4296858d94d9aa782aeb9afdf0e6bf40375e40c
+AUX qutim-0.3.1-cmake-2.8.12-qt-build.patch 4506 SHA256 c9354118436e71c978c0fca535342d0a682c87a124ec0055a2a547aae0abe58b SHA512 1750775dddb9ece43704f11cb76f00fe7fd750710ad5a27a27a1e45f6e244ec352e4714b5b47727fff27720b3f70e983fbca649f671498153f1ef1662c6cbfb0 WHIRLPOOL 555bf3c86232fbb9ff4cbb44138d9e326dca6751f1dcc74130ccef7c13212edccbeab3ba6a4e7ea6547ffd4a6ffd377746700b2a4ad08910f4fa76721d44d9f4
 DIST qutim-0.3.1.tar.bz2 12056208 SHA256 a85f2bbb1d8010ee5506b0e82185a21a950d2fa36f72373a192070859e4944e1 SHA512 c3902aad605596bca943a2de706dcf1c35a0cf55df1309d8d0a7a4950a5900bc60829d6a785e408cbb66f21ba6ac3e5315d8d5140eed476ebee3bcb94cd3bc57 WHIRLPOOL 06a04a87f7cf24cf9440d263c835bb3273336838f9a927fc0debccec44861e057b5c97e5ab24d6f89c42edca6f183023396116fd0f5a32d04abfc01fdb27222a
-EBUILD qutim-0.3.1.ebuild 3463 SHA256 93dfda56ac6a1b3fc847a776b9fdb4e4b8f9c7b095dfdb107a58a36a1b72aaa3 SHA512 85eaaf2d9eae644118a91ac06061e416b9b51e32498b1b81d0ace7ea54cb82ef8f0fd3f71fda2935f11eb90013e44e227d90c9ba09b500bfd76de0a2154012b0 WHIRLPOOL c133d63e1ab8326bee22234510741eb277d46c27ae1962bcad2759d0b484c9ec748654c09d4ad66b21cb0c55574fc4266d2d8196b2c618016e7274eb0c3da3f5
-MISC ChangeLog 4591 SHA256 37b855a39b545562f1dace8a3819623d91c39c33dff14d41d22e3997e5af68d8 SHA512 b85841a9895f30ce6b1599fdf6c8fe715723d8a3ce4a5e10357962156225f41daa402d78a74e4709a3947b878bc45629b8f2606e5f59c2534a9292096095c26a WHIRLPOOL d71499cbe990e728eb9a66a2fa9292623e3a2baa6cc9562f5bfb9326d2dcb5caa697f0e6ef4615a35c5a8b80bd262c43462fc9f8ace5e582a995ef3cb960c27d
-MISC metadata.xml 1474 SHA256 5bfc5560fe34969064925760b4785afd49d4276662ecb4bb6058c17928da0b1f SHA512 cedaef032e4aab5c70a23686715a766d990ff64e8436f8c31ffa281b72c7d9fde50ffd36046ef0a044d58bab4721337bd3acbb59bb3cc6771ebccf306e7efa94 WHIRLPOOL 24fee0e7b13fe6eff82220ac091a2bafe44812122636ef6054bc633a4fc7a320d77c1636b190378f480703d3fcad7669bcc913676fbf66b81a2705c3c101d689
+EBUILD qutim-0.3.1-r1.ebuild 3588 SHA256 340fe50cf6c097675611b4d32631e6fdc596f0c52df84da02e5b4a839270ea5e SHA512 78d44f08be5bd78e916bd424ed1b3cef0fcd09c13ec1fcbb7e2136dacec1d71fd6c232bbb2a04f1b165695f2e43ee71ec3d3b1f052f6fdd5d2f5cb1510277f3f WHIRLPOOL 2d1a7cfb07b16aeed342f2dad79f13231ce174eec1a93197fddb8366739438f30bd5f9e0b8dc4a039c651de49b0906e554779b16590158db8cd0734580290fe6
+MISC ChangeLog 5039 SHA256 49df81c6bf2320ba80fba0ca818d40b8addd41b7b4e533996e3c6210606b5118 SHA512 d53cd91747c7a95648615e099817b2e19a42f8126e23b6ff53fc6f72c90ae93fad03afb55cfa77f147f88fe7b2ec26ec64384f9a05b5a5b3b24a6ad3c58d687e WHIRLPOOL f4d69078342ebbb46d166af0099d3dcb54d88987924df000c6685eae279f57ae0d28bf63ee683cf0bede66cfb7a83bbe4290e02d9c97bef2f0c9b34f7a449bbc
+MISC metadata.xml 1838 SHA256 dd864d15a95d6c78c41c259ab196a114f526fc46ce2d215824e749d2b0ebfeb7 SHA512 3ae8e8995bb9c0678f3de928472759f400e466c341b6e00bab12f14a9ed9b9faa56de5f46703c09d908d8f5871ff2845ede8d51bce4f5877c27e7252dda3f835 WHIRLPOOL 856c3c432bb61823bc5b3a8434643ae7b594aed9e55fb5cbdef7c2e08dd68d8475123ddf19c51edca2b785ca68776ac9cb59db5ccd9eaa85eb52ca4c5d7cc9e0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUW1/aAAoJECo/aRed9267P2EIAIi5RtX+oPB0SuNwZ69rU/aG
+2qsYhRKH/SzHc7oFz82rM6uc9BLlrlMelwmCAS/bIWwZ01VNsHctmDLYUp9HTznC
+JrJoO1fZclmQ56LgI1n0Q6kQ/vIWIXaWvDrXYYQVcz21UL0xPB71JtCb2XI98TaE
+dObWdGFdDu4Cdz0uS7i0a5ftKvk46PoLDHwRmu4z1jAFf+yEksnSqIIQLz0NJbH/
+e2POVzIhhkmhA5qD+pRilFYq0IcdoYQoZo7XBvoTrNQq9PZa+tVgP/F7Pm+CCJ7s
+RO+cHbt+wxrDCRYpRjZaY/HE/PqiYATyerVL8jQCNQH0YyTaGXELk/ZOab2edt4=
+=1mtE
+-----END PGP SIGNATURE-----
diff --git a/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-kde-build.patch b/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-kde-build.patch
new file mode 100644
index 000000000000..f32379662417
--- /dev/null
+++ b/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-kde-build.patch
@@ -0,0 +1,25 @@
+From 984d4af9568de9c54a44e4cf96cca76e0cea256a Mon Sep 17 00:00:00 2001
+From: Ruslan Nigmatullin <euroelessar@yandex.ru>
+Date: Mon, 24 Feb 2014 18:09:20 +0300
+Subject: [PATCH 2/2] Fixed compilation with the newest cmake
+
+---
+ plugins/kdeintegration/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/kdeintegration/CMakeLists.txt b/plugins/kdeintegration/CMakeLists.txt
+index 6f1a9f8..805ad80 100644
+--- a/plugins/kdeintegration/CMakeLists.txt
++++ b/plugins/kdeintegration/CMakeLists.txt
+@@ -8,6 +8,8 @@ endif()
+ 
+ include(KDE4Defaults)
+ 
++set(CMAKE_AUTOMOC true)
++
+ add_definitions( ${KDE4_DEFINITIONS} )
+ 
+ qutim_add_plugin(kdeintegration
+-- 
+2.0.4
+
diff --git a/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-qt-build.patch b/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-qt-build.patch
new file mode 100644
index 000000000000..cda262a906a4
--- /dev/null
+++ b/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-qt-build.patch
@@ -0,0 +1,121 @@
+From 3ef38bdfe771bfff0247c668c044405c0f1b4145 Mon Sep 17 00:00:00 2001
+From: Alexander Golubev <fatzer2@gmail.com>
+Date: Mon, 3 Nov 2014 03:21:44 +0300
+Subject: [PATCH 1/2] fix build with cmake-2.8.12 introduced changes in qt4
+ macroses
+
+---
+ core/cmake/QutIMMacros.cmake | 90 +++++++++++++++++++++++++-------------------
+ 1 file changed, 52 insertions(+), 38 deletions(-)
+
+diff --git a/core/cmake/QutIMMacros.cmake b/core/cmake/QutIMMacros.cmake
+index 588f464..41e961d 100644
+--- a/core/cmake/QutIMMacros.cmake
++++ b/core/cmake/QutIMMacros.cmake
+@@ -31,43 +31,57 @@ if(NOT CPACK_INCLUDED)
+ endif()
+ 
+ #TODO separate to external macro
+-MACRO(QUTIM_WRAP_CPP outfiles)
+-	# get include dirs
+-	QT4_GET_MOC_FLAGS(moc_flags)
+-	QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
+-
+-	FOREACH (it ${moc_files})
+-		GET_FILENAME_COMPONENT(_abs_FILE ${it} ABSOLUTE)
+-		GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
+-		GET_FILENAME_COMPONENT(_basename ${it} NAME_WE)
+-
+-		SET(_HAS_MOC false)
+-
+-		IF(EXISTS ${_abs_PATH}/${_basename}.cpp)
+-			SET(_header ${_abs_PATH}/${_basename}.cpp)
+-			FILE(READ ${_header} _contents)
+-			STRING(REGEX MATCHALL "# *include +[^ ]+\\.moc[\">]" _match "${_contents}")
+-			IF(_match)
+-				SET(_HAS_MOC true)
+-				FOREACH (_current_MOC_INC ${_match})
+-					STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
+-					SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
+-					QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "")
+-					MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
+-				ENDFOREACH (_current_MOC_INC)
+-			ENDIF()
+-		ENDIF()
+-		IF(NOT _HAS_MOC)
+-			FILE(READ ${_abs_FILE} _contents)
+-                        STRING(REGEX MATCHALL "Q_OBJECT|Q_GADGET" _match2 "${_contents}")
+-			IF(_match2)
+-				QT4_MAKE_OUTPUT_FILE(${_abs_FILE} moc_ cxx outfile)
+-				QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}")
+-				SET(${outfiles} ${${outfiles}} ${outfile})
+-			ENDIF()
+-		ENDIF()
+-	ENDFOREACH(it)
+-ENDMACRO (QUTIM_WRAP_CPP)
++macro(QUTIM_WRAP_CPP outfiles)
++	if(NOT CMAKE_AUTOMOC)
++		# get include dirs
++		qt4_get_moc_flags(moc_flags)
++		if(CMAKE_VERSION VERSION_LESS "2.8.12")
++			qt4_extract_options(moc_files moc_options ${ARGN})
++		else()
++			qt4_extract_options(moc_files moc_options moc_target ${ARGN})
++		endif()
++
++		foreach(it ${moc_files})
++			get_filename_component(_abs_file ${it} ABSOLUTE)
++			get_filename_component(_abs_PATH ${_abs_file} PATH)
++			get_filename_component(_basename ${it} NAME_WE)
++
++			set(_HAS_MOC false)
++
++			if(EXISTS ${_abs_PATH}/${_basename}.cpp)
++				set(_header ${_abs_PATH}/${_basename}.cpp)
++				file(READ ${_header} _contents)
++				string(REGEX MATCHALL "# *include +[^ ]+\\.moc[\">]" _match "${_contents}")
++				if(_match)
++					set(_HAS_MOC true)
++					foreach(_current_MOC_INC ${_match})
++						string(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
++						set(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
++						if(CMAKE_VERSION VERSION_LESS "2.8.12")
++							qt4_create_moc_command(${_abs_file} ${_moc} "${_moc_INCS}" "")
++						else()
++							qt4_create_moc_command(${_abs_file} ${_moc} "${_moc_INCS}" "${moc_options}" "${moc_target}")
++						endif()
++						macro_add_file_dependencies(${_abs_file} ${_moc})
++					endforeach (_current_MOC_INC)
++				endif()
++			endif()
++			if(NOT _HAS_MOC)
++				file(READ ${_abs_file} _contents)
++				string(REGEX MATCHALL "Q_OBJECT|Q_GADGET" _match2 "${_contents}")
++				if(_match2)
++					qt4_make_output_file(${_abs_file} moc_ cxx outfile)
++					if(CMAKE_VERSION VERSION_LESS "2.8.12")
++						qt4_create_moc_command(${_abs_file} ${outfile} "${moc_flags}" "${moc_options}")
++					else()
++						qt4_create_moc_command(${_abs_file} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
++					endif()
++					set(${outfiles} ${${outfiles}} ${outfile})
++				endif()
++			endif()
++		endforeach(it)
++	endif()
++endmacro(QUTIM_WRAP_CPP)
+ 
+ macro(QUTIM_ADD_ARTWORK_DIR art_dir)
+ 	FILE(GLOB ARTWORKS ${art_dir} "${art_dir}/*")
+@@ -331,7 +345,7 @@ QUTIM_EXPORT_PLUGIN(${plugin_name}Plugin)
+ #    set_target_properties( ${plugin_name} PROPERTIES COMPILE_FLAGS "-D${plugin_name}_MAKE" )
+ 	if( QUTIM_${plugin_name}_STATIC )
+ 	if( NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${plugin_name}helper.cpp" )
+-		file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/${plugin_name}helper.cpp"
++		file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/${plugin_name}helper.cpp" 
+ "#include <QtCore/QtPlugin>
+ 
+ Q_IMPORT_PLUGIN(${plugin_name})
+-- 
+2.0.4
+
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
index 6dbb0a00f6bc..68fc775ae7ba 100644
--- a/net-im/qutim/metadata.xml
+++ b/net-im/qutim/metadata.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+	<email>fatzer2@gmail.com</email>
+	<name>Alexander Golubev</name>
+	<description>Proxied maintainer. Assign bugs on him</description>
+</maintainer>
+<upstream>
+	<maintainer>
+		<email>euroelessar@yandex.ru</email>
+		<name>Ruslan Nigmatullin</name>
+	</maintainer>
+	<bugs-to>https://github.com/euroelessar/qutim/issues</bugs-to>
+</upstream>
+<herd>proxy-maintainers</herd>
 <use>
 	<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
 	<flag name="awn">Enable integration with <pkg>gnome-extra/avant-window-navigator</pkg></flag>
diff --git a/net-im/qutim/qutim-0.3.1.ebuild b/net-im/qutim/qutim-0.3.1-r1.ebuild
index 540e4d2edba4..ee7dea0177b0 100644
--- a/net-im/qutim/qutim-0.3.1.ebuild
+++ b/net-im/qutim/qutim-0.3.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1.ebuild,v 1.8 2014/04/02 16:09:09 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.1 2014/11/06 11:47:38 pinkbyte Exp $
 
-EAPI=4
+EAPI=5
 
 LANGS="ar be bg cs de en_GB ru sk uk zh_CN"
 
@@ -76,6 +76,12 @@ RDEPEND="${CDEPEND}
 
 DOCS=( AUTHORS ChangeLog )
 
+# bug #506614
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-2.8.12-qt-build.patch"
+	"${FILESDIR}/${P}-cmake-2.8.12-kde-build.patch"
+)
+
 src_prepare() {
 	cmake-utils_src_prepare