Version bump. Ebuild rewritten and largely simplified.

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

4 files changed, 163 insertions, 19 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 83e692c8b1ad..309dceab7aad 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/qutim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.13 2012/03/16 11:58:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.14 2012/04/06 19:53:57 pesa Exp $
+
+*qutim-0.3.0 (06 Apr 2012)
+
+  06 Apr 2012; Davide Pesavento <pesa@gentoo.org> +qutim-0.3.0.ebuild,
+  metadata.xml:
+  Version bump. Ebuild rewritten and largely simplified.
 
 *qutim-0.2.0-r4 (16 Mar 2012)
 
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
index 72e5a1299d3a..55f739bb7511 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -4,18 +4,26 @@ Hash: SHA512
 AUX fix_insecure_rpath.patch 1129 RMD160 e7c10a11ac11ec90eba6d25b6b84f0f4701f5ae1 SHA1 ac79bf92d96437273379db12bb928bd9cee5408d SHA256 cf74d7e20071d398f617faff7e7470b221f599cc0677ddb676ea57bc58a5d4ad
 AUX qutim-0.2.0-gold.patch 178 RMD160 85144ae8b7173ee7fe4680c278cd322a60dafaf8 SHA1 dec2f5a5bc028c96a56c26b61665f36568941007 SHA256 1fa929958b466b8f469f42479bb9b9a9203fb3d3b84f09eea2cd8e3e2cdedb66
 DIST qutim-0.2.0.tar.bz2 2536041 RMD160 59ab7bb364c0cb15deba96cc0c50471a3902f96c SHA1 b21399950252a100bd99840f6d6dc8093eaeb082 SHA256 272fba12d2fea5a550a504a3fb75ea5852e2fd086f0873079433d6361cfbc232
+DIST qutim-0.3.0.tar.bz2 11947764 RMD160 f807c9d499a7d03f75a6ca2d6685850ed0705b92 SHA1 a1cb1e06db96a3dc96a98ba22c7fa9d096907371 SHA256 33f55f9ec6f91fa0eeb16b40b56d17bc7989c40e745e8c345811f82faf9ccb40
 EBUILD qutim-0.2.0-r3.ebuild 2890 RMD160 9c2e3375b2358d488e1c26ae1088482177cfea5e SHA1 3d6f17c90fb7e1124d9e87c5f42b4854338f61a1 SHA256 6ba6316aea2bf0341e64a0fa6f146c5e1d1cf51d5ca09f2061c0a77358e4a516
 EBUILD qutim-0.2.0-r4.ebuild 2919 RMD160 8d441c5d0f674a43454b79786ef6f61d2e05fa8f SHA1 bc66cc29826eaa2c8037eba276f0af8dc4ae2a58 SHA256 58d908372904124798d79f864c91e357625f0bf831e87f3ae1c26ff9f53f3252
