Added missing dependency on x11-libs/qt-svg (needed to render themes) as reported by Paweł Plicner. Remove old.

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

4 files changed, 13 insertions, 218 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index d7df78544bdf..55b96dd9a8d9 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,11 @@
 # 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.107 2011/07/13 21:00:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.108 2011/07/17 17:39:15 reavertm Exp $
+
+  17 Jul 2011; Maciej Mrozowski <reavertm@gentoo.org> -kadu-0.9.1-r1.ebuild,
+  kadu-0.9.2.ebuild:
+  Added missing dependency on x11-libs/qt-svg (needed to render themes) as
+  reported by Paweł Plicner. Remove old.
 
   13 Jul 2011; Markus Meier <maekke@gentoo.org> kadu-0.9.2.ebuild:
   x86 stable, bug #372455
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 7ce8ac70ba97..98a4c79ad2e4 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -4,17 +4,15 @@ Hash: SHA1
 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.6.5.4.tar.bz2 1774602 RMD160 5656b87e02952e6d47159996c86919d5d16973e4 SHA1 afd5b7d6c1568a3db03328d58d5ba6506dfa410f SHA256 9decd7b9de6d91095b4f6b47bebbbbc5ca56b9ba6e8f6ee80d8ad172ba676d25
-DIST kadu-0.9.1.tar.bz2 6467509 RMD160 2b83beea9c2408ae42d6d133dc69dca0c018faaa SHA1 dc754a412365a14976a5c4956aacf547e0c524b1 SHA256 bd760d46685a79bf84e8c8f250e62af34a9bc60dc12d2b2b7cf917e5dbc0be37
 DIST kadu-0.9.2.tar.bz2 6436856 RMD160 2d1bf5ba24032c5bbdc3e664c80e96f7d4782b23 SHA1 012a36a1c8d0fcc157475d7b3ffe37094aeb2c4c SHA256 0b8cbd7cc2b313faf7792baed699a94478f5288f3a0b03c9dea83725eae99716
 EBUILD kadu-0.6.5.4.ebuild 5156 RMD160 be80321ce958631fddafce129875361d97089872 SHA1 e43377d6a2ca8269ea25b1ff45425de6c26088b3 SHA256 48fa8fbaa0990bebe3e7e02619a0f14d1d3bef5fed1a05ad5da9e2275e9b25a6
-EBUILD kadu-0.9.1-r1.ebuild 5643 RMD160 577cf636943dfcf15c0e6c6166060c406b8d69d6 SHA1 22ac4fd99581c52cfe4d641b3bc18c005d821f40 SHA256 eb3e7de1845d95cf93499867cd9ff713689fa58e503947542a539edec92066e4
-EBUILD kadu-0.9.2.ebuild 5508 RMD160 a23a353888e1d9cd3cc291498773c86200388ac7 SHA1 70a6cc32590a725e2d586841fc310a9c549435ac SHA256 42085ec3c7db42e0063aeb8f1a5108b47e6433f28a71220612709ed57cfd0361
-MISC ChangeLog 15804 RMD160 e82bfb9bd67e957f9cfb7ee62781da085bfe7d90 SHA1 0524905b2aca5463783a468a888dd0b8a95119ce SHA256 36f06f9b6cb228b878c91ed0dd02534f80d3280b03a193c57a37ca866fb67c18
+EBUILD kadu-0.9.2.ebuild 5535 RMD160 9f931edf21dee9a84a5c9bdaaf7cc0a45e53a826 SHA1 442279b4b826e37519b8775b5af00f9b5a8aade3 SHA256 db5e915286b21107e23dad68a8c43e03d3b1627ef2e079b188f84992f7a6c676
+MISC ChangeLog 16022 RMD160 fd3935d463ee0980e147db850386153777753d67 SHA1 4c17dceb5ac7534c07f3e940b380a396fbff3a84 SHA256 362bc9ee27c63de52d03186cca28c85632a1fbfe095a361e20631e55216cd30d
 MISC metadata.xml 662 RMD160 ba957000702ae65a1db860904344047ef52f6800 SHA1 874612b87290c369bfcb7ad7922d2496881882b9 SHA256 398900459ab65852271cd7f6d486b90b9e54c6f758c273ef7ce86c8f67374a79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4eB6UACgkQkKaRLQcq0GJB7wCghyf6MBoirVOqbVYaMFSSFK3P
-ZBUAoLATAq6+zjMxfMJI3oFf4G5LVppB
-=dNUq
+iEYEARECAAYFAk4jHjIACgkQFuHa/bHpVdtaUgCffrDC3Ksq9LO4H9mlGdvbc0vC
+H14AnRIZQ95CjzLqRdWkhY5ePlBx5Qja
+=z7qF
 -----END PGP SIGNATURE-----
