[net-im/kadu] on tree

5 files changed, 6 insertions, 197 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 9d589a87..d42df630 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> -kadu-0.6.5.3-r1.ebuild,
+  -files/kadu-0.6.5.3-linkage.patch, metadata.xml:
+  on tree
+
 *kadu-0.6.5.3-r1 (15 Sep 2009)
 
   15 Sep 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 67a00fed..b58a31e1 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,7 +1,4 @@
-AUX kadu-0.6.5.3-linkage.patch 684 RMD160 3ee58d8825f977238f7f84aa07358ba9e32ce08f SHA1 46d6da80d2c10df4ef0626ab80314da8b6a2bd33 SHA256 38528c44264d0611a947fb242a53daa370e7539b137f495d78b6242e30cf38c9
 AUX libgsm-ugly-code.patch 314 RMD160 5c613b7b4eb261d1116fcbd76a6c46b0cc0c3bb3 SHA1 b008af1a900b135b28530fc49a2be11b318f269b SHA256 17c671fe35813ae9b8c72ca7c3563a22a0894e15ddc02aba0a6f56b00e20bad2
-DIST kadu-0.6.5.3.tar.bz2 1676317 RMD160 95609df3d2c75f765861234ee2bc2bf9eb36ab10 SHA1 0714e007e42ff4c9abecee6f9b47e62d291fb6f6 SHA256 ed2ff311d1896a6344af91e65c901d72f93e2e005989a82c6f35a4dbfced6a75
-EBUILD kadu-0.6.5.3-r1.ebuild 4713 RMD160 5e88e8e2f4c6b6feb1d56fba66122165bdbe7534 SHA1 8b1a19c0566052024b1aa97969d2d75a6318e6b8 SHA256 8eb9c7cf1144d067860dc2b9711e91d76dd950775a6c208baf66b67695c45f94
 EBUILD kadu-9999.ebuild 4553 RMD160 414670779dfd6379dfccb95bc816ed4e0a664aa8 SHA1 29cbee0042d391e70f003104be9224e63bdce83e SHA256 6e6e71e5bd51818ab5beb0d4f3c4b5713843a24c435c9fd07d145facaa79cc4c
-MISC ChangeLog 593 RMD160 923b7d6593dc0d5ecd1e22703502906b724dc87b SHA1 750cfd569669ea3554e4ab908c5586fff93d576b SHA256 9298ea65a6568c3009408343ea6998faecbe44506747e64ef9ca271313ac1f5a
-MISC metadata.xml 609 RMD160 44a5c91cb398857998383291081cd5e006fba980 SHA1 e6b16f9ae6de2b1f5fa8a7eb824a25be33a0c53e SHA256 b371c1758d7846a28489fc4d9104b82be733ca6b92741a7daf1c4f2b1495c21f
+MISC ChangeLog 729 RMD160 32c780c91da7ddd9e9f0c63a36b946490081d1e1 SHA1 40adb1d0f9228d6322f2909597eb875780170391 SHA256 eec4761ef967041eba451c1ae762fd44ae534528c42c6181b869c3cc8949eb7b
+MISC metadata.xml 553 RMD160 aa7fd9382a310c3b5ef9fce62b5d3f90dc28d63a SHA1 7f4b9adf6fed69ec27b80a7ead57c02d6344b1f7 SHA256 628e49254e1f339aa61860f1ffb6bb55725cb799f75ed192ce7a2945e917f4f8
diff --git a/net-im/kadu/files/kadu-0.6.5.3-linkage.patch b/net-im/kadu/files/kadu-0.6.5.3-linkage.patch
deleted file mode 100644
index 8aba720a..00000000
--- a/net-im/kadu/files/kadu-0.6.5.3-linkage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru ../old/modules/mediaplayer/CMakeLists.txt ./modules/mediaplayer/CMakeLists.txt
---- ../old/modules/mediaplayer/CMakeLists.txt	2009-08-07 13:41:28.000000000 +0200
-+++ ./modules/mediaplayer/CMakeLists.txt	2009-09-15 03:03:51.000000000 +0200
-@@ -62,6 +62,7 @@
- add_custom_target (mediaplayer-translations DEPENDS ${TRANSLATION_FILES})
- set_target_properties(mediaplayer PROPERTIES COMPILE_FLAGS "-DMEDIAPLAYER_BUILD" )
- add_dependencies (mediaplayer mediaplayer-translations)
-+target_link_libraries (mediaplayer ${QT_QTDBUS_LIBRARY})
- if (mediaplayer STREQUAL STATIC)
- 	set_target_properties(mediaplayer PROPERTIES COMPILE_FLAGS "-DKADULIB" )
- else (mediaplayer STREQUAL STATIC)
diff --git a/net-im/kadu/kadu-0.6.5.3-r1.ebuild b/net-im/kadu/kadu-0.6.5.3-r1.ebuild
deleted file mode 100644
index d044cfca..00000000
--- a/net-im/kadu/kadu-0.6.5.3-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit base cmake-utils flag-o-matic
-
-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/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="alsa ao kde oss phonon speech spell +ssl"
-
-DEPEND="
-	>=app-crypt/qca-2.0.0-r2
-	>=media-libs/libsndfile-1.0
-	>=net-libs/libgadu-1.8[threads]
-	>=x11-libs/qt-dbus-4.4:4
-	>=x11-libs/qt-gui-4.4:4[qt3support]
-	>=x11-libs/qt-webkit-4.4:4
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	phonon? (
-		!kde? (
-			|| (
-				>=x11-libs/qt-phonon-4.4:4
-				media-sound/phonon
-			)
-		)
-		kde? ( media-sound/phonon )
-	)
-	spell? ( app-text/aspell )
-"
-RDEPEND="${DEPEND}
-	speech? ( app-accessibility/powiedz )
-	ssl? ( app-crypt/qca-ossl:2 )
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}/libgsm-ugly-code.patch"
-	"${FILESDIR}/${P}-linkage.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_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_qt4_docking m
-	config_enable module_screenshot m
-	config_enable module_sms m
-	config_enable module_sound m
-	config_enable module_voice m
-	config_enable module_waather 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
-
-	# Media players - no build time deps so build them all
-	# bmpx_mediaplayer
-	config_enable module_mediaplayer m
-	config_enable module_amarok1_mediaplayer m
-	config_enable module_amarok2_mediaplayer m
-	config_enable module_audacious_mediaplayer m
-	config_enable module_dragon_mediaplayer m
-	# falf_mediaplayer
-	# itunes_mediaplayer
-	config_enable module_vlc_mediaplayer m
-	# xmms2_mediaplayer
-	# xmms_mediaplayer
-
-	# 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
-	# Broken QtDBus link import, disabling
-	# use kde && config_enable module_kde_notify m
-	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
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# delete unneeded .a files from modules directory
-	rm -f "${D}"/usr/lib*/kadu/modules/*.a
-}
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
index d9622b0a..a272616d 100644
--- a/net-im/kadu/metadata.xml
+++ b/net-im/kadu/metadata.xml
@@ -9,7 +9,6 @@
 	<use>
 		<flag name="avatar">Display Gadu Avatars in Kadu</flag>
 		<flag name="config_wizard">Enables configuration wizard module</flag>
-		<flag name="phonon">Enable phonon audio plugin</flag>
 		<flag name="sms">Enables SMS sending plugin</flag>
 		<flag name="speech">Enables speech module</flag>
 		<flag name="voice">Enables voice chat</flag>