Bump to 0.4.1, small improvements to -9999 ebuild. Thanks to Daniel Pielmeier.

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

5 files changed, 155 insertions, 38 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 1ed1a4b2a0c3..fa441719ccad 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.47 2009/03/03 11:41:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.48 2009/03/31 16:10:29 patrick Exp $
+
+*quassel-0.4.1 (31 Mar 2009)
+
+  31 Mar 2009; Patrick Lauer <patrick@gentoo.org> +files/quassel.logrotate,
+  +quassel-0.4.1.ebuild, quassel-9999.ebuild:
+  Bump to 0.4.1, small improvements to -9999 ebuild. Thanks to Daniel
+  Pielmeier.
 
   03 Mar 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   +files/quassel-0.4.0-no-webkit.patch, quassel-0.4.0-r1.ebuild,
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 529f0c5cec7d..13f92bb9ea62 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX quassel-0.4.0-no-webkit.patch 288 RMD160 9c498415d8f4e719063d6258d247cf3016e27d10 SHA1 75b07c4484ce0a4033d5dea96474cb759225c22b SHA256 2f05034bda83e11118818492ee91a6483380cec919f16094bc3edcd333a71570
+AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
 AUX quasselcore-2.conf 548 RMD160 afc8ee2d5bc8449c51afd46699e7b9796ff77b1f SHA1 e9492c10864df233edda84411f7cf15e1f7f3573 SHA256 973bff9a4dac8e25b6a7b8dc8355f763c65e31f070b1fc5904f6325045ad3cb5
 AUX quasselcore-2.init 1627 RMD160 fc0885dc6a2295ad1dcb49aefc1adfd184388fb2 SHA1 2629a3019913b1c685406fc88ead655e10bed943 SHA256 318e85a896fc2672651fa270dd98bfb664c0cb20cc8ae34c18363dbef36d820b
 AUX quasselcore.conf 386 RMD160 01ce00964866419ea2b11c4f23d09a6542d32ccd SHA1 13f2d8da2ec68c6c8db019900abfa2334c1d0652 SHA256 b0e8873ac4a9a1ab78f8b96141e2c0159eeaf7e8ad0c7d8d3e53320fafcef1da
@@ -9,18 +7,13 @@ 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
 DIST quassel-0.4.0.tar.bz2 3012967 RMD160 1529bdde49f05b2f9da0bcef6c4605da28074b7c SHA1 2f4f272d6e532ad0cee313ad089fe67b182ad466 SHA256 5703cc0e5d28e2eddffaf885087b34c8df2431a3ab590f8f79b5199759115487
+DIST quassel-0.4.1.tar.bz2 3046742 RMD160 d7405d1ecec662e5a1323946f6a9b5761a39f6e1 SHA1 95705e4d09b34435d47328c4ac947102aef34751 SHA256 d79491906995b420da3c86fc9bf4370a2deec907560f66e8e33e540b14703ce2
 EBUILD quassel-0.3.0.3.ebuild 3985 RMD160 f2a5fe715e7796d61e0d7d90363d2a7bc927c6cb SHA1 7c896d5b375f506e43b692335335103d535790d5 SHA256 7d9463a9382584bba994b6bed0ae5a9d1913564913f3821627d17d6bb5ebd3a8
 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 3590 RMD160 ee3288b5f2ed2b162b792e1df7556e960cc60a33 SHA1 6d8c741b3946644a799aeba81c64746184c9c62a SHA256 c75b47473b96a9cab9b96ee8ed84771c57f0527b94117e42812c754dba1306c2
 EBUILD quassel-0.4.0-r2.ebuild 3647 RMD160 5b6fdf8898f3893c766df1520a16dbd5a5717e9b SHA1 4f9d3a5cfb4114651053b93dcdfa8ecc28bf8083 SHA256 9ee431dc1cb7f08d4869defff1cc6a6e7cb4b1f6f0c509f1697c543411b358d0
