Version bump.

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

4 files changed, 156 insertions, 16 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 64d8c2351689..c4aac84750f6 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.16 2012/04/12 16:35:12 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.17 2012/04/15 22:41:30 pesa Exp $
+
+*qutim-0.3.1 (15 Apr 2012)
+
+  15 Apr 2012; Davide Pesavento <pesa@gentoo.org> +qutim-0.3.1.ebuild,
+  metadata.xml:
+  Version bump.
 
   12 Apr 2012; Davide Pesavento <pesa@gentoo.org> qutim-0.3.0.ebuild:
   Pin telepathy-qt dep to 0.8.x (bug 411111). Add runtime dep on app-crypt/qca-
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
index 3bd8589eb316..4235cb5f55a4 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -6,25 +6,27 @@ AUX qutim-0.2.0-gold.patch 178 RMD160 85144ae8b7173ee7fe4680c278cd322a60dafaf8 S
 AUX qutim-0.3.0-fix-linking-with-system-jreen.patch 319 RMD160 e2e8970ce19231e762ea531102d1da5d5ede2993 SHA1 220c657fde4717a763327564e942be6babae685c SHA256 52a39550878a31e4362e0b15fadd426cd9a883c76d0728ca7fcf8383e3a9ba6b
 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
+DIST qutim-0.3.1.tar.bz2 12056208 RMD160 a33342c803125b38a180b88f0b2d131d84137ee7 SHA1 99ceb2cfb641c90b52ab0c33817989209093c6c2 SHA256 a85f2bbb1d8010ee5506b0e82185a21a950d2fa36f72373a192070859e4944e1
 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
 EBUILD qutim-0.3.0.ebuild 3417 RMD160 aa8e58ad0f6b0935beae6875a31e32cf532faea3 SHA1 627994ca139869f0180c65385f9011be8ceba617 SHA256 8ad693e0d68424d907757ab18986182b612672fc17f9455b95ce03f010e91636
-MISC ChangeLog 2860 RMD160 211590504b63b1a5de0c4f6dcd9e06c4df1b3400 SHA1 3f2fdfea5567c8810b631a6fdbc9041872b95b5c SHA256 cf93e9b745a49e5dd9a78da9b6885e6e39a48ae9a95103b3a931fef8d12fba63
-MISC metadata.xml 1517 RMD160 a87a12f666a0adaa14eab7dbc62024cda6b0354e SHA1 c3647c381fd4b2580190a14c0569469d485dd3ea SHA256 a0a1f1c19cb913dbb8d3a812e2b42e668f7d14098afdcd4ecbe8d1bed5adadef
+EBUILD qutim-0.3.1.ebuild 3514 RMD160 79a2115bc2861b4738b0c190f753d90d335b2911 SHA1 c6072d4cbabe7f453761e3e90bad6c457be4ade3 SHA256 e8cd4b745913c7c71bffb069bff0c524091fa71c88212151485d356664828ff9
+MISC ChangeLog 2992 RMD160 de0d323bfd51424c93920296634c86d57d1a5aa3 SHA1 185e8e5d4bd38439c380be656a1879368dc8ac8e SHA256 beecb000ea81edf55e1298ef87ad7ab50dd52b4e2a875983bf098a147f7681a5
+MISC metadata.xml 1611 RMD160 9f693f4856ce36c6cabe5c9c8c3308f253b48f75 SHA1 8e264555886ba4b8b9c7de26458edc0f3acbb7b4 SHA256 cedf2389a362677ee014b9da89a35a252034b8cff134448f8ed87e4a5c391b5d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPhwRGAAoJENXLsxwXqFxyuh8QAJft7h0O8JE/x8262n7VgeE4
-92SkPzouI/2yQeRpD5HRyqgWHzZvNpgw3f2uFxNJhQ3ruiMzT++/aa53jjwuV9aA
-R8soiSb4xjmzlPsTlKfzp4ijGSA5VkqdcJf6n+oEr3vIPqskSadJCDDbm/xQv5kg
-pt2knwMiQPExMM8AkpzKnNSq6vA8HK1s4n+W3i3aIMGnsgZcNoMiDsQwNzBHQGm3
-rcIMeOznNWvxNU/+M55/YSIomF3omjuBp6GqxTYrmU2Gcn3y4P9vFuRqK222wgAe
-L8knLpXcr/RCNce/I5LqgdTv+S5cRwuErzF5aUdA1ku9s0l2oAGKor+cpLUoqbNk
-8r+p71QjGyqHozJ+JyZd6dXBweYUHWMhPh5BM8uSiOh6pPyTW+RosNA9wYQOsMW5
-cZffTUTzstUaWJGWsgCUndBj3uRjHBaSCc60AA1cZyqa5kJz4MRRcHY1quvK0QWa
-Z22v0nt20+Re2Pmf3fr04n0hGCSYMQBzsyrwUOkQtXMTM9ZCeXk8MVUvZo+WgPFn
-jv6umdUCPV72zQGWyoshhcQuBc/vponMmnXIRMBEJkpn3aAFOTkmiUlsQbRP4eSF
-jCkUegWGzfFnYBOeFqUJkNWS03XESsqal7dcXJ9CYg6j+/laGr5A/H4WdTXS+hH0
-MhhkS6iei3deQsA9C5MF
-=KIpl
+iQIcBAEBCgAGBQJPi06hAAoJENXLsxwXqFxysMEQAJD9pzKTIUW7uaXrEPp5tUgx
+jr2N7zfeYJ2khkm3RhX75Z6ajUZekd41+fgdbKIC+xsoC1ieT0jjmchQxF2kDCYs
+4HdmqTgONw0SSyAeKD67EI8e53bpl2eltMoGqCVuDW5hjnbrxk9XmryXHDF1CWZs
+EuUsUZQABZyeeSTaAAtHpU8kuiG15YxZ4Xy8oCeivEwaWriU8Bx7YWxOCW98F9Ja
+3tnu9Kkm+6xNxz1XsmVi4q0qDJzZX01BfJJDUQ2DsGns2kG3etuBKeA7KdgIn6MO
+ziikCqdS0DAGbn8cssqXr+/q5dxoGlm/RopCdq1nO6gy7ScqAzbfuuMkE+o0HS93
+xKPL7I5c5BN/yUpJ25lOgYFOCPgCY5442Qq1aoGlzfc8MYdthNyzFCo/0wl0MmzB
+xvxZSTP2pCHEzkcYqX4J8YvqBit7VBr3rhq/UhXZlkIuMb2WCd4Fg65We96rlhpC
++ugKBe4UEyMj+HPywb8TWYnudHKOPk1V7WvWUViIHOTTmixmeOpZfeP+Ru6GGEuR
+tRDe6p5gJS1xbjnL/ohIajBKBpS7nVSAsU1oLQAbvEufpn/t4hLsSWsbXoBcf5pz
+zr8gIbC77QbSThwpn/oNrI1YsPgGyfMYFUwA/k27xCz/qDO9ZQoIVwfbH8XNoRv6
+2A1uk/2e93yy41ke4g2L
+=JGUS
 -----END PGP SIGNATURE-----
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
index 02f9ea8b9dc0..633e83fc94cf 100644
--- a/net-im/qutim/metadata.xml
+++ b/net-im/qutim/metadata.xml
@@ -12,6 +12,7 @@
 	<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="otr">Enable plugin for encrypted conversations (Off-The-Record messaging)</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>
diff --git a/net-im/qutim/qutim-0.3.1.ebuild b/net-im/qutim/qutim-0.3.1.ebuild
new file mode 100644
index 000000000000..4807ade05624
--- /dev/null
+++ b/net-im/qutim/qutim-0.3.1.ebuild
@@ -0,0 +1,131 @@
+# 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.1.ebuild,v 1.1 2012/04/15 22:41:30 pesa Exp $
+
+EAPI=4
+
+LANGS="ar be bg cs de en_GB ru sk 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 otr phonon purple qml sdl +ssl telepathy vkontakte webkit +xscreensaver"
+
+REQUIRED_USE="
+	oscar? ( ssl )
+"
+
+QT_PV="4.7.0:4"
+
+CDEPEND="
+	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? (
+		app-crypt/qca:2
+		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 )
+	otr? ( >=net-libs/libotr-3.2.0 )
+	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-0.8* )
+	vkontakte? ( >=x11-libs/qt-webkit-${QT_PV} )
+	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${CDEPEND}
+	jabber? ( app-crypt/qca-gnupg:2 )
+	oscar? ( app-crypt/qca-ossl:2 )
+"
+
+DOCS=( AUTHORS ChangeLog )
+
+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 otr OFFTHERECORD)
+		$(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
+}