[gentoo-commits] repo/gentoo:master commit in: net-im/vacuum/files/, net-im/vacuum/

[Andreas Sturmlechner]

commit:     4aedf2864bcb9cd62f4622c020aee103fc1e0dab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 10:12:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 10:13:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aedf286

net-im/vacuum: Drop old, Qt4-based version 1.2.5

Closes: https://bugs.gentoo.org/642538
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-im/vacuum/Manifest                             |  1 -
 .../vacuum-1.2.4-gcc6-not-string-literals.patch    | 51 --------------
 net-im/vacuum/vacuum-1.2.5.ebuild                  | 80 ----------------------
 3 files changed, 132 deletions(-)

diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
index e5af4287f2e..e78a2c99786 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -1,2 +1 @@
-DIST vacuum-1.2.5.tar.gz 2242073 BLAKE2B 3c326fa38422e99ecc1edaca51932dbb18a8cefdbc757f6b39099ec5af07a07094f3d961ec98c65eb9c4b5e4937d6c5a4d814095b8257b5a95e94c68077f9259 SHA512 85e36ed312beb59b667f376d45511f3c9414ba8165746cc1da15992eac4716995aa01da505a2f2dd58c8d64822f25c9106691be26a534e01a21f0201049300fc
 DIST vacuum-im-1.3.0.20180105-Alpha.tar.gz 2658247 BLAKE2B 823984f49687805c8e859984d6dfc9afcbdff864eef2f81825562dca11281286d5e736a986ed40e10bb915b7ee4f972dba10b073ea738cd8153f887c74b89f1b SHA512 83d830494c272145c3ad923ebb2897a8ab6323a301bdd0fc2b972f84b246e2de4eff29a93d92da97ed4deb6018c52e38e6fc5941c54722e1c37de207bca0c687