-MISC ChangeLog 2316 RMD160 676b6d4702a5437ee057265f4e0b2c766d676c35 SHA1 376f04589f6ea0f445893c87b671f6318cc357cf SHA256 079e28e54f718a10c5ff8562d6155e1404353e5171331f684e425bb6cc9d5734
-MISC metadata.xml 472 RMD160 d74734fc01394cd825676bfd2ac7a56cfbaa3ca2 SHA1 dbe1cdd030c5a94771ddba6988c6facf82daaa3b SHA256 cff03be9a4e8c342da41ca722630f1dd89e3d613cca0bacd2ef18ac3253eea5c
+EBUILD qutim-0.3.0.ebuild 3287 RMD160 505b96c56470207b839d2c42b6a4caf6eb855abf SHA1 b30a593fd053a5b0b99207bee422ada5981549d5 SHA256 60e30a059a6758bd73b322d4941440bc8e2ef483814ba9c893a6a0d2746e5c87
+MISC ChangeLog 2489 RMD160 7edaec59cb313630792339b2630b3524d9155afe SHA1 ad856fc56b4a497c3302ffc7096ef3852c32f6fa SHA256 955dadca571476bb17ec2c9f45d8a399d4cb60f2a2f9f1360d83cd49310ed34c
+MISC metadata.xml 1517 RMD160 a87a12f666a0adaa14eab7dbc62024cda6b0354e SHA1 c3647c381fd4b2580190a14c0569469d485dd3ea SHA256 a0a1f1c19cb913dbb8d3a812e2b42e668f7d14098afdcd4ecbe8d1bed5adadef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPYywyAAoJEO+t9ga+3I3aHB8H/3ABXFcXj6KYm5SDuCVFw6iS
-uyFyyDgcfmQO5EuGbKJj76uwlAgmt09bP0JkoovM5dMOIwJ/U70Sb4OvWjqEuAjk
-IYCRpvj+SpZdZo9KK466Fs9ER+0AQxeardkI6X+TKf3GyHs4OzY536bWLTNrFlfK
-h8KxOX7Vki08vt5AYZHmq4mgsEHjqZw/kJp5Bffi1LctXyuWIZ4c/xbpX0S2LGKi
-0r3zPin0/lvhIBWjFP6CR1Dw1x+SiBUX4u1jwh/YBOmuuFwpqb4FgrCq7ug+xL3A
-BTGjnawnJEqkcgjQJo+Sefdyz0wLoZO9g9eXAFCAKWF7hgOmIqGS+m0LKUmUG7I=
-=6CyA
+iQIcBAEBCgAGBQJPf0ncAAoJENXLsxwXqFxyl3gP/RrVCk98qznBtmhpx9QqxVvC
+W9qpNwgRHDhhw+VgbSAKJc8tvnJcGwXGblH+IGF/ZvPSgzj+CBdjwIQTa5cKM/tx
+JS8BltLVXacCGrxNFITPLEFGogo7drMdxa1RP4vEMShg9Ors1VYmq9lOioHkHr3G
+MOZGHQF8MBwmAtzu6Ete06Y6kibURuBWDr97hgNxq28As8uxm/NrvwN3ZtCIbNs7
+zjtHPTzfpuAklw5dNBuusgI9XtJN7yozfxPJrddOahCuYe6KUlGvFDT8Q726LhLk
+TcBETXHJL8w9pVDpUMDf5drOEr9nHWa3Gs8na4eHxqIZvlV7oNCgpktvOkQcNrU7
+1ZCCV5lbVjIaeybDwqpke+PDB+7A3WLVeN61IVe5RYfANY5YRFiT9EJ5qMjjGpvd
+A6/Zw22d8KbLJJRXhYgYB7hsFWUURE2PdkuIkutvbzxeezkYVcniULNUKx80FqS0
+nVvOfKUQDhw58oCynbNyq+H+Cq1ofQGSZ8bAc3r849DeDkDImqsMEq6Qxz1p6ZjI
+ygyagReoDAhB5yObubS0xW9DKV0kgY+2CJILf3qJei1+EVrg0njfxZ10AHuEx97M
+g1LyqrTpkQTYqXve1yJXnz6lCQt4NW3tyx+ylSXeOvIQLWKsIYgE+rYEeJVI7Tz7
+dAxfF1oG75dcrd/j1BXX
+=zxJu
 -----END PGP SIGNATURE-----
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
index cc060b9d49bf..02f9ea8b9dc0 100644
--- a/net-im/qutim/metadata.xml
+++ b/net-im/qutim/metadata.xml
@@ -3,13 +3,23 @@
 <pkgmetadata>
 <herd>qt</herd>
 <use>
-	<flag name="irc">Enable irc support</flag>
-	<flag name="histman">Enable histman plugin</flag>
-	<flag name="mrim">Enable mrim plugin</flag>
-	<flag name="vkontakte">Enable vkontakte plugin</flag>
-	<flag name="yandexnarod">Enable yanderx.narod plugin</flag>
+	<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
+	<flag name="awn">Enable integration with <pkg>gnome-extra/avant-window-navigator</pkg></flag>
+	<flag name="crypt">Enable AES crypto plugin</flag>
+	<flag name="histman">Enable history importer plugin</flag>
+	<flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
+	<flag name="irc">Enable IRC protocol support</flag>
+	<flag name="kinetic">Enable Growl-like kinetic popups plugin</flag>
+	<flag name="mrim">Enable mail.ru protocol support</flag>
+	<flag name="multimedia">Add sound support via <pkg>x11-libs/qt-multimedia</pkg></flag>
+	<flag name="phonon">Add sound support via <pkg>media-libs/phonon</pkg> or <pkg>x11-libs/qt-phonon</pkg></flag>
+	<flag name="purple">Enable libpurple-based protocol support</flag>
+	<flag name="qml">Enable QtQuick-based chat plugin</flag>
+	<flag name="sdl">Add sound support via <pkg>media-libs/sdl-mixer</pkg></flag>
+	<flag name="telepathy">Enable telepathy-based protocol support</flag>
+	<flag name="vkontakte">Enable vkontakte protocol support</flag>
+	<flag name="webkit">Enable Adium-like WebView plugin</flag>
+	<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
+	<flag name="yandexnarod">Enable yandex.narod plugin</flag>
 </use>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>
