Version bump 0.6 series to fix DoS over CTCP. 0.6.3 to stable, tested on amd64 and x86. Drop old & affected.

(Portage version: 2.2_rc85/cvs/Linux x86_64, RepoMan options: --force)

5 files changed, 11 insertions, 147 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 9fab4dfe758b..99aaa5498468 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,14 @@
 # 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.110 2010/09/21 10:20:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.111 2010/09/21 10:30:32 scarabeus Exp $
+
+*quassel-0.6.3 (21 Sep 2010)
+
+  21 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0.5.2-fix_x11_detection.patch, -quassel-0.5.1.ebuild,
+  -quassel-0.6.2.ebuild, +quassel-0.6.3.ebuild, metadata.xml:
+  Version bump 0.6 series to fix DoS over CTCP. 0.6.3 to stable, tested on
+  amd64 and x86. Drop old & affected.
 
 *quassel-0.7.1 (21 Sep 2010)
 
diff --git a/net-irc/quassel/files/0.5.2-fix_x11_detection.patch b/net-irc/quassel/files/0.5.2-fix_x11_detection.patch
deleted file mode 100644
index 12f34fd67198..000000000000
--- a/net-irc/quassel/files/0.5.2-fix_x11_detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8df3e82b02a980d4e00f3dc9c90c11e96501cf6f Mon Sep 17 00:00:00 2001
-From: Manuel Nickschas <sputnick@quassel-irc.org>
-Date: Tue, 19 Jan 2010 21:51:41 +0100
-Subject: [PATCH] Don't require X11 headers for building quasselcore
-
----
- cmake/modules/Qt4ConfigDependentSettings.cmake |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cmake/modules/Qt4ConfigDependentSettings.cmake b/cmake/modules/Qt4ConfigDependentSettings.cmake
-index 1956aa5..a6b6c3d 100644
---- a/cmake/modules/Qt4ConfigDependentSettings.cmake
-+++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
-@@ -27,7 +27,7 @@
- IF(UNIX)
-   # on OS X X11 may not be required
-   IF (Q_WS_X11)
--    FIND_PACKAGE(X11 REQUIRED)
-+    FIND_PACKAGE(X11)
-   ENDIF (Q_WS_X11)
-   FIND_PACKAGE(Threads)
-   SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
--- 
-1.6.5.1
-
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 7b5b2a7c0ac6..799c464661db 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -20,10 +20,6 @@
 			client/server model. The server and X flags are not needed in this
 			case but it is possible to enable them too.
 		</flag>
-		<flag name="oxygen">
-			Install oxygen icons. Highly recommended for KDE-4.1 and KDE-4.2 (or
-			usage without kde). KDE-4.3 will ship the icons by default.
-		</flag>
 		<flag name="phonon">
 			Build client with phonon backend support. This enables sound
 			playback in client.
diff --git a/net-irc/quassel/quassel-0.5.1.ebuild b/net-irc/quassel/quassel-0.5.1.ebuild
deleted file mode 100644
index ab890dd54a34..000000000000
--- a/net-irc/quassel/quassel-0.5.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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.5.1.ebuild,v 1.6 2010/06/17 20:48:46 patrick 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/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
-SLOT="0"
-IUSE="dbus debug kde monolithic +oxygen phonon postgres +server +ssl webkit X"
-
-LANGS="cs da de fi fr hu it nb_NO ru sl tr"
-for l in ${LANGS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-RDEPEND="
-	dbus? ( x11-libs/qt-dbus:4 )
-	monolithic? (
-		!postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
-		postgres? ( x11-libs/qt-sql:4[postgres] >=dev-db/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? (
-			!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 )
-		)
-	)
-	ssl? ( x11-libs/qt-core:4[ssl] )
-	"
-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),"
-		eerror "the quasselclient (USE=X) or the quasselcore (USE=server)."
-		die "monolithic, server and X flag unset."
-	fi
-}
-
-src_configure() {
-	local my_langs
-	for i in ${LINGUAS}; do
-		my_langs="${i},${my_langs}"
-	done
-
-	local mycmakeargs="
-		$(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_langs}
-		"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		newinitd "${FILESDIR}"/quasselcore-2.init quasselcore || die "newinitd failed"
-		newconfd "${FILESDIR}"/quasselcore-2.conf quasselcore || die "newconfd failed"
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		ewarn
-		ewarn "In order to use the quassel init script you must set the"
-		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."
-	fi
-
-	if ( use server || use monolithic ) && use ssl ; then
-		elog
-		elog "Information on how to enable SSL support for client/core connections"
-		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
-	fi
-}
diff --git a/net-irc/quassel/quassel-0.6.2.ebuild b/net-irc/quassel/quassel-0.6.3.ebuild
index 28b8e58f7bc3..b6a87bb8676a 100644
--- a/net-irc/quassel/quassel-0.6.2.ebuild
+++ b/net-irc/quassel/quassel-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # 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.6.2.ebuild,v 1.2 2010/09/18 08:44:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.6.3.ebuild,v 1.1 2010/09/21 10:30:32 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://quassel-irc.org/"
 SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 SLOT="0"
 IUSE="ayatana dbus debug kde monolithic phonon postgres +server +ssl webkit X"