diff --git a/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch b/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch
deleted file mode 100644
index d936c76e61e..00000000000
--- a/net-im/vacuum/files/vacuum-1.2.4-gcc6-not-string-literals.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur vacuum-1.2.4.old/src/plugins/messagearchiver/messagearchiver.cpp vacuum-1.2.4/src/plugins/messagearchiver/messagearchiver.cpp
---- vacuum-1.2.4.old/src/plugins/messagearchiver/messagearchiver.cpp	2017-03-27 22:36:48.177650414 -0400
-+++ vacuum-1.2.4/src/plugins/messagearchiver/messagearchiver.cpp	2017-03-27 22:37:22.198212428 -0400
-@@ -9,8 +9,8 @@
- #define SESSIONS_FILE_NAME    "sessions.xml"
- 
- #define SHC_MESSAGE_BODY      "/message/body"
--#define SHC_PREFS             "/iq[@type='set']/pref[@xmlns="NS_ARCHIVE"]"
--#define SHC_PREFS_OLD         "/iq[@type='set']/pref[@xmlns="NS_ARCHIVE_OLD"]"
-+#define SHC_PREFS             "/iq[@type='set']/pref[@xmlns=" NS_ARCHIVE "]"
-+#define SHC_PREFS_OLD         "/iq[@type='set']/pref[@xmlns=" NS_ARCHIVE_OLD "]"
- 
- #define ADR_STREAM_JID        Action::DR_StreamJid
- #define ADR_CONTACT_JID       Action::DR_Parametr1
-diff -Naur vacuum-1.2.4.old/src/plugins/privacylists/privacylists.cpp vacuum-1.2.4/src/plugins/privacylists/privacylists.cpp
---- vacuum-1.2.4.old/src/plugins/privacylists/privacylists.cpp	2017-03-27 22:36:48.175650440 -0400
-+++ vacuum-1.2.4/src/plugins/privacylists/privacylists.cpp	2017-03-27 22:37:48.508882851 -0400
-@@ -1,7 +1,7 @@
- #include "privacylists.h"
- 
--#define SHC_PRIVACY         "/iq[@type='set']/query[@xmlns='"NS_JABBER_PRIVACY"']"
--#define SHC_ROSTER          "/iq/query[@xmlns='"NS_JABBER_ROSTER"']"
-+#define SHC_PRIVACY         "/iq[@type='set']/query[@xmlns='" NS_JABBER_PRIVACY "']"
-+#define SHC_ROSTER          "/iq/query[@xmlns='" NS_JABBER_ROSTER "']"
- 
- #define PRIVACY_TIMEOUT     60000
- #define AUTO_LISTS_TIMEOUT  2000
-diff -Naur vacuum-1.2.4.old/src/plugins/sessionnegotiation/sessionnegotiation.cpp vacuum-1.2.4/src/plugins/sessionnegotiation/sessionnegotiation.cpp
---- vacuum-1.2.4.old/src/plugins/sessionnegotiation/sessionnegotiation.cpp	2017-03-27 22:36:48.174650453 -0400
-+++ vacuum-1.2.4/src/plugins/sessionnegotiation/sessionnegotiation.cpp	2017-03-27 22:38:07.340651610 -0400
-@@ -4,7 +4,7 @@
- #include <QTextDocument>
- #include <QCryptographicHash>
- 
--#define SHC_STANZA_SESSION            "/message/feature[@xmlns='"NS_FEATURENEG"']"
-+#define SHC_STANZA_SESSION            "/message/feature[@xmlns='" NS_FEATURENEG "']"
- 
- #define SFP_DISCLOSURE                "disclosure"
- #define SFP_MULTISESSION              "multisession"
-diff -Naur vacuum-1.2.4.old/src/plugins/simplemessagestyle/simplemessagestyle.cpp vacuum-1.2.4/src/plugins/simplemessagestyle/simplemessagestyle.cpp
---- vacuum-1.2.4.old/src/plugins/simplemessagestyle/simplemessagestyle.cpp	2017-03-27 22:36:48.173650466 -0400
-+++ vacuum-1.2.4/src/plugins/simplemessagestyle/simplemessagestyle.cpp	2017-03-27 22:38:33.557335864 -0400
-@@ -15,7 +15,7 @@
- #include <utils/options.h>
- 
- #define SCROLL_TIMEOUT                      100
--#define SHARED_STYLE_PATH                   RESOURCES_DIR"/"RSR_STORAGE_SIMPLEMESSAGESTYLES"/"STORAGE_SHARED_DIR
-+#define SHARED_STYLE_PATH                   RESOURCES_DIR "/" RSR_STORAGE_SIMPLEMESSAGESTYLES "/" STORAGE_SHARED_DIR
- 
- static const char *SenderColors[] =  {
- 	"blue", "blueviolet", "brown", "cadetblue", "chocolate", "coral", "cornflowerblue", "crimson",

diff --git a/net-im/vacuum/vacuum-1.2.5.ebuild b/net-im/vacuum/vacuum-1.2.5.ebuild
deleted file mode 100644
index 497f62a4058..00000000000
--- a/net-im/vacuum/vacuum-1.2.5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}-im
-PLOCALES="de es pl ru uk"
-inherit cmake-utils l10n
-
-DESCRIPTION="Qt Crossplatform Jabber client"
-HOMEPAGE="https://code.google.com/p/vacuum-im"
-SRC_URI="https://github.com/Vacuum-IM/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/1.17" # subslot = libvacuumutils soname version
-KEYWORDS="~amd64 ~x86"
-PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver multiuserchat pepmanager privacylists privatestorage registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries )
-IUSE="${PLUGINS[@]/#/+}"
-
-REQUIRED_USE="
-	annotations? ( privatestorage )
-	avatars? ( vcard )
-	birthdayreminder? ( vcard )
-	bookmarks? ( privatestorage )
-	captchaforms? ( dataforms )
-	commands? ( dataforms )
-	datastreamsmanager? ( dataforms )
-	filemessagearchive? ( messagearchiver )
-	filestreamsmanager? ( datastreamsmanager )
-	filetransfer? ( filestreamsmanager datastreamsmanager )
-	pepmanager? ( servicediscovery )
-	registration? ( dataforms )
-	remotecontrol? ( commands dataforms )
-	servermessagearchive? ( messagearchiver )
-	sessionnegotiation? ( dataforms )
-"
-
-RDEPEND="
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtlockedfile[qt4(+)]
-	dev-libs/openssl:0
-	net-dns/libidn
-	sys-libs/zlib[minizip]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.4-gcc6-not-string-literals.patch )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# Force usage of system libraries
-	rm -rf src/thirdparty/{idn,minizip,zlib}
-
-	# CMP0022 warning
-	sed -e "/^cmake_minimum_required/s/2.8/2.8.12/" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="$(get_libdir)"
-		-DINSTALL_SDK=ON
-		-DLANGS="$(l10n_get_locales)"
-		-DINSTALL_DOCS=OFF
-		-DFORCE_BUNDLED_MINIZIP=OFF
-	)
-
-	local x
-	for x in ${PLUGINS[@]}; do
-		mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) )
-	done
-
-	cmake-utils_src_configure
-}