[gentoo-commits] gentoo-x86 commit in net-irc/quassel: metadata.xml ChangeLog quassel-9999.ebuild quassel-0.3.1-r4.ebuild quassel-0.3.1-r3.ebuild quassel-0.3.1-r1.ebuild quassel-0.3.1.ebuild

[Markus Ullmann (jokey)]

jokey       09/01/21 08:39:39

  Modified:             metadata.xml ChangeLog quassel-9999.ebuild
  Added:                quassel-0.3.1-r4.ebuild
  Removed:              quassel-0.3.1-r3.ebuild quassel-0.3.1-r1.ebuild
                        quassel-0.3.1.ebuild
  Log:
  Fix monolithic flag to be enabled only when actually using it and drop old
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 net-irc/quassel/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml	18 Jan 2009 19:44:40 -0000	1.9
+++ metadata.xml	21 Jan 2009 08:39:39 -0000	1.10
@@ -11,9 +11,10 @@
 	</maintainer>
 	<use>
 		<flag name="monolithic">
-			Build monolitic client. Only useful if one don't want to use
-			quassels client/server model. The server and X flags are probably
-			not needed but it is possible to enable them tooy.
+			Build Standalone client with integrated core, no external
+			quasselcore needed. Only useful if one don't want to use quassels
+			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="phonon">
 			Build client with phonon backend support. This enables sound



1.42                 net-irc/quassel/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	18 Jan 2009 19:44:40 -0000	1.41
+++ ChangeLog	21 Jan 2009 08:39:39 -0000	1.42
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.41 2009/01/18 19:44:40 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.42 2009/01/21 08:39:39 jokey Exp $
+
+*quassel-0.3.1-r4 (21 Jan 2009)
+
+  21 Jan 2009; <jokey@g.o> metadata.xml, -quassel-0.3.1.ebuild,
+  -quassel-0.3.1-r1.ebuild, -quassel-0.3.1-r3.ebuild,
+  +quassel-0.3.1-r4.ebuild, quassel-9999.ebuild:
+  Fix monolithic flag to be enabled only when actually using it and drop old
 
 *quassel-0.3.1-r3 (18 Jan 2009)
 



1.17                 net-irc/quassel/quassel-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.16&r2=1.17

Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- quassel-9999.ebuild	19 Jan 2009 00:27:05 -0000	1.16
+++ quassel-9999.ebuild	21 Jan 2009 08:39:39 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.16 2009/01/19 00:27:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.17 2009/01/21 08:39:39 jokey Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 EGIT_BRANCH="master"
 
-DESCRIPTION="Core/client IRC client."
+DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
 HOMEPAGE="http://quassel-irc.org/"
 
 LICENSE="GPL-3"
@@ -94,7 +94,6 @@
 		${mycmakeargs} \
 		-DLINGUAS="${LINGUAS}" \
 		"${S}" || die "Cmake failed"
-
 }
 
 src_install() {



1.1                  net-irc/quassel/quassel-0.3.1-r4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.3.1-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.3.1-r4.ebuild?rev=1.1&content-type=text/plain

Index: quassel-0.3.1-r4.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.3.1-r4.ebuild,v 1.1 2009/01/21 08:39:39 jokey Exp $

EAPI="2"

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"

LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE="dbus debug monolithic +server +ssl +X"

LANGS="nb_NO da de fr ru"
for l in ${LANGS}; do
	IUSE="${IUSE} linguas_${l}"
done

RDEPEND="
	x11-libs/qt-core:4
	dbus? ( x11-libs/qt-dbus:4 )
	monolithic? (
		x11-libs/qt-sql:4[sqlite]
		x11-libs/qt-script:4
		x11-libs/qt-gui:4
		x11-libs/qt-webkit:4
	)
	!monolithic? (
		server? (
			x11-libs/qt-sql:4[sqlite]
			x11-libs/qt-script:4
		)
		X? (
			x11-libs/qt-gui:4
			x11-libs/qt-webkit:4
		)
	)
	ssl? (
		dev-libs/openssl
		x11-libs/qt-core:4[ssl]
	)
	"
DEPEND="${RDEPEND}
	>=dev-util/cmake-2.6"

DOCS="AUTHORS ChangeLog README"

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() {
# Comment this out and invoke _common_configure_code and cmake manually until cmake-utils.eclass
# supports space separated strings as arguments for cmake options or quassel changes the
# separator. Until now multiple languages are not passed to -DLINGUAS and only the first
# language is considered.
	local mycmakeargs="$(cmake-utils_use_want server CORE)
		$(cmake-utils_use_want X QTCLIENT)
		$(cmake-utils_use_want monolithic MONO)
		$(cmake-utils_use_with X WEBKIT)
		$(cmake-utils_use_with dbus DBUS)
		$(cmake-utils_use_with ssl OPENSSL)
		-DOXYGEN_ICONS=Builtin
		-DQUASSEL_ICONS=Builtin"

	_common_configure_code

	mkdir -p "${WORKDIR}"/${PN}_build
	pushd "${WORKDIR}"/${PN}_build > /dev/null

	cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
		${mycmakeargs} \
		-DLINGUAS="${LINGUAS}" \
		"${S}" || die "Cmake failed"
}

src_install() {
	cmake-utils_src_install

	if use server ; then
		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"

		insinto /usr/share/doc/${PF}
		doins "${S}"/scripts/manageusers.py || die "installing manageusers.py failed"
	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 /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 "/usr/share/doc/${PF}".
		elog "Please make sure that the quasselcore is stopped before adding more users."
	fi

	if ( use server || use monolithic ) && use ssl ; then
		elog
		elog "To enable SSL support for client/core connections the quasselcore needs"
		elog "a PEM certificate which needs to be stored in ~/.quassel/quasselCert.pem."
		elog "To create the certificate use the following command:"
		elog "openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout ~/.quassel/quasselCert.pem -out ~/.quassel/quasselCert.pem"
	fi
}