-EBUILD quassel-9999.ebuild 3617 RMD160 6f023e4ddcf6fda42d292e0b32ab61cf2840e18c SHA1 341859a8d41925411c59d6ed65f44c5e9a72143c SHA256 20f28c55de81dbfdff1ca1fdd315470adc2df0675201a01f3a073304f508bfa4
-MISC ChangeLog 9218 RMD160 72e427537969713f960ba079972c8f7d6bdf426d SHA1 03bcf94ee0969ddadc8cac45ad31a21f4b50af9a SHA256 5f8021c6a3bd3cad5b6cc281d490be1407c2f92979ed5d29d4003a0c0dd080df
+EBUILD quassel-0.4.1.ebuild 3629 RMD160 04df9163a4d1d6414cb9d7040739ecc6a5432ac0 SHA1 cae298870e395412ed0a7fb7d9940b9a8c43c7fe SHA256 be571411aa873e66910895564d1504d491ef86863ab2ef4b50d0c11bf1d9ef1f
+EBUILD quassel-9999.ebuild 3174 RMD160 e160ccbd38296235396aa279e82ba6dfb8a8a346 SHA1 870aa331e65b522c5a3f276b1b23a1dd44621c84 SHA256 0c21e4cb441b67e92834b490c9ad2abefde5402bb5f0e6ed18ae0c95f0de167c
+MISC ChangeLog 9452 RMD160 f6f7f67bcdf7141988e7abd1e7fc2ba655e66ae0 SHA1 4b8f2f61e9677418af444237ebbb1ea090348352 SHA256 99e3583c0d5de1602d765b0c9be6a1aab28e18df3c16b0a4c102daefbae67595
 MISC metadata.xml 1569 RMD160 13153e6baac0747a9c4b7606a12121c7e3aac326 SHA1 562f75d3fb7734fb0f0cb2566216bc552e0ece85 SHA256 e6be6532135d9a65f789159ff71dfe987dc8e7ea710e2668dbf741738b15f24c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmtF04ACgkQjDdoMVfcAHgh3QCfUgvz5eSEVinajBe9gPrw5die
-bKEAmgPPb3YoepzpaQb8JNJpmPn2gMUh
-=q708
------END PGP SIGNATURE-----
diff --git a/net-irc/quassel/files/quassel.logrotate b/net-irc/quassel/files/quassel.logrotate
new file mode 100644
index 000000000000..8e7208350020
--- /dev/null
+++ b/net-irc/quassel/files/quassel.logrotate
@@ -0,0 +1,9 @@
+/var/log/quassel.log {
+	compress
+	rotate 4
+	weekly
+	delaycompress
+	copytruncate
+	missingok
+	notifempty
+}
diff --git a/net-irc/quassel/quassel-0.4.1.ebuild b/net-irc/quassel/quassel-0.4.1.ebuild
new file mode 100644
index 000000000000..d6617c624d94
--- /dev/null
+++ b/net-irc/quassel/quassel-0.4.1.ebuild
@@ -0,0 +1,122 @@
+# 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.1.ebuild,v 1.1 2009/03/31 16:10:29 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="
+	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? ( x11-libs/qt-core:4[ssl] )
+	"
+DEPEND="${RDEPEND}"
+
+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 /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel
+
+		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 ${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."
+		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 "${ROOT%/}/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 4ea5ccf51aa0..9c97dbfe2341 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.20 2009/02/28 23:20:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.21 2009/03/31 16:10:29 patrick Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE="dbus debug kde monolithic +oxygen phonon +server +ssl webkit +X"
+IUSE="dbus debug kde monolithic +oxygen phonon postgres +server +ssl webkit +X"
 
 LANGS="cs da de fr hu nb_NO ru sl tr"
 for l in ${LANGS}; do
@@ -23,11 +23,10 @@ for l in ${LANGS}; do
 done
 
 RDEPEND="
-	x11-libs/qt-core:4
 	dbus? ( x11-libs/qt-dbus:4 )
 	monolithic? (
-		dev-db/sqlite[threadsafe]
-		x11-libs/qt-sql:4[sqlite]
+		!postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
+		postgres? ( x11-libs/qt-sql:4[postgres] >=virtual/postgresql-base-8.3 )
 		x11-libs/qt-script:4
 		x11-libs/qt-gui:4
 		kde? ( >=kde-base/kdelibs-4.1 )
@@ -36,8 +35,8 @@ RDEPEND="
 	)
 	!monolithic? (
 		server? (
-			dev-db/sqlite[threadsafe]
-			x11-libs/qt-sql:4[sqlite]
+			!postgres? ( x11-libs/qt-sql:4[sqlite] dev-db/sqlite[threadsafe] )
+			postgres? ( x11-libs/qt-sql:4[postgres] )
 			x11-libs/qt-script:4
 		)
 		X? (
@@ -47,13 +46,9 @@ RDEPEND="
 			webkit? ( x11-libs/qt-webkit:4 )
 		)
 	)
-	ssl? (
-		dev-libs/openssl
-		x11-libs/qt-core:4[ssl]
-	)
+	ssl? ( x11-libs/qt-core:4[ssl] )
 	"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.6"
+DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog README"
 
@@ -95,8 +90,8 @@ src_install() {
 		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"
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel
 	fi
 }
 
@@ -104,18 +99,9 @@ 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 "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."
-		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