Version bump. Fix also live. Add new useflag.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 157 insertions, 14 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 9b57f51b3b71..f34ed9934092 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2009/01/25 14:02:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.44 2009/02/19 11:48:54 scarabeus Exp $
+
+*quassel-0.4.0 (19 Feb 2009)
+
+  19 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml,
+  +quassel-0.4.0.ebuild, quassel-9999.ebuild:
+  Version bump. Fix also live. Add new useflag.
 
   25 Jan 2009; Raúl Porcel <armin76@gentoo.org> quassel-0.3.0.3.ebuild:
   Drop ~sparc
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 8d80e50b94ec..63548c7fe9a8 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -2,9 +2,11 @@ AUX quasselcore.conf 386 RMD160 01ce00964866419ea2b11c4f23d09a6542d32ccd SHA1 13
 AUX quasselcore.init 1521 RMD160 f43a3c29f97cc44a6348d9ebf378d0531342cb05 SHA1 a7acf78a66a048a6cdc4cac54dae1f7e7d3d5b3f SHA256 eae2f4d8fb0a13f1bd449ea21d0493b9dcbed1df3417039ebf7b8c999f9a4a51
 DIST quassel-0.3.0.3.tar.bz2 1971668 RMD160 d8b43242fae90b60e1c89246e352e0aa7b5bb6c6 SHA1 36178a1ee155e4514dfc4373b057c5e31f84927f SHA256 78d164d85ce695c3c3cacc2197d95bf8aeca3e6af3e7f450b6960e44ab632049
 DIST quassel-0.3.1.tar.bz2 2237851 RMD160 f6b97b8a85116b25e8bb67ef578e6ceaab5c3282 SHA1 05e90ccdcadd665376462fa1475602eb3076ae0b SHA256 dd00edc2d600e939776c5092ac4f6d68706a97a133322fb46e08defbd39affda
+DIST quassel-0.4.0.tar.bz2 3012967 RMD160 1529bdde49f05b2f9da0bcef6c4605da28074b7c SHA1 2f4f272d6e532ad0cee313ad089fe67b182ad466 SHA256 5703cc0e5d28e2eddffaf885087b34c8df2431a3ab590f8f79b5199759115487
 EBUILD quassel-0.3.0.3.ebuild 3985 RMD160 f2a5fe715e7796d61e0d7d90363d2a7bc927c6cb SHA1 7c896d5b375f506e43b692335335103d535790d5 SHA256 7d9463a9382584bba994b6bed0ae5a9d1913564913f3821627d17d6bb5ebd3a8
-EBUILD quassel-0.3.1-r2.ebuild 3962 RMD160 e468eb38c02a9ffa41c3f9929a28990ca41066ec SHA1 4ea6c80794e5e784e0ad11b1e1dca2fc00dde6b9 SHA256 b2de1c61a6c32cfc22cdfacff3c50395e2cb9b1a4e8bfd49b4c60a2b5f25ca7b
+EBUILD quassel-0.3.1-r2.ebuild 3962 RMD160 0e1095c1324a79c70dbcf2753355329d60a8058f SHA1 fc4c675071abeb2df4d46f9cdd8055cd6fa8a245 SHA256 8bd02f36bcf91037d39c50ce279c4b02f82a7e290bf9ba1ffe88d43542dc4156
 EBUILD quassel-0.3.1-r4.ebuild 3630 RMD160 0982437d5517b566029d596ca267325fd9f733cb SHA1 3833991fe5f535f35e5d7cb2325dbde9531b431c SHA256 8969fa3f74f1e65eb014989c123e4c1cc9691f019c5654efea4dfb1c04891378