diff --git a/net-im/kadu/kadu-0.9.1-r1.ebuild b/net-im/kadu/kadu-0.9.1-r1.ebuild
deleted file mode 100644
index 75ad81e047df..000000000000
--- a/net-im/kadu/kadu-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,209 +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.9.1-r1.ebuild,v 1.5 2011/05/27 09:04:27 phajdan.jr Exp $
-
-EAPI="4"
-
-inherit base cmake-utils flag-o-matic
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client."
-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"
-#dbus tlen
-IUSE="alsa ao +gadu kde phonon speech spell +ssl xmpp"
-#tlen
-REQUIRED_USE="
-	|| (
-		gadu
-		xmpp
-	)
-"
-
-#tlen tlen? ( net-dns/libidn )
-COMMON_DEPEND="
-	>=app-crypt/qca-2.0.0-r2
-	>=media-libs/libsndfile-1.0
-	>=net-libs/libgadu-1.9.0[threads]
-	x11-libs/libXScrnSaver
-	>=x11-libs/qt-dbus-4.4:4
-	>=x11-libs/qt-gui-4.4:4[qt3support]
-	>=x11-libs/qt-sql-4.4:4[sqlite]
-	>=x11-libs/qt-webkit-4.4:4
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	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 )
-	xmpp? ( net-dns/libidn )
-"
-DEPEND="${COMMON_DEPEND}
-	xmpp? ( dev-util/automoc )
-	x11-proto/scrnsaverproto
-"
-RDEPEND="${COMMON_DEPEND}
-	speech? ( app-accessibility/powiedz )
-	ssl? ( app-crypt/qca-ossl:2 )
-"
-
-# 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
-
-	# Filter-out -Werror, bug #363843
-	sed -e 's/-Werror//g' -i CMakeLists.txt \
-		|| die
-
-	# 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
-	# BLACKLISTED config_enable module_advanced_userlist 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_desktop_docking m
-	config_enable module_docking m
-	# BLACKLISTED 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_firewall m
-	config_enable module_hints m
-	config_enable module_history m
-	config_enable module_idle m
-	config_enable module_imagelink m
-	config_enable module_last_seen m
-	config_enable module_parser_extender m
-	config_enable module_pcspeaker m
-	config_enable module_qt4_docking m
-	config_enable module_qt4_docking_notify m
-	config_enable module_screenshot m
-	config_enable module_simpleview m
-	config_enable module_single_window m
-	config_enable module_sms m
-	config_enable module_sound m
-	# BLACKLISTED config_enable module_split_messages m
-	config_enable module_sql_history m
-	config_enable module_tabs m
-	# BLACKLISTED config_enable module_weather m
-	config_enable module_word_fix m
-
-	# Autodownloaded modules
-	# config_enable module_anonymous_check m
-	# config_enable module_globalhotkeys m
-	# config_enable module_lednotify m
-	# config_enable module_mime_tex m
-	# config_enable module_nextinfo m
-	# config_enable module_panelkadu m
-	# config_enable module_senthistory m
-
-	# Protocols
-	if use gadu; then
-		config_enable module_gadu_protocol m
-		config_enable module_server_monitor m
-		config_enable module_history_migration m
-		config_enable module_profiles_import m
-	fi
-	use xmpp && config_enable module_jabber_protocol m
-	# BLACKLISTED use tlen && config_enable module_tlen_protocol m
-
-	# Audio outputs
-	use alsa && config_enable module_alsa_sound m
-	use ao && config_enable module_ao_sound m
-	# BLACKLISTED use oss && config_enable module_dsp_sound m
-	use phonon && config_enable module_phonon_sound m
-
-	# Misc stuff
-	# BLACKLISTED if use dbus; then
-		# dbus interface for Kadu
-		# BLACKLISTED config_enable module_dbus m
-	# BLACKLISTED fi
-
-	# 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
-
-	use kde && config_enable module_kde_notify m
-	use speech && config_enable module_speech m
-	use spell && config_enable module_spellchecker m
-	if use ssl; then
-		config_enable module_encryption_ng m
-		config_enable module_encryption_ng_simlite m
-	fi
-
-	# Icons
-	config_enable icons_default y
-	config_enable icons_glass y
-	config_enable icons_oxygen y
-	# Uncomment when available
-	# config_enable icons_tango y
-
-	# Emoticons
-	config_enable emoticons_penguins y
-	config_enable emoticons_tango y
-	# Uncomment when available
-	# config_enable emoticons_gg6_compatible 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
-	local mycmakeargs=(
-		-DBUILD_DESCRIPTION='Gentoo Linux'
-		-DENABLE_AUTODOWNLOAD=OFF
-		$(cmake-utils_use_with spell ENCHANT)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-im/kadu/kadu-0.9.2.ebuild b/net-im/kadu/kadu-0.9.2.ebuild
index 95fec8048602..f5292afd6daa 100644
--- a/net-im/kadu/kadu-0.9.2.ebuild
+++ b/net-im/kadu/kadu-0.9.2.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.9.2.ebuild,v 1.3 2011/07/13 21:00:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.9.2.ebuild,v 1.4 2011/07/17 17:39:15 reavertm Exp $
 
 EAPI="4"
 
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 	>=x11-libs/qt-dbus-4.4:4
 	>=x11-libs/qt-gui-4.4:4[qt3support]
 	>=x11-libs/qt-sql-4.4:4[sqlite]
+	>=x11-libs/qt-svg-4.4:4
 	>=x11-libs/qt-webkit-4.4:4
 	alsa? ( media-libs/alsa-lib )
 	ao? ( media-libs/libao )