[gentoo-commits] gentoo-x86 commit in net-irc/quassel: ChangeLog quassel-9999.ebuild quassel-0.3.0.1-r1.ebuild quassel-0.2.0_rc1-r1.ebuild quassel-0.3.0.1.ebuild quassel-0.3.0-r1.ebuild

[Markus Ullmann (jokey)]

jokey       08/09/28 19:12:21

  Modified:             ChangeLog quassel-9999.ebuild
  Added:                quassel-0.3.0.1-r1.ebuild
  Removed:              quassel-0.2.0_rc1-r1.ebuild quassel-0.3.0.1.ebuild
                        quassel-0.3.0-r1.ebuild
  Log:
  Import some init script fixes and ebuild improvements from Daniel Pielmeier. Drop old as well
  (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

Revision  Changes    Path
1.30                 net-irc/quassel/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.29&r2=1.30

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog	3 Sep 2008 20:43:21 -0000	1.29
+++ ChangeLog	28 Sep 2008 19:12:20 -0000	1.30
@@ -1,6 +1,15 @@
 # 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.29 2008/09/03 20:43:21 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.30 2008/09/28 19:12:20 jokey Exp $
+
+*quassel-0.3.0.1-r1 (28 Sep 2008)
+
+  28 Sep 2008; Markus Ullmann <jokey@g.o> files/quasselcore.conf,
+  files/quasselcore.init, -quassel-0.2.0_rc1-r1.ebuild,
+  -quassel-0.3.0-r1.ebuild, -quassel-0.3.0.1.ebuild,
+  +quassel-0.3.0.1-r1.ebuild, quassel-9999.ebuild:
+  Import some init script fixes and ebuild improvements from Daniel
+  Pielmeier. Drop old as well
 
 *quassel-0.3.0.1 (03 Sep 2008)
 



1.9                  net-irc/quassel/quassel-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.8&r2=1.9

Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- quassel-9999.ebuild	1 Sep 2008 18:51:57 -0000	1.8
+++ quassel-9999.ebuild	28 Sep 2008 19:12:20 -0000	1.9
@@ -1,24 +1,13 @@
 # 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-9999.ebuild,v 1.8 2008/09/01 18:51:57 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.9 2008/09/28 19:12:20 jokey Exp $
 
 EAPI=1
 
-inherit cmake-utils eutils
+inherit cmake-utils eutils git
 
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
-
-	case ${PV} in
-		0.2.9999) EGIT_BRANCH="0.2" ;;
-		*) EGIT_BRANCH="master"
-	esac
-	inherit git
-else
-	MY_P="${P/_/-}"
-	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
-	S=${WORKDIR}/${MY_P}
-fi
+EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
+EGIT_BRANCH="master"
 
 DESCRIPTION="Core/client IRC client."
 HOMEPAGE="http://quassel-irc.org/"
@@ -28,6 +17,11 @@
 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
@@ -37,12 +31,12 @@
 		dbus? ( x11-libs/qt-dbus )
 		ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
+	>=dev-util/cmake-2.6"
 
-DOCS="ChangeLog README README.Qtopia"
+DOCS="AUTHORS ChangeLog README"
 
 pkg_setup() {
-	if ! use server && ! use X; then
+	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
@@ -59,11 +53,21 @@
 }
 
 src_compile() {
+	local MY_LANGUAGES=""
+	for ling in ${LINGUAS}; do
+		if has $ling ${LANGS}; then
+			MY_LANGUAGES="${ling} ${MY_LANGUAGES}"
+		fi
+	done
+
 	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="${MY_LANGUAGES}"
+		-DOXYGEN_ICONS=Builtin
+		-DQUASSEL_ICONS=Builtin
 		-DWANT_MONO=OFF"
 
 	cmake-utils_src_compile
@@ -72,22 +76,35 @@
 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 icons failed"
-	fi
-
-	if use server; then
+	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
+	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
 }



1.1                  net-irc/quassel/quassel-0.3.0.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.3.0.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.3.0.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: quassel-0.3.0.1-r1.ebuild
===================================================================
# 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.0.1-r1.ebuild,v 1.1 2008/09/28 19:12:21 jokey 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() {
	local MY_LANGUAGES=""
	for ling in ${LINGUAS}; do
		if has $ling ${LANGS}; then
			MY_LANGUAGES="${ling} ${MY_LANGUAGES}"
		fi
	done

	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="${MY_LANGUAGES}"
		-DWANT_MONO=OFF"

	cmake-utils_src_compile
}

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
}