Fixing 0.4 and 9999 ebuild deps with dev-db/sqlite[threadsafe] to fix #260485

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

4 files changed, 138 insertions, 4 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 421906c845d1..a4a54a274017 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.45 2009/02/20 20:02:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.46 2009/02/28 23:20:33 patrick Exp $
+
+*quassel-0.4.0-r2 (28 Feb 2009)
+
+  28 Feb 2009; Patrick Lauer <patrick@gentoo.org> +quassel-0.4.0-r2.ebuild,
+  quassel-9999.ebuild:
+  Fixing 0.4 and 9999 ebuild deps with dev-db/sqlite[threadsafe] to fix
+  #260485
 
 *quassel-0.4.0-r1 (20 Feb 2009)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 2386f1de6409..0abf3f389515 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -9,6 +9,7 @@ EBUILD quassel-0.3.0.3.ebuild 3985 RMD160 f2a5fe715e7796d61e0d7d90363d2a7bc927c6
 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-0.4.0-r1.ebuild 3546 RMD160 eb1ee76405da0ea375faf400f66c17096d22d837 SHA1 2895e92d4560200abbf14fee6d0505a91d2ae448 SHA256 59e7c6b11a29812031b23b12df6aefa3c77997e0610ad1599bfc8a95ce714e12
-EBUILD quassel-9999.ebuild 3562 RMD160 c09953b81e375e54010752b65d0b38666e1698d9 SHA1 a09760925ecd4b10c10a735e0e20423ac33848d5 SHA256 cfad9f3e6def932395932e5e1133678009d704c0f1ba630ef417e4fc1aa0dbb8
-MISC ChangeLog 8820 RMD160 9a265d36842dad5951e48515c4bc4751fc213cb0 SHA1 6d78dac0313c9bd82132900645d2cdd0c0f33ca2 SHA256 3ca57e6912fb6edf81a1f3e6441f77ef3999c01666182761a064024ac9693d6e
+EBUILD quassel-0.4.0-r2.ebuild 3601 RMD160 bea2eeae3c678bde86ec317dddfc876b880ebf88 SHA1 cafb823af75df472b7c9a943d97528cb90b6e91b SHA256 8a4c1bc1837f6006039756aae8a7af9647d99bc97712ca07fe497018c932af72
+EBUILD quassel-9999.ebuild 3617 RMD160 6f023e4ddcf6fda42d292e0b32ab61cf2840e18c SHA1 341859a8d41925411c59d6ed65f44c5e9a72143c SHA256 20f28c55de81dbfdff1ca1fdd315470adc2df0675201a01f3a073304f508bfa4
+MISC ChangeLog 9033 RMD160 695415a0926252641185f45f5324a395af9783cb SHA1 e84ef60bac1c90e2e23dcccff727c5874433e301 SHA256 22c7d2f8768596baebc024e8561a64ebf92118f1e52dcef1a78eec7b75685ce0
 MISC metadata.xml 1569 RMD160 13153e6baac0747a9c4b7606a12121c7e3aac326 SHA1 562f75d3fb7734fb0f0cb2566216bc552e0ece85 SHA256 e6be6532135d9a65f789159ff71dfe987dc8e7ea710e2668dbf741738b15f24c
diff --git a/net-irc/quassel/quassel-0.4.0-r2.ebuild b/net-irc/quassel/quassel-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..e1aa72c2faf9
--- /dev/null
+++ b/net-irc/quassel/quassel-0.4.0-r2.ebuild
@@ -0,0 +1,124 @@
+# 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-r2.ebuild,v 1.1 2009/02/28 23:20:33 patrick 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 hu nb_NO ru sl tr"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+RDEPEND="
+	x11-libs/qt-core:4
+	dbus? ( x11-libs/qt-dbus:4 )
+	monolithic? (
+		dev-db/sqlite[threadsafe]
+		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? (
+			dev-db/sqlite[threadsafe]
+			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() {
+	local MY_LANGUAGES=""
+	for i in ${LINGUAS}; do
+		MY_LANGUAGES="${i},${MY_LANGUAGES}"
+	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)
+		-DEMBED_DATA=OFF
+		-DLINGUAS=${MY_LANGUAGES}
+		"
+
+	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 /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 "http://bugs.quassel-irc.org/wiki/quassel-irc/Manage_core_users provides"
+		elog "some information on using the script."
+		elog "To be sure nothing bad will happen you need to stop the quasselcore"
+		elog "before adding more users."
+	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-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index a3871922b449..4ea5ccf51aa0 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.19 2009/02/20 20:02:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.20 2009/02/28 23:20:33 patrick Exp $
 
 EAPI="2"
 
@@ -26,6 +26,7 @@ RDEPEND="
 	x11-libs/qt-core:4
 	dbus? ( x11-libs/qt-dbus:4 )
 	monolithic? (
+		dev-db/sqlite[threadsafe]
 		x11-libs/qt-sql:4[sqlite]
 		x11-libs/qt-script:4
 		x11-libs/qt-gui:4
@@ -35,6 +36,7 @@ RDEPEND="
 	)
 	!monolithic? (
 		server? (
+			dev-db/sqlite[threadsafe]
 			x11-libs/qt-sql:4[sqlite]
 			x11-libs/qt-script:4
 		)