Version bump 0.9.2. Also remove duplicated server_monitor entry in 0.9.1

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

4 files changed, 219 insertions, 8 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 53708ea8aa0b..3195388f66db 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,12 @@
 # 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.101 2011/04/18 17:26:57 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.102 2011/05/19 16:08:13 reavertm Exp $
+
+*kadu-0.9.2 (19 May 2011)
+
+  19 May 2011; Maciej Mrozowski <reavertm@gentoo.org> kadu-0.9.1-r1.ebuild,
+  +kadu-0.9.2.ebuild:
+  Version bump 0.9.2. Also remove duplicated server_monitor entry in 0.9.1
 
   18 Apr 2011; Maciej Mrozowski <reavertm@gentoo.org> kadu-0.9.1-r1.ebuild:
   Remove hardcoded -Werror, bug 363843
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index cb9a3e5a15d6..1285aec314d0 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -5,14 +5,16 @@ AUX kadu-0.6.5.4-glibc211.patch 376 RMD160 e7d71e8592553cdc83994692c4592c4ed04e7
 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 5682 RMD160 4e317b45cc97ba3c0a1fb9e71edb76bddd600dd7 SHA1 861ad932bdd4aada625bb3047d511b1f3087b8b6 SHA256 0f6bccf2d29c90b410b508eb5a7a11802c68445cb7c8b81f16d12e0900286540
-MISC ChangeLog 15070 RMD160 7935cee1dc82f81870fdf989bf55d5d1c4f7f8ab SHA1 976a109b1115937b112bff1477b74baa1f4c05aa SHA256 7844f3c4330785b2f2130ea9bbc477e2a8e7281b495d2d5fa93e303e555e3f2b
+EBUILD kadu-0.9.1-r1.ebuild 5643 RMD160 149d4c5789e3b4704fc54cc82a793d3caf0fc79d SHA1 357c0f0648127219d6b85cd9973707e0c576ae28 SHA256 421f889a167b7b38bc6fdd78e44e4a13d357d132c4c0d91d17f247110ff4b3bd
+EBUILD kadu-0.9.2.ebuild 5512 RMD160 9383b31edb7d0e1605b706f39c6b91605bd7b485 SHA1 e8a488820e7e84e56c61e5f264a0ca1cfb491f64 SHA256 9906e1623cf393a3b1e0df5bfca29bea798fa84a81de34adaf9df4e4e3e44966
+MISC ChangeLog 15271 RMD160 3ab1e518e3f2aadf6ee15b6ca8fbee7fab883b30 SHA1 592904842e989083b2218562fa812bfe7c8c0dc4 SHA256 34eda3f6cbb3318b90830742ce1b68f99b5892c34a2e09d5952100e38ea9a876
 MISC metadata.xml 519 RMD160 a8ebb6634f0dd025728dadf6f463bfad2f1ca9ec SHA1 eb25fcb50e661e7783451e4912ee3d4ecaf2742f SHA256 124161bf1717078da406a9ea12f43dc80c29b4556c2b63665297d5223aef0eb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2sdGUACgkQFuHa/bHpVdv1LQCfTIz6uF9qrGZLM/FqHn6P9ypP
-He4AoJywcMv7GKkSHqzNolGNUZpoFBOd
-=Y1Lj
+iEYEARECAAYFAk3VQGkACgkQFuHa/bHpVdtn1wCfRnwvUmVFgvQ7ADHn+YfQkMdz
+NhYAn2uU3HKW01aXkCsor5U8BkzL8XOO
+=Y4tE
 -----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
index 3bd1d229bea1..6623958cb6af 100644
--- a/net-im/kadu/kadu-0.9.1-r1.ebuild
+++ b/net-im/kadu/kadu-0.9.1-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.9.1-r1.ebuild,v 1.2 2011/04/18 17:26:57 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.9.1-r1.ebuild,v 1.3 2011/05/19 16:08:13 reavertm Exp $
 
 EAPI="4"
 
@@ -103,7 +103,6 @@ src_prepare() {
 	config_enable module_qt4_docking m
 	config_enable module_qt4_docking_notify m
 	config_enable module_screenshot m
-	config_enable module_server_monitor m
 	config_enable module_simpleview m
 	config_enable module_single_window m
 	config_enable module_sms m
diff --git a/net-im/kadu/kadu-0.9.2.ebuild b/net-im/kadu/kadu-0.9.2.ebuild
new file mode 100644
index 000000000000..695ba99f2c51
--- /dev/null
+++ b/net-im/kadu/kadu-0.9.2.ebuild
@@ -0,0 +1,204 @@
+# 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.1 2011/05/19 16:08:13 reavertm 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
+
+	# 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_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
+}