Small fixes to make things actually work. Again.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.26.5 x86_64

3 files changed, 131 insertions, 2 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 673f5588009f..1e2fed2e7108 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.36 2008/11/28 21:11:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.37 2008/11/28 22:14:02 patrick Exp $
+
+*quassel-0.3.1-r2 (28 Nov 2008)
+
+  28 Nov 2008; Patrick Lauer <patrick@gentoo.org> +quassel-0.3.1-r2.ebuild:
+  Oh dear. Small fixes to make Daniel happy.
 
 *quassel-0.3.1-r1 (28 Nov 2008)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index e3ea57a1a7b9..8bf4b837bdf3 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,7 +4,8 @@ DIST quassel-0.3.0.3.tar.bz2 1971668 RMD160 d8b43242fae90b60e1c89246e352e0aa7b5b
 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 3bb3e11f345da521ca41bece699e4912cb890ad6 SHA1 efa1ce1aba7ab98d37b30da7f04730a0680acfad SHA256 6a70f83c6af52622dc4c157f6ecdb04cb4f49d84508b10afe43ee4c1368e951d
 EBUILD quassel-0.3.1.ebuild 3990 RMD160 e54ebbf948ce1a993d975515b120348472a1be12 SHA1 9da36b01151b49cec1c1c0a7c5325189e83160ab SHA256 cb2c4d39fa7ffc8b62b1e618547c010f557cbdf06d254281828dfdbc6a00f975
 EBUILD quassel-9999.ebuild 3899 RMD160 14f8b51663eb73476319a1c56075c70880b4c2d6 SHA1 9dd91776ea780bdc8d75fd07660c2781abc09541 SHA256 dad3544e09e7c783c08251b2d1e0777c7f1d4a779652f887c5535b5dfb48ae59
-MISC ChangeLog 7148 RMD160 2436aa13420b36191d6b6dc8bca64a29f47fe223 SHA1 10bd10a82aa2876bc2c479df934e1922c382bd4f SHA256 1d26a3f470657bce0fc866a76162be24211bfd63e2d3fff2fed419d42e0a14d0
+MISC ChangeLog 7303 RMD160 65cf8b0f80b4bec7f392d0ad2eddde74b8fdec02 SHA1 f5d7bba5f46784dfccff6aeb6e94c5d470325779 SHA256 382d85c25551ad585ecd8fe6d851d8c6ff2919e21b9daf9b954068a5ac7373ba
 MISC metadata.xml 956 RMD160 a7e7e9d1a271e2ded4a04d01814aa713ff1a6623 SHA1 128d51488a56ed154f0cc84f3ce9ff19039bea4a SHA256 85679e271887d39177b6e5d26f35d23f289641ebece7046b3b84acd00042ab51
diff --git a/net-irc/quassel/quassel-0.3.1-r2.ebuild b/net-irc/quassel/quassel-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..70cb436c40d8
--- /dev/null
+++ b/net-irc/quassel/quassel-0.3.1-r2.ebuild
@@ -0,0 +1,123 @@
+# 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-r2.ebuild,v 1.1 2008/11/28 22:14:02 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 X WEBKIT)" 
+#		"$(cmake-utils_use_with dbus DBUS)"
+#		"$(cmake-utils_use_with ssl OPENSSL)"
+#		"-DLINGUAS=\"${LINGUAS}\""
+#               '-DOXYGEN_ICONS=Builtin' 
+#               '-DQUASSEL_ICONS=Builtin'
+#		'-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 -DQUASSEL_ICONS=Builtin -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
+}