-
diff --git a/net-im/qutim/qutim-0.3.0.ebuild b/net-im/qutim/qutim-0.3.0.ebuild
new file mode 100644
index 000000000000..b325d66f1035
--- /dev/null
+++ b/net-im/qutim/qutim-0.3.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.0.ebuild,v 1.1 2012/04/06 19:53:57 pesa Exp $
+
+EAPI=4
+
+LANGS="ar bg cs de en_GB ru uk zh_CN"
+
+inherit qt4-r2 cmake-utils
+
+DESCRIPTION="Qt4-based multi-protocol instant messenger"
+HOMEPAGE="http://www.qutim.org"
+SRC_URI="http://www.qutim.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aspell awn ayatana crypt dbus debug doc histman hunspell irc jabber kde kinetic mrim
+	multimedia oscar phonon purple qml sdl +ssl telepathy vkontakte webkit +xscreensaver"
+
+REQUIRED_USE="
+	oscar? ( ssl )
+"
+
+QT_PV="4.7.0:4"
+
+RDEPEND="
+	x11-libs/libqxt
+	>=x11-libs/qt-core-${QT_PV}[ssl?]
+	>=x11-libs/qt-gui-${QT_PV}
+	>=x11-libs/qt-script-${QT_PV}
+	aspell? ( app-text/aspell )
+	awn? ( >=x11-libs/qt-dbus-${QT_PV} )
+	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
+	crypt? ( app-crypt/qca:2 )
+	dbus? ( >=x11-libs/qt-dbus-${QT_PV} )
+	debug? ( >=x11-libs/qt-declarative-${QT_PV} )
+	histman? ( >=x11-libs/qt-sql-${QT_PV} )
+	hunspell? ( app-text/hunspell )
+	jabber? ( net-libs/jreen )
+	kde? (
+		dev-util/automoc
+		kde-base/kdelibs:4
+	)
+	kinetic? ( >=x11-libs/qt-declarative-${QT_PV} )
+	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
+	oscar? ( app-crypt/qca:2 )
+	phonon? (
+		kde? ( media-libs/phonon )
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_PV} media-libs/phonon ) )
+	)
+	purple? ( net-im/pidgin )
+	qml? (
+		>=x11-libs/qt-declarative-${QT_PV}
+		>=x11-libs/qt-opengl-${QT_PV}
+	)
+	sdl? ( media-libs/sdl-mixer )
+	telepathy? ( net-libs/telepathy-qt )
+	vkontakte? ( >=x11-libs/qt-webkit-${QT_PV} )
+	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	base_src_prepare
+
+	# fix automagic dep on libXScrnSaver
+	if ! use xscreensaver; then
+		sed -i -e '/XSS xscrnsaver/d' \
+			core/src/corelayers/idledetector/CMakeLists.txt || die
+	fi
+
+	# remove unwanted translations
+	local lang
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm -f translations/modules/*/${lang}.{po,ts}
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSTEM_JREEN=ON
+		$(cmake-utils_use_with doc DOXYGEN)
+		$(cmake-utils_use doc QUTIM_GENERATE_DOCS)
+		# plugins
+		$(cmake-utils_use aspell ASPELLER)
+		$(cmake-utils_use awn)
+		$(cmake-utils_use ayatana INDICATOR)
+		$(cmake-utils_use crypt AESCRYPTO)
+		$(cmake-utils_use dbus DBUSAPI)
+		$(cmake-utils_use dbus DBUSNOTIFICATIONS)
+		$(cmake-utils_use dbus NOWPLAYING)
+		$(cmake-utils_use debug LOGGER)
+		$(cmake-utils_use histman)
+		$(cmake-utils_use hunspell HUNSPELLER)
+		$(cmake-utils_use kde KDEINTEGRATION)
+		$(cmake-utils_use kinetic KINETICPOPUPS)
+		$(cmake-utils_use multimedia MULTIMEDIABACKEND)
+		$(cmake-utils_use phonon PHONONSOUND)
+		$(cmake-utils_use qml QMLCHAT)
+		$(cmake-utils_use sdl SDLSOUND)
+		$(cmake-utils_use webkit ADIUMWEBVIEW)
+		-DHAIKUNOTIFICATIONS=OFF
+		-DUNITYLAUNCHER=OFF
+		-DUPDATER=OFF
+		# protocols
+		$(cmake-utils_use irc)
+		$(cmake-utils_use jabber)
+		$(cmake-utils_use mrim)
+		$(cmake-utils_use oscar)
+		$(cmake-utils_use purple QUETZAL)
+		$(cmake-utils_use telepathy ASTRAL)
+		$(cmake-utils_use vkontakte)
+	)
+	cmake-utils_src_configure
+}