Fix monolithic flag to be enabled only when actually using it and drop old

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

7 files changed, 25 insertions, 265 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 8b236cf307b8..979f83a36346 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -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@gentoo.org> 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)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 83302b02de42..8c5053187102 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -3,10 +3,8 @@ AUX quasselcore.init 1521 RMD160 f43a3c29f97cc44a6348d9ebf378d0531342cb05 SHA1 a
 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
 EBUILD quassel-0.3.0.3.ebuild 3993 RMD160 af9b35252918af925597794179cb4083dd8f0808 SHA1 3d99e37cb6cf4ead2680b3a5028ab73f74f816b5 SHA256 066896bfa59f4ea300a5d1f8fc08563078a797ac78566d4d2f528e3df2ff8a1f
-EBUILD quassel-0.3.1-r1.ebuild 3825 RMD160 963b85fedbcd9e9ddca0afdbe97aa67553af113b SHA1 9aa9804defbef85807483b5c3c2539d9d4cc1c0a SHA256 e160f879c1688d9049285c548caef0ff1503008f8fd6b42635cd399281ba0481
 EBUILD quassel-0.3.1-r2.ebuild 3962 RMD160 e468eb38c02a9ffa41c3f9929a28990ca41066ec SHA1 4ea6c80794e5e784e0ad11b1e1dca2fc00dde6b9 SHA256 b2de1c61a6c32cfc22cdfacff3c50395e2cb9b1a4e8bfd49b4c60a2b5f25ca7b
-EBUILD quassel-0.3.1-r3.ebuild 3571 RMD160 e52b11d02b448374ddda5fa9e287ccb1b308e4af SHA1 dea35cde50fb0aaca4641eb4b1c31129a6b7408c SHA256 1a15817b204f31d57814d294a3071f9ac9c9f68bbab2e1a004ba47e1accd3c5a
-EBUILD quassel-0.3.1.ebuild 3990 RMD160 e54ebbf948ce1a993d975515b120348472a1be12 SHA1 9da36b01151b49cec1c1c0a7c5325189e83160ab SHA256 cb2c4d39fa7ffc8b62b1e618547c010f557cbdf06d254281828dfdbc6a00f975
-EBUILD quassel-9999.ebuild 4202 RMD160 f819708ccf75bf711f2d62fa5e775cd831a2c5e8 SHA1 861996220c3f2ae9eabb70f6de8aab536eef0490 SHA256 e0e311be5fbe53679250c30ab9b8799867b2da5e2b55a2c276e9b4c1fe9e378d
-MISC ChangeLog 7955 RMD160 219a74caad6cb82821a57e48a426276aeb951bbc SHA1 c01eaae08e91244e9682d57dd52a0e3803b613e9 SHA256 ead5bba3fe29c069d16a4e08fd1f24bd258a66d68dbd6aef03281869f186f7e7
-MISC metadata.xml 1341 RMD160 65c2e3f19553d454a028a4b44870ab2e59645774 SHA1 5e7ba07e84c592f13265b7e325d186c545a09492 SHA256 0d3ed36a51afb31e18b206d491ccc5cec16cc3c2f58a6b4482a244ed815dbf5d
+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 8240 RMD160 fe8307b11875ab9d1800277c8431388ebc39b653 SHA1 25492ca62b4b5fd36519477f7dfc46e945a381cd SHA256 2c1684617da9bda1222516cbebf0736fc82564334bc3a2480c0eb4a2ca0b153c
+MISC metadata.xml 1401 RMD160 2c64f7cab97a5f1315ab5d8cbc98a43e813867a0 SHA1 b721fcaed6beb3d7668229502ed6b5bbbc599319 SHA256 2460901b994c6cac461d8a7a1d4e4473700403b084a1c9d8751ad14f2e069a11
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index c334815f58db..147c175d516c 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -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
diff --git a/net-irc/quassel/quassel-0.3.1-r1.ebuild b/net-irc/quassel/quassel-0.3.1-r1.ebuild
deleted file mode 100644
index 78f20e7907a9..000000000000
--- a/net-irc/quassel/quassel-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/11/28 21:11:49 patrick Exp $
-
-EAPI=1
-
-inherit cmake-utils eutils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Core/client IRC client."
-HOMEPAGE="http://quassel-irc.org/"
-SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="+dbus debug +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
-		server? (
-			x11-libs/qt-sql:4
-			x11-libs/qt-script:4
-		)
-		X? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-webkit:4 )
-		dbus? ( x11-libs/qt-dbus:4 )
-		ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.6"
-
-DOCS="AUTHORS ChangeLog README"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! use server && ! use X ; then
-		eerror "You have to build one or both of quassel client or server."
-		die "Both server and X USE flags unset."
-	fi
-
-	if use server && ! built_with_use x11-libs/qt-sql sqlite ; then
-		eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled."
-		die "Missing sqlite support in x11-libs/qt-sql:4"
-	fi
-
-	if use ssl && ! built_with_use x11-libs/qt-core ssl ; then
-		eerror "Please rebuild x11-libs/qt-core:4 with ssl USE flag enabled."
-		die "Missing ssl support in x11-libs/qt-core:4"
-	fi
-}
-
-src_compile() {
-# Comment this out and invoke _common_configure_code, cmake and cmake-utils_src_make
-# manually until cmake-utils.eclass supports space separated strings as arguments for cmake
-# options. 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_with dbus DBUS)"
-#		"$(cmake-utils_use_with ssl OPENSSL)"
-#		"-DLINGUAS=\"${LINGUAS}\""
-#		'-DWANT_MONO=OFF' )
-#
-#	cmake-utils_src_compile
-
-	_common_configure_code
-
-	cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
-		$(cmake-utils_use_want server CORE) $(cmake-utils_use_want X QTCLIENT) \
-		$(cmake-utils_use_with X WEBKIT) $(cmake-utils_use_with dbus DBUS) \
-		$(cmake-utils_use_with ssl OPENSSL) -DLINGUAS="${LINGUAS}" \
-		-DOXYGEN_ICONS=Builtin -DLINGUAS="${LINGUAS}" -DWANT_MONO=OFF \
-		"${S}" || die "Cmake failed"
-
-	cmake-utils_src_make
-}
-
-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 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-0.3.1-r3.ebuild b/net-irc/quassel/quassel-0.3.1-r4.ebuild
index ffb57a99d96c..0221fb17bc3e 100644
--- a/net-irc/quassel/quassel-0.3.1-r3.ebuild
+++ b/net-irc/quassel/quassel-0.3.1-r4.ebuild
@@ -1,19 +1,19 @@
 # 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-r3.ebuild,v 1.1 2009/01/18 19:44:40 jokey Exp $
