Drop old ebuild still using 'jabber' instead of 'xmpp' USE (#216300)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 5 insertions, 259 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 895db018685f..de0cf5da7f19 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/qutim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.38 2015/05/16 11:00:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.39 2015/06/02 18:58:23 pacho Exp $
+
+  02 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  -files/qutim-0.3.1-cmake-2.8.12-qt-build.patch, -qutim-0.3.1-r1.ebuild:
+  Drop old ebuild still using 'jabber' instead of 'xmpp' USE (#216300)
 
   16 May 2015; Pacho Ramos <pacho@gentoo.org> qutim-0.3.2.ebuild:
   Rename jabber to xmpp USE (#216300)
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
deleted file mode 100644
index cda262a906a4..000000000000
--- a/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-qt-build.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-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/qutim-0.3.1-r1.ebuild b/net-im/qutim/qutim-0.3.1-r1.ebuild
deleted file mode 100644
index b4388b2b2a23..000000000000
--- a/net-im/qutim/qutim-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 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-r1.ebuild,v 1.4 2015/02/22 18:41:22 mgorny Exp $
-
-EAPI=5
-
-LANGS="ar be bg cs de en_GB ru sk uk zh_CN"
-
-inherit qt4-r2 cmake-utils
-
-DESCRIPTION="Qt4-based multi-protocol instant messenger"
-HOMEPAGE="http://www.qutim.org"
-SRC_URI="http://www.qutim.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aspell awn ayatana crypt dbus debug doc histman hunspell irc jabber kde kinetic mrim
-	multimedia oscar otr phonon purple qml sdl +ssl vkontakte webkit +xscreensaver"
-
-REQUIRED_USE="
-	oscar? ( ssl )
-"
-
-# Minimum Qt version required
-QT_PV="4.7.0:4"
-
-CDEPEND="
-	x11-libs/libqxt
-	>=dev-qt/qtcore-${QT_PV}[ssl?]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	aspell? ( app-text/aspell )
-	awn? ( >=dev-qt/qtdbus-${QT_PV} )
-	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
-	crypt? ( app-crypt/qca:2[qt4(+)] )
-	dbus? ( >=dev-qt/qtdbus-${QT_PV} )
-	debug? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	histman? ( >=dev-qt/qtsql-${QT_PV} )
-	hunspell? ( app-text/hunspell )
-	jabber? (
-		app-crypt/qca:2[qt4(+)]
-		>=net-libs/jreen-1.1.0
-	)
-	kde? ( kde-base/kdelibs:4 )
-	kinetic? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	oscar? ( app-crypt/qca:2[qt4(+)] )
-	otr? (
-		>=net-libs/libotr-3.2.0
-		<net-libs/libotr-4.0.0
-	)
-	phonon? (
-		kde? ( media-libs/phonon[qt4] )
-		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
-	)
-	purple? ( net-im/pidgin )
-	qml? (
-		>=dev-qt/qtdeclarative-${QT_PV}
-		>=dev-qt/qtopengl-${QT_PV}
-	)
-	sdl? ( media-libs/sdl-mixer )
-	vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( dev-util/automoc )
-"
-RDEPEND="${CDEPEND}
-	jabber? ( app-crypt/qca:2[gpg] )
-	oscar? ( app-crypt/qca:2[openssl] )
-"
-
-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
-
-	# fix automagic dep on libXScrnSaver
-	if ! use xscreensaver; then
-		sed -i -e '/XSS xscrnsaver/d' \
-			core/src/corelayers/idledetector/CMakeLists.txt || die
-	fi
-
-	# remove unwanted translations
-	local lang
-	for lang in ${LANGS}; do
-		use linguas_${lang} || rm -f translations/modules/*/${lang}.{po,ts}
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_JREEN=ON
-		$(cmake-utils_use_with doc DOXYGEN)
-		$(cmake-utils_use doc QUTIM_GENERATE_DOCS)
-		# plugins
-		$(cmake-utils_use aspell ASPELLER)
-		$(cmake-utils_use awn)
-		$(cmake-utils_use ayatana INDICATOR)
-		$(cmake-utils_use crypt AESCRYPTO)
-		$(cmake-utils_use dbus DBUSAPI)
-		$(cmake-utils_use dbus DBUSNOTIFICATIONS)
-		$(cmake-utils_use dbus NOWPLAYING)
-		$(cmake-utils_use debug LOGGER)
-		$(cmake-utils_use histman)
-		$(cmake-utils_use hunspell HUNSPELLER)
-		$(cmake-utils_use kde KDEINTEGRATION)
-		$(cmake-utils_use kinetic KINETICPOPUPS)
-		$(cmake-utils_use multimedia MULTIMEDIABACKEND)
-		$(cmake-utils_use otr OFFTHERECORD)
-		$(cmake-utils_use phonon PHONONSOUND)
-		$(cmake-utils_use qml QMLCHAT)
-		$(cmake-utils_use sdl SDLSOUND)
-		$(cmake-utils_use webkit ADIUMWEBVIEW)
-		-DHAIKUNOTIFICATIONS=OFF
-		-DUNITYLAUNCHER=OFF
-		-DUPDATER=OFF
-		# protocols
-		$(cmake-utils_use irc)
-		$(cmake-utils_use jabber)
-		$(cmake-utils_use mrim)
-		$(cmake-utils_use oscar)
-		$(cmake-utils_use purple QUETZAL)
-		$(cmake-utils_use vkontakte)
-	)
-	cmake-utils_src_configure
-}