Version bump 0.6 series. Add keywords to 0.7rc.

(Portage version: 2.2_rc74/cvs/Linux x86_64)

4 files changed, 11 insertions, 121 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index afe34ce80a03..63fcab5f0b71 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,13 @@
 # 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.105 2010/08/27 11:34:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.106 2010/09/05 10:51:02 scarabeus Exp $
+
+*quassel-0.6.2 (05 Sep 2010)
+
+  05 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -quassel-0.5.2.ebuild, -quassel-0.6.1.ebuild, +quassel-0.6.2.ebuild,
+  quassel-0.7_rc1.ebuild:
+  Version bump 0.6 series. Add keywords to 0.7rc.
 
   27 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   quassel-0.7_rc1.ebuild, quassel-9999.ebuild:
diff --git a/net-irc/quassel/quassel-0.5.2.ebuild b/net-irc/quassel/quassel-0.5.2.ebuild
deleted file mode 100644
index ea945aa77d55..000000000000
--- a/net-irc/quassel/quassel-0.5.2.ebuild
+++ /dev/null
@@ -1,117 +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.2.ebuild,v 1.4 2010/06/17 20:48:46 patrick Exp $
-
-EAPI="2"
-
-MY_P="${P/_/-}"
-
-inherit base 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}"
-
-PATCHES=( "${FILESDIR}/0.5.2-fix_x11_detection.patch" )
-
-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.1.ebuild b/net-irc/quassel/quassel-0.6.2.ebuild
index a9cd15d270e9..a31f3c481a3a 100644
--- a/net-irc/quassel/quassel-0.6.1.ebuild
+++ b/net-irc/quassel/quassel-0.6.2.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.1.ebuild,v 1.2 2010/06/07 16:33:42 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.6.2.ebuild,v 1.1 2010/09/05 10:51:02 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/net-irc/quassel/quassel-0.7_rc1.ebuild b/net-irc/quassel/quassel-0.7_rc1.ebuild
index e8ee01023d85..ec5538d8a6bd 100644
--- a/net-irc/quassel/quassel-0.7_rc1.ebuild
+++ b/net-irc/quassel/quassel-0.7_rc1.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.7_rc1.ebuild,v 1.3 2010/08/27 11:34:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.7_rc1.ebuild,v 1.4 2010/09/05 10:51:02 scarabeus Exp $
 
 EAPI=3
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://quassel-irc.org/"
 [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 SLOT="0"
 IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"