+# $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
+EAPI="2"
 
 inherit cmake-utils eutils
 
-DESCRIPTION="Core/client IRC client."
+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"
+IUSE="dbus debug monolithic +server +ssl +X"
 
 LANGS="nb_NO da de fr ru"
 for l in ${LANGS}; do
@@ -57,15 +57,14 @@ pkg_setup() {
 	fi
 }
 
-src_compile() {
+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 X MONO)
+		$(cmake-utils_use_want monolithic MONO)
 		$(cmake-utils_use_with X WEBKIT)
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use_with ssl OPENSSL)
@@ -85,6 +84,7 @@ src_compile() {
 
 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"
diff --git a/net-irc/quassel/quassel-0.3.1.ebuild b/net-irc/quassel/quassel-0.3.1.ebuild
deleted file mode 100644
index c56fed5db81d..000000000000
--- a/net-irc/quassel/quassel-0.3.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.1 2008/11/27 18:34:50 patrick Exp $
-
-EAPI=1
-
-inherit cmake-utils eutils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Core/client IRC client."
-HOMEPAGE="http://quassel-irc.org/"
-SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~sparc ~x86"
-SLOT="0"
-IUSE="+dbus debug +server +ssl +X"
-
-LANGS="nb_NO da de fr"
-for l in ${LANGS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-RDEPEND="x11-libs/qt-core:4
-		server? (
-			x11-libs/qt-sql:4
-			x11-libs/qt-script:4
-		)
-		X? ( x11-libs/qt-gui:4 )
-		dbus? ( x11-libs/qt-dbus )
-		ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
-
-DOCS="AUTHORS ChangeLog README README.Qtopia"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! use server && ! use X ; then
-		eerror "You have to build one or both of quassel client or server."
-		die "Both server and X USE flags unset."
-	fi
-
-	if use server && ! built_with_use x11-libs/qt-sql sqlite ; then
-		eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled."
-		die "Missing sqlite support in x11-libs/qt-sql:4"
-	fi
-
-	if use ssl && ! built_with_use x11-libs/qt-core ssl ; then
-		eerror "Please rebuild x11-libs/qt-core:4 with ssl USE flag enabled."
-		die "Missing ssl support in x11-libs/qt-core:4"
-	fi
-}
-
-src_compile() {
-# Comment this out and invoke _common_configure_code, cmake and cmake-utils_src_make
-# manually until cmake-utils.eclass supports space separated strings as arguments for cmake
-# options. 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_with dbus DBUS)"
-#		"$(cmake-utils_use_with ssl OPENSSL)"
-#		"-DLINGUAS=\"${LINGUAS}\""
-#		'-DWANT_MONO=OFF' )
-#
-#	cmake-utils_src_compile
-
-	_common_configure_code
-
-	cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
-		$(cmake-utils_use_want server CORE) $(cmake-utils_use_want X QTCLIENT) \
-		$(cmake-utils_use_with dbus DBUS) $(cmake-utils_use_with ssl OPENSSL) \
-		-DLINGUAS="${LINGUAS}" -DWANT_MONO=OFF \
-		"${S}" || die "Cmake failed"
-
-	cmake-utils_src_make
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Only install the icons if the X client was installed
-	if use X ; then
-		insinto /usr/share/icons/hicolor
-		# avoid the connected/ directory, get only the ${size}x${size}
-		doins -r "${S}"/src/icons/quassel/*x* || die "installing quassel icons failed"
-	fi
-
-	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 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 d10293daa3e8..07d2291fcc41 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.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 @@ inherit cmake-utils eutils git
 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 @@ src_configure() {
 		${mycmakeargs} \
 		-DLINGUAS="${LINGUAS}" \
 		"${S}" || die "Cmake failed"
-
 }
 
 src_install() {