Version bump. Drop old.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 31 insertions, 40 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 5da9567d12a7..845f05822fba 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.76 2010/01/07 17:12:37 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.77 2010/01/19 12:10:21 scarabeus Exp $
+
+*quassel-0.5.2 (19 Jan 2010)
+
+  19 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -quassel-0.4.3.ebuild, +quassel-0.5.2.ebuild:
+  Version bump. Drop old.
 
   07 Jan 2010; Christian Faulhammer <fauli@gentoo.org> quassel-0.5.1.ebuild:
   stable x86, bug 289297
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 60d768384cfc..a1e4cf80444a 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
 AUX quasselcore-2.conf 548 RMD160 afc8ee2d5bc8449c51afd46699e7b9796ff77b1f SHA1 e9492c10864df233edda84411f7cf15e1f7f3573 SHA256 973bff9a4dac8e25b6a7b8dc8355f763c65e31f070b1fc5904f6325045ad3cb5
 AUX quasselcore-2.init 1627 RMD160 fc0885dc6a2295ad1dcb49aefc1adfd184388fb2 SHA1 2629a3019913b1c685406fc88ead655e10bed943 SHA256 318e85a896fc2672651fa270dd98bfb664c0cb20cc8ae34c18363dbef36d820b
-DIST quassel-0.4.3.tar.bz2 2997468 RMD160 064bfbf46e9e9917b753e09eb1fc372e2ab1bb6e SHA1 badc19da15c84eff5c37e7810425a64e236465a3 SHA256 1136f4af4a20863b85d49e4a4e3b6287bb818f8d2ca9b402c6c52225355c8876
 DIST quassel-0.5.1.tar.bz2 3339773 RMD160 411f70ed4b4162f8523bf5498cd22aca43171b5c SHA1 448c2712176d5c0328b439b60ee27e06645339ba SHA256 c2aa0694b775b33380cb5bb452512433fa9f0bf4820778e8ec98f621e5458f62
-EBUILD quassel-0.4.3.ebuild 3536 RMD160 0d3875b042bc87e48a659d5d52b0d8e546671303 SHA1 04aab028c72b6d9722f655298fb94ad5c55687a4 SHA256 43fc8a8492238f49737817a129f976c3e9ebd227b4c9904e00b7dd9f17be491e
+DIST quassel-0.5.2.tar.bz2 3307109 RMD160 bac05710c6126150c1546713325f319bef2640c8 SHA1 68abd45cd506303090b54e4aa21eb0273d3e4217 SHA256 9c98dcefa4b1655ae92b0204ef30594c9043701fb66350c5e69beafa86b88c8a
 EBUILD quassel-0.5.1.ebuild 3218 RMD160 62aadb3a9c8f83d150e1eb14ff1e3b8a76d19807 SHA1 42163521389834335a146ef15bc49dbb3177cb5f SHA256 f1ae33c2da36871dec586e5e077b9a931253fcd31baa52aa21fe7d00dc2641b0
+EBUILD quassel-0.5.2.ebuild 3224 RMD160 69e95bafe204e219d455f1eb672dbc8cfe63541f SHA1 66af5be9182712284e01b85a0eecec93d42346ca SHA256 5aa990c99444ffd470b5e334dd571661f91297f187f4e7ba4658282d4d1fe3d1
 EBUILD quassel-9999.ebuild 2852 RMD160 10f431615602df37a37c8b8db574f5eeb550e159 SHA1 fba44144643be83263f3257f5799be43417fc5ae SHA256 f4399a9f0e20dab268a69c63b7e455baf279656f3d8765b9c036f09594c32802
-MISC ChangeLog 13605 RMD160 b2498e57b91b55920cf66a31d08c78dec92ac443 SHA1 d41b8a93ab40e6e6c8c0b1da993b8ff444fa2041 SHA256 420b4717cb722760a20296188d6d16440fd26a2ea32cef4de9519634cbacba40
+MISC ChangeLog 13769 RMD160 5a60ce91c276b5dd5cc37f7ff3b593b40465a9a5 SHA1 7a984c082bd5d61027bfe916b85f67a4f45d8787 SHA256 6f9dd9fdfd1493e7d19038d5ea7a0af5dc06f80b12d729f406674cb2a3707d83
 MISC metadata.xml 1904 RMD160 0d6920637ae95ecf65ddeed89b533f7d38c2a9e7 SHA1 1184f2d819596ca938d3528b9db95c93bdd264dd SHA256 b3e24e86bcd423d041692bd6f18dbc72729444eb4a484adc6b3bab77ded76741
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktGFgsACgkQNQqtfCuFneP+MgCfTODVU1BJdvHH5G6+5jrYr7P0
-tjUAnREFEg/wuD5ml1X5cC1A4bo3urpt
-=HL15
------END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.4.3.ebuild b/net-irc/quassel/quassel-0.5.2.ebuild
index c36e611b4c85..b6c204b60163 100644
--- a/net-irc/quassel/quassel-0.4.3.ebuild
+++ b/net-irc/quassel/quassel-0.5.2.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.4.3.ebuild,v 1.3 2009/09/05 21:34:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.5.2.ebuild,v 1.1 2010/01/19 12:10:21 scarabeus Exp $
 
 EAPI="2"
 
+MY_P="${P/_/-}"
+
 inherit cmake-utils eutils
 
 DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
 HOMEPAGE="http://quassel-irc.org/"
-SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 SLOT="0"
-IUSE="dbus debug monolithic +oxygen phonon +server +ssl webkit +X"
+IUSE="dbus debug kde monolithic +oxygen phonon postgres +server +ssl webkit +X"
 
-LANGS="cs da de fr hu nb_NO ru sl tr"
+LANGS="cs da de fi fr hu it nb_NO ru sl tr"
 for l in ${LANGS}; do
 	IUSE="${IUSE} linguas_${l}"
 done
@@ -23,21 +25,23 @@ done
 RDEPEND="
 	dbus? ( x11-libs/qt-dbus:4 )
 	monolithic? (
-		dev-db/sqlite[threadsafe]
-		x11-libs/qt-sql:4[sqlite]
+		!postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
+		postgres? ( x11-libs/qt-sql:4[postgres] >=virtual/postgresql-base-8.3 )
 		x11-libs/qt-script:4
 		x11-libs/qt-gui:4
+		kde? ( >=kde-base/kdelibs-4.1 )
 		phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
 		webkit? ( x11-libs/qt-webkit:4 )
 	)
 	!monolithic? (
 		server? (
-			dev-db/sqlite[threadsafe]
-			x11-libs/qt-sql:4[sqlite]
+			!postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
+			postgres? ( x11-libs/qt-sql:4[postgres] )
 			x11-libs/qt-script:4
 		)
 		X? (
 			x11-libs/qt-gui:4
+			kde? ( >=kde-base/kdelibs-4.1 )
 			phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
 			webkit? ( x11-libs/qt-webkit:4 )
 		)
@@ -48,6 +52,8 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog README"
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_setup() {
 	if ! use monolithic && ! use server && ! use X ; then
 		eerror "You have to build at least one of the monolithic client (USE=monolithic),"
@@ -57,23 +63,24 @@ pkg_setup() {
 }
 
 src_configure() {
-	local MY_LANGUAGES=""
+	local my_langs
 	for i in ${LINGUAS}; do
-		MY_LANGUAGES="${i},${MY_LANGUAGES}"
+		my_langs="${i},${my_langs}"
 	done
 
 	local mycmakeargs="
-		-DWITH_KDE=OFF
 		$(cmake-utils_use_want X QTCLIENT)
 		$(cmake-utils_use_want server CORE)
 		$(cmake-utils_use_want monolithic MONO)
 		$(cmake-utils_use_with webkit WEBKIT)
 		$(cmake-utils_use_with phonon PHONON)
+		$(cmake-utils_use_with kde KDE)
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use_with ssl OPENSSL)
 		$(cmake-utils_use_with oxygen OXYGEN)
+		-DWITH_LIBINDICATE=OFF
 		-DEMBED_DATA=OFF
-		-DLINGUAS=${MY_LANGUAGES}
+		-DLINGUAS=${my_langs}
 		"
 
 	cmake-utils_src_configure
@@ -88,9 +95,6 @@ src_install() {
 
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}/quassel.logrotate" quassel
-
-		insinto /usr/share/doc/${PF}
-		doins "${S}"/scripts/manageusers.py || die "installing manageusers.py failed"
 	fi
 }
 
@@ -101,15 +105,6 @@ pkg_postinst() {
 		ewarn "QUASSEL_USER variable in ${ROOT%/}/etc/conf.d/quasselcore to your username."
 		ewarn "Note: This is the user who runs the quasselcore and is independent"
 		ewarn "from the users you set up in the quasselclient."
-		elog
-		elog "Adding more than one user or changing username/password is not"
-		elog "possible via the quasselclient yet. If you need to do these things"
-		elog "you have to use the manageusers.py script, which has been installed in"
-		elog "${ROOT%/}/usr/share/doc/${PF}".
-		elog "http://bugs.quassel-irc.org/wiki/quassel-irc/Manage_core_users provides"
-		elog "some information on using the script."
-		elog "To be sure nothing bad will happen you need to stop the quasselcore"
-		elog "before adding more users."
 	fi
 
 	if ( use server || use monolithic ) && use ssl ; then