qca-ossl is mandatory, bug 386469. Remove old

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

5 files changed, 20 insertions, 238 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index aced5629e0d9..dcf59930d9de 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/kadu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.112 2011/10/18 17:15:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.113 2011/10/18 20:42:39 reavertm Exp $
+
+  18 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org> -kadu-0.6.5.4.ebuild,
+  -files/kadu-0.6.5.4-glibc211.patch, kadu-0.10.0-r1.ebuild:
+  qca-ossl is mandatory, bug 386469. Remove old
 
   18 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> kadu-0.9.2.ebuild:
   ppc stable wrt #372455
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 319ff5d2bc05..cd3efb058e68 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,33 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX kadu-0.10.0-cmake.patch 6629 RMD160 6c539996d78c14ee5fcea9594dd0581c2030395a SHA1 cd462e486690463a1fbb892fc3536d8ccbe944f8 SHA256 6756eb78fb220e5796a35602ef8c30df70d5b2a816c2ee792591be6c75e45df2
 AUX kadu-0.10.0-sdk-cmake.patch 2020 RMD160 8f1d1ccc94e4466145ee6d087464745f61b35ced SHA1 8773ff5b3c733a0232480d7ab6411d7db03597d8 SHA256 54bea8d50b4670a3d7b5453158e8039e00647dab0c13ff36e11de9e94d594ad2
-AUX kadu-0.6.5.4-glibc211.patch 376 RMD160 e7d71e8592553cdc83994692c4592c4ed04e7820 SHA1 b56f37160e5eb2a0a67af787b7a8d059f67c01aa SHA256 8b971a5706593c59e20e777321509682850fae45cd885b4e46eb61da17db7b0f
 AUX libgsm-ugly-code.patch 314 RMD160 5c613b7b4eb261d1116fcbd76a6c46b0cc0c3bb3 SHA1 b008af1a900b135b28530fc49a2be11b318f269b SHA256 17c671fe35813ae9b8c72ca7c3563a22a0894e15ddc02aba0a6f56b00e20bad2
 DIST kadu-0.10.0.tar.bz2 5713074 RMD160 fa521ae2eef3bb969a0edce021dcdf84ecfea2c0 SHA1 1150f86bee44383094ac2ca39c6e714f6082193d SHA256 25a510dd3a89ec07b463d934afe3cab46f7762cd3acc7c0dda15ff6d3cea2d0d
-DIST kadu-0.6.5.4.tar.bz2 1774602 RMD160 5656b87e02952e6d47159996c86919d5d16973e4 SHA1 afd5b7d6c1568a3db03328d58d5ba6506dfa410f SHA256 9decd7b9de6d91095b4f6b47bebbbbc5ca56b9ba6e8f6ee80d8ad172ba676d25
 DIST kadu-0.9.2.tar.bz2 6436856 RMD160 2d1bf5ba24032c5bbdc3e664c80e96f7d4782b23 SHA1 012a36a1c8d0fcc157475d7b3ffe37094aeb2c4c SHA256 0b8cbd7cc2b313faf7792baed699a94478f5288f3a0b03c9dea83725eae99716
-EBUILD kadu-0.10.0-r1.ebuild 2748 RMD160 6c2853968f2ef846ea35ffe4edad4356eb943b07 SHA1 b6a93e6918a357ca617f7e96fe81efc12ac3520b SHA256 6861e737eb5e9f5e6b208488e79decb20a8700b6c10ce902c45e6b938fa801b7
+EBUILD kadu-0.10.0-r1.ebuild 2697 RMD160 ece1086a7aa28ca13d1d44d9d7e82948f3514815 SHA1 7a391e880323f0e7aed37603a288328b1cc9df2e SHA256 6d1865ce4dec576d932f141cd6782842bd0eab6ac95d53d1163b7f71e64942a3
 EBUILD kadu-0.10.0.ebuild 2759 RMD160 556036f23a39da783fb8afe26967519e815b9b9f SHA1 25209f6c7de53426bcdcfdbc4db9aefc4c895a97 SHA256 ec590d08018878b7afcdff2cc378095fbd51179a001e528e3ba8ca37873661dd
-EBUILD kadu-0.6.5.4.ebuild 5156 RMD160 be80321ce958631fddafce129875361d97089872 SHA1 e43377d6a2ca8269ea25b1ff45425de6c26088b3 SHA256 48fa8fbaa0990bebe3e7e02619a0f14d1d3bef5fed1a05ad5da9e2275e9b25a6
 EBUILD kadu-0.9.2.ebuild 5536 RMD160 0406918683da105709f9bd88c9332ae7b7cd1fdf SHA1 ef66f076324029745af2c869f622a55c444938e9 SHA256 9025561f1ea2663ba3a4c914f9b8242fd8c6f6a33717a090c0879c372a96070b
-MISC ChangeLog 16730 RMD160 03514a29022907b4a83fa952cc71375fa88a9bff SHA1 855b81c214e528861eec9647e169ba01973c2f61 SHA256 6c5bea06b4917c9291a186caa22684cc5ea12ef2c6cd2bfe0d7ffb6bc28c2616
+MISC ChangeLog 16914 RMD160 95cb5fc2e284fd54f2fb662ac0e6e97add546139 SHA1 6f8dc9c3d691725b52b59606cff1ba47605157b5 SHA256 16fb9b8b9ff3a1377869616f05195789bf569fe71cd2db288c1dfd6552b349ed
 MISC metadata.xml 658 RMD160 04f2dbd3c2c84b07ffe8359550ce30181ccec699 SHA1 5ff2de27121716eccaac6ba0727736f8e8510961 SHA256 cc87f9b34df5f514bd5e9a4d94c32436baec1f5f47a86d8f4058da6dbb542911
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOnbQkAAoJEF0huFKJUZL53iwP/1hhcSs7B7jxLYgGlE++tKgD
-ijM5UFP85uAZee+ahOMjn+HT2GhsnC7C88mZ+/V6H5f+mvpQ7MhiPT3J/32ZISeg
-3l+oB4fKjGLQUwdrnCkWKHEHUWa5mimml/ZS5nqBc9NW3mH80uWSHaUm/AXGA/p7
-jUc1/RaO67VroLEU0x2J0adhn8+YzvwmOW91eALRvmOqLlYnLz0JHI6d3yNr8pc0
-Zheym7bYsjpMlZ2+HJy6FcDPry/KJGVebpDTV4y4QI5FnOIqotj6XzWqvp2k23f1
-AN3kKJj9afMACws+u+GO4Oq2AcfnBN7l6HN2MCijCHnDyZi5JwfINOGdKcbg2T49
-/SOvMxuPasndyDitxVQ7LL832ClSAxAa6Wn/uOVKW5ffG55tuUPgH9rnaxwDbx7I
-ViuX7zTeBkQ6AxjQJDTF8a80PwjuA5IzBE5h+EBwdi/6KsHB7b+Qfkcv1gyHw8uu
-OmdaQ+gl5Q7yCaAPa0DtMC2+PKofu9jQi9N6zGfLcxdeGLzdTY6vb+bAA1wVchAb
-nH160aI2iMJSek1j8+uewp/DM+TeUDrPMXDsR4V9kslmFaEOUMPUA3B7TRfsIuaT
-zpmbDJq/34N+vabDjLHbvjV809AeUpGUcl3/UmQp6GeRfK/2yrUXqPjbWTLjFCpO
-ho21avco4X5U1M3ttcTh
-=qC22
+iEYEARECAAYFAk6d5MMACgkQFuHa/bHpVdvjSwCfUwmh/n66sWuVW7D4wJNOB52+
+4cwAoMh+EUATm2uklE1MyCHEdU3r7/R2
+=kNYJ
 -----END PGP SIGNATURE-----
diff --git a/net-im/kadu/files/kadu-0.6.5.4-glibc211.patch b/net-im/kadu/files/kadu-0.6.5.4-glibc211.patch
deleted file mode 100644
index ad65bc5202f3..000000000000
--- a/net-im/kadu/files/kadu-0.6.5.4-glibc211.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru ../kadu/kadu-core/main.cpp ./kadu-core/main.cpp
---- ../kadu/kadu-core/main.cpp	2010-01-17 22:37:09.000000000 +0100
-+++ ./kadu-core/main.cpp	2010-09-12 20:45:41.600774558 +0200
-@@ -20,7 +20,7 @@
- #include <winsock2.h>
- #include <windows.h>
- #endif
--#ifdef Q_OS_BSD4
-+#if defined(Q_OS_BSD4) || defined(Q_OS_LINUX)
- #include <sys/types.h>
- #include <sys/stat.h>
- #endif
diff --git a/net-im/kadu/kadu-0.10.0-r1.ebuild b/net-im/kadu/kadu-0.10.0-r1.ebuild
index abeb0bc2755f..df4beb6d995f 100644
--- a/net-im/kadu/kadu-0.10.0-r1.ebuild
+++ b/net-im/kadu/kadu-0.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.10.0-r1.ebuild,v 1.2 2011/10/02 18:43:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.10.0-r1.ebuild,v 1.3 2011/10/18 20:42:39 reavertm Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.kadu.im/stable/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
-IUSE="+gadu phonon sdk speech spell +ssl xmpp"
+IUSE="+gadu phonon sdk speech spell xmpp"
 REQUIRED_USE="
 	|| (
 		gadu
@@ -52,8 +52,8 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/scrnsaverproto
 "
 RDEPEND="${COMMON_DEPEND}
+	app-crypt/qca-ossl:2
 	speech? ( app-accessibility/powiedz )
-	ssl? ( app-crypt/qca-ossl:2 )
 "
 
 PATCHES=(
@@ -62,11 +62,11 @@ PATCHES=(
 )
 
 PLUGINS='amarok1_mediaplayer antistring auto_hide autoaway autoresponder
-autostatus cenzor chat_notify config_wizard desktop_docking docking exec_notify
-ext_sound falf_mediaplayer filedesc firewall freedesktop_notify hints history
-idle imagelink last_seen mediaplayer mprisplayer_mediaplayer pcspeaker qt4_docking
-qt4_docking_notify screenshot simpleview single_window sms sound sql_history tabs
-word_fix'
+autostatus cenzor chat_notify config_wizard desktop_docking docking
+encryption_ng encryption_ng_simlite exec_notify ext_sound falf_mediaplayer
+filedesc firewall freedesktop_notify hints history idle imagelink last_seen
+mediaplayer mprisplayer_mediaplayer pcspeaker qt4_docking qt4_docking_notify
+screenshot simpleview single_window sms sound sql_history tabs word_fix'
 
 src_configure() {
 	# Filter out dangerous flags
@@ -86,10 +86,6 @@ src_configure() {
 	use speech && PLUGINS+=' speech'
 	use spell && PLUGINS+=' spellchecker'
 
-	if use ssl; then
-		PLUGINS+=' encryption_ng encryption_ng_simlite'
-	fi
-
 	# COMPILE_PLUGINS isn't the most flexible..
 	local compile_plugins=
 	for plugin in ${PLUGINS}; do
diff --git a/net-im/kadu/kadu-0.6.5.4.ebuild b/net-im/kadu/kadu-0.6.5.4.ebuild
deleted file mode 100644
index 99f04d8afd16..000000000000
--- a/net-im/kadu/kadu-0.6.5.4.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.5.4.ebuild,v 1.6 2011/03/26 16:13:44 dilfridge Exp $
-
-EAPI="2"
-
-inherit base cmake-utils flag-o-matic
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="QT client for popular in Poland Gadu-Gadu instant messaging network"
-HOMEPAGE="http://www.kadu.net"
-SRC_URI="http://www.kadu.net/download/stable/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE="alsa ao dbus kde oss phonon speech spell +ssl"
-
-COMMON_DEPEND="
-	>=app-crypt/qca-2.0.0-r2
-	>=media-libs/libsndfile-1.0
-	>=net-libs/libgadu-1.9_rc2[threads]
-	x11-libs/libXScrnSaver
-	>=x11-libs/qt-gui-4.4:4[qt3support]
-	>=x11-libs/qt-webkit-4.4:4
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	dbus? ( >=x11-libs/qt-dbus-4.4:4 )
-	kde? ( >=kde-base/kdelibs-4.3.3 )
-	phonon? (
-		!kde? (
-			|| (
-				>=x11-libs/qt-phonon-4.4:4
-				media-libs/phonon
-			)
-		)
-		kde? ( media-libs/phonon )
-	)
-	spell? ( app-text/enchant )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/scrnsaverproto
-"
-RDEPEND="${COMMON_DEPEND}
-	speech? ( app-accessibility/powiedz )
-	ssl? ( app-crypt/qca-ossl:2 )
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}/libgsm-ugly-code.patch"
-	"${FILESDIR}/${P}-glibc211.patch"
-)
-
-# set given .config variable to =m or =y
-# args: <variable> <m/y>
-config_enable() {
-	sed -i -e "s/^\(${1}=\)./\1${2}/" .config || die "config_enable failed"
-}
-
-src_prepare() {
-	# Autopatcher
-	base_src_prepare
-
-	# Create .config file with all variables defaulted to =n
-	sed -i -n -e "s/=\(m\|y\)/=n/" -e "/^[a-z]/p" .config \
-		|| die ".config creation failed"
-
-	# Common modules
-	config_enable module_account_management m
-	config_enable module_advanced_userlist m
-	config_enable module_agent m
-	config_enable module_antistring m
-	config_enable module_auto_hide m
-	config_enable module_autoaway m
-	config_enable module_autoresponder m
-	config_enable module_autostatus m
-	config_enable module_cenzor m
-	config_enable module_config_wizard m
-	config_enable module_dcc m
-	config_enable module_default_sms m
-	config_enable module_desktop_docking m
-	config_enable module_docking m
-	config_enable module_echo m
-	config_enable module_exec_notify m
-	config_enable module_ext_sound m
-	config_enable module_filedesc m
-	config_enable module_filtering m
-	config_enable module_firewall m
-	config_enable module_gg_avatars m
-	config_enable module_hints m
-	config_enable module_history m
-	config_enable module_idle m
-	config_enable module_last_seen m
-	config_enable module_notify m
-	config_enable module_parser_extender m
-	config_enable module_pcspeaker m
-	config_enable module_powerkadu m
-	config_enable module_profiles m
-	config_enable module_qt4_docking m
-	config_enable module_qt4_docking_notify m
-	config_enable module_screenshot m
-	config_enable module_single_window m
-	config_enable module_sms m
-	config_enable module_sound m
-	config_enable module_split_messages m
-	config_enable module_voice m
-	config_enable module_weather m
-	config_enable module_window_notify m
-	config_enable module_word_fix m
-
-	# Autodownloaded modules
-	config_enable module_nextinfo m
-	config_enable module_tabs m
-	config_enable module_plus_pl_sms m
-
-	if use dbus; then
-		# Media players - no build time deps so build them all
-		# bmpx_mediaplayer
-		config_enable module_mediaplayer m
-		# amarok1_mediaplayer m
-		config_enable module_amarok2_mediaplayer m
-		config_enable module_audacious_mediaplayer m
-		config_enable module_dragon_mediaplayer m
-		config_enable module_mpris_mediaplayer m
-		# falf_mediaplayer
-		# itunes_mediaplayer
-		config_enable module_vlc_mediaplayer m
-		# xmms2_mediaplayer
-		# xmms_mediaplayer
-
-		# dbus interface for Kadu
-		config_enable module_dbus m
-
-		# Autodownloaded module
-		use kde && config_enable module_kde_notify m
-	fi
-
-	# Audio outputs
-	use alsa && config_enable module_alsa_sound m
-	use ao && config_enable module_ao_sound m
-	use oss && config_enable module_dsp_sound m
-	use phonon && config_enable module_phonon_sound m
-
-	# Misc stuff
-	use speech && config_enable module_speech m
-	use spell && config_enable module_spellchecker m
-	use ssl && config_enable module_encryption m
-
-	# Icons
-	config_enable icons_default y
-	# Uncomment when available
-	# config_enable icons_glass16 y
-	# config_enable icons_glass22 y
-	# config_enable icons_kadu05 y
-	# config_enable icons_oxygen16 y
-	# config_enable icons_tango16 y
-
-	# Emoticons
-	config_enable emoticons_penguins y
-	# Uncomment when available
-	# config_enable emoticons_gg6_compatible y
-	# config_enable emoticons_tango y
-
-	# Sound themes
-	config_enable sound_default y
-	# Uncomment when available
-	# config_enable sound_bns y
-	# config_enable sound_drums y
-	# config_enable sound_florkus y
-	# config_enable sound_michalsrodek y
-	# config_enable sound_percussion y
-	# config_enable sound_ultr y
-}
-
-src_configure() {
-	# Filter out dangerous flags
-	filter-flags -fno-rtti
-	strip-unsupported-flags
-
-	# Ensure -DQT_NO_DEBUG is added
-	append-cppflags -DQT_NO_DEBUG
-
-	# Configure package
-	mycmakeargs="${mycmakeargs}
-		-DBUILD_DESCRIPTION='Gentoo Linux'
-		-DENABLE_AUTODOWNLOAD=ON
-	"
-
-	cmake-utils_src_configure
-}