-EBUILD quassel-9999.ebuild 4244 RMD160 f645c0e765cf0e38c6e1ab0f6afc8b532ba3f339 SHA1 5d2c3724a60504451060576cca7952c33b0b307d SHA256 69d34ec7ef7c3529ff1a07d9a0d3558f01c514dccda6c25dd046711ef083903e
-MISC ChangeLog 8330 RMD160 f6c2729c19522d496f09bf9560de4b11490bc7ff SHA1 756a96ef4c1eacb1120177290edcad1dfb96f52d SHA256 4fccfe641643badc25c1be4f8fd845408c5b7ab6dc8294ab2e5931b074ba2423
-MISC metadata.xml 1401 RMD160 2c64f7cab97a5f1315ab5d8cbc98a43e813867a0 SHA1 b721fcaed6beb3d7668229502ed6b5bbbc599319 SHA256 2460901b994c6cac461d8a7a1d4e4473700403b084a1c9d8751ad14f2e069a11
+EBUILD quassel-0.4.0.ebuild 4157 RMD160 c08447839dd0733f983d6e22eb3660f0db55137b SHA1 b0829f87a39e4ce0b3b175c3b6da8a651cf08af9 SHA256 e1d129a6ab1e5c2b3800d7246a3078bdfaa0a9c105fee040acff05709a5fc719
+EBUILD quassel-9999.ebuild 4176 RMD160 277c9002aa1477a1a676193c5534fcf3612d44da SHA1 490a499dae72bfbf01d943e18fca50d7bfb8b75b SHA256 bf765a7ae52872a652ecabf1fe8c40e1ee07c11f58e6bcb7c87fb080675c309a
+MISC ChangeLog 8523 RMD160 0d0d5f433978c5d9b9c097a19e2d184ac5d40ba9 SHA1 4154a4a3547e16e8253a2c2f0b4ce89394ead8b8 SHA256 5d2d5d68c3a02fa366d7113710af6bdfa8b22602a1ab8c758c845c8ff301f697
+MISC metadata.xml 1569 RMD160 13153e6baac0747a9c4b7606a12121c7e3aac326 SHA1 562f75d3fb7734fb0f0cb2566216bc552e0ece85 SHA256 e6be6532135d9a65f789159ff71dfe987dc8e7ea710e2668dbf741738b15f24c
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 147c175d516c..b2edd897939b 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -16,6 +16,10 @@
 			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.3.1-r2.ebuild b/net-irc/quassel/quassel-0.3.1-r2.ebuild
index 8dd16180474e..034d77833b5c 100644
--- a/net-irc/quassel/quassel-0.3.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.3.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-r2.ebuild,v 1.2 2008/12/31 03:39:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.3.1-r2.ebuild,v 1.3 2009/02/19 11:48:54 scarabeus Exp $
 
 EAPI=1
 
diff --git a/net-irc/quassel/quassel-0.4.0.ebuild b/net-irc/quassel/quassel-0.4.0.ebuild
new file mode 100644
index 000000000000..184336c54ed1
--- /dev/null
+++ b/net-irc/quassel/quassel-0.4.0.ebuild
@@ -0,0 +1,131 @@
+# 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.4.0.ebuild,v 1.1 2009/02/19 11:48:54 scarabeus 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 kde monolithic +oxygen phonon +server +ssl webkit +X"
+
+LANGS="cs da de fr nb_NO ru tr"
+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
+		kde? ( >=kde-base/kdelibs-4.1 )
+		phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
+		webkit? ( x11-libs/qt-webkit:4 )
+	)
+	!monolithic? (
+		server? (
+			x11-libs/qt-sql:4[sqlite]
+			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? (
+		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 webkit WEBKIT)
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use_with kde KDE)
+		$(cmake-utils_use_with oxygen OXYGEN)
+		$(cmake-utils_use_with ssl OPENSSL)
+		-DEMBED_DATA=OFF"
+
+	if use kde ; then
+		# We don't use our own phonon backend, so don't enable it; also use system icon themes
+		mycmakeargs="${mycmakeargs} -DWITH_PHONON=0"
+	else
+		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with phonon PHONON)"
+	fi
+
+	_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
+}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 07d2291fcc41..8f024065e215 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -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.17 2009/01/21 08:39:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.18 2009/02/19 11:48:54 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE="dbus debug kde monolithic phonon +server +ssl webkit +X"
+IUSE="dbus debug kde monolithic +oxygen phonon +server +ssl webkit +X"
 
 LANGS="cs da de fr nb_NO ru tr"
 for l in ${LANGS}; do
@@ -74,15 +74,15 @@ src_configure() {
 		$(cmake-utils_use_with webkit WEBKIT)
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use_with kde KDE)
-		$(cmake-utils_use_with phonon PHONON)
-		$(cmake-utils_use_with ssl OPENSSL)"
+		$(cmake-utils_use_with oxygen OXYGEN)
+		$(cmake-utils_use_with ssl OPENSSL)
+		-DEMBED_DATA=OFF"
 
 	if use kde ; then
 		# We don't use our own phonon backend, so don't enable it; also use system icon themes
-		mycmakeargs="${mycmakeargs} -DWITH_PHONON=0 -DOXYGEN_ICONS=External -DQUASSEL_ICONS=External"
+		mycmakeargs="${mycmakeargs} -DWITH_PHONON=0"
 	else
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with phonon PHONON)
-			-DOXYGEN_ICONS=Builtin -DQUASSEL_ICONS=Builtin"
+		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with phonon PHONON)"
 	fi
 
 	_common_configure_code