Version bump. Drop old.

(Portage version: 2.2_rc61/cvs/Linux i686)

2 files changed, 28 insertions, 27 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/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