* [gentoo-commits] gentoo-x86 commit in net-irc/quassel: quassel-0.3.1-r3.ebuild metadata.xml ChangeLog quassel-9999.ebuild
@ 2009-01-18 19:44 Markus Ullmann (jokey)
0 siblings, 0 replies; only message in thread
From: Markus Ullmann (jokey) @ 2009-01-18 19:44 UTC (permalink / raw
To: gentoo-commits
jokey 09/01/18 19:44:40
Modified: metadata.xml ChangeLog quassel-9999.ebuild
Added: quassel-0.3.1-r3.ebuild
Log:
Cleanups and monolithic flag support from Daniel Pielmeier
(Portage version: 2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64)
Revision Changes Path
1.9 net-irc/quassel/metadata.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?r1=1.8&r2=1.9
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/metadata.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metadata.xml 3 Jan 2009 21:24:31 -0000 1.8
+++ metadata.xml 18 Jan 2009 19:44:40 -0000 1.9
@@ -1,34 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-irc</herd>
- <maintainer>
- <email>daniel.pielmeier@googlemail.com</email>
- <name>Daniel Pielmeier</name>
- </maintainer>
- <maintainer>
- <email>patrick@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="X">
- Build the Qt 4 GUI client for quassel. If this USE flag is
- disabled, the GUI is not built, and cannot be used. You might
- want to disable this on the server, but you need it enabled on
- the client.
- </flag>
- <flag name="phonon">
- Build client with phonon backend support. This enables sound
- playback in client.
- </flag>
- <flag name="server">
- Build the server binary. If this USE flag is disabled, the
- 'core' server binary for quassel is not built, and cannot be
- used. You need this enabled on the server, but you might want to
- disable it on the client.
- </flag>
- <flag name="webkit">
- Use qt-webkit rendering engine for showing url thumbmails and
- for other things that needs webbrowser intergration.
- </flag>
- </use>
+ <herd>net-irc</herd>
+ <maintainer>
+ <email>daniel.pielmeier@googlemail.com</email>
+ <name>Daniel Pielmeier</name>
+ </maintainer>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ </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.
+ </flag>
+ <flag name="phonon">
+ Build client with phonon backend support. This enables sound
+ playback in client.
+ </flag>
+ <flag name="server">
+ Build the server binary. If this USE flag is disabled, the
+ 'core' server binary for quassel is not built, and cannot be
+ used. You need this enabled on the server, but you might want to
+ disable it on the client.
+ </flag>
+ <flag name="webkit">
+ Use qt-webkit rendering engine for showing url thumbmails and
+ for other things that needs webbrowser intergration.
+ </flag>
+ <flag name="X">
+ Build the Qt 4 GUI client for quassel. If this USE flag is
+ disabled, the GUI is not built, and cannot be used. You might
+ want to disable this on the server, but you need it enabled on
+ the client.
+ </flag>
+ </use>
</pkgmetadata>
1.41 net-irc/quassel/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.40&r2=1.41
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ChangeLog 9 Jan 2009 17:53:50 -0000 1.40
+++ ChangeLog 18 Jan 2009 19:44:40 -0000 1.41
@@ -1,6 +1,12 @@
# 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.40 2009/01/09 17:53:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.41 2009/01/18 19:44:40 jokey Exp $
+
+*quassel-0.3.1-r3 (18 Jan 2009)
+
+ 18 Jan 2009; <jokey@gentoo.org> metadata.xml, +quassel-0.3.1-r3.ebuild,
+ quassel-9999.ebuild:
+ Cleanups and monolithic flag support from Daniel Pielmeier
09 Jan 2009; Patrick Lauer <patrick@gentoo.org> quassel-9999.ebuild:
Small configure fix from Sput (upstream) for monolithic build
1.15 net-irc/quassel/quassel-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.14&r2=1.15
Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- quassel-9999.ebuild 9 Jan 2009 17:53:50 -0000 1.14
+++ quassel-9999.ebuild 18 Jan 2009 19:44:40 -0000 1.15
@@ -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.14 2009/01/09 17:53:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.15 2009/01/18 19:44:40 jokey Exp $
EAPI="2"
@@ -15,7 +15,7 @@
LICENSE="GPL-3"
KEYWORDS=""
SLOT="0"
-IUSE="dbus debug kde phonon +server +ssl webkit +X"
+IUSE="dbus debug kde monolithic phonon +server +ssl webkit +X"
LANGS="cs da de fr nb_NO ru tr"
for l in ${LANGS}; do
@@ -25,20 +25,30 @@
RDEPEND="
x11-libs/qt-core:4
dbus? ( x11-libs/qt-dbus:4 )
- server? (
+ monolithic? (
x11-libs/qt-sql:4[sqlite]
x11-libs/qt-script:4
- )
- ssl? (
- dev-libs/openssl
- x11-libs/qt-core:4[ssl]
- )
- 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 )
)
+ !monolithic? (
+ server? (
+ 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"
@@ -46,20 +56,21 @@
DOCS="AUTHORS ChangeLog README"
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."
+ 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() {
-# 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
+# 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 webkit WEBKIT)
$(cmake-utils_use_with dbus DBUS)
$(cmake-utils_use_with kde KDE)
@@ -82,7 +93,6 @@
cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
${mycmakeargs} \
-DLINGUAS="${LINGUAS}" \
- -DCMAKE_INSTALL_DO_STRIP=OFF \
"${S}" || die "Cmake failed"
}
@@ -114,7 +124,7 @@
elog "Please make sure that the quasselcore is stopped before adding more users."
fi
- if use server && use ssl ; then
+ if ( use server || use monolithic ) && 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."
1.1 net-irc/quassel/quassel-0.3.1-r3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.3.1-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.3.1-r3.ebuild?rev=1.1&content-type=text/plain
Index: quassel-0.3.1-r3.ebuild
===================================================================
# 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 $
EAPI=2
inherit cmake-utils eutils
DESCRIPTION="Core/client IRC client."
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"
LANGS="nb_NO da de fr ru"
for l in ${LANGS}; do
IUSE="${IUSE} linguas_${l}"
done
RDEPEND="
x11-libs/qt-core:4
dbus? ( x11-libs/qt-dbus:4 )
monolithic? (
x11-libs/qt-sql:4[sqlite]
x11-libs/qt-script:4
x11-libs/qt-gui:4
x11-libs/qt-webkit:4
)
!monolithic? (
server? (
x11-libs/qt-sql:4[sqlite]
x11-libs/qt-script:4
)
X? (
x11-libs/qt-gui:4
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_compile() {
# 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_with X WEBKIT)
$(cmake-utils_use_with dbus DBUS)
$(cmake-utils_use_with ssl OPENSSL)
-DOXYGEN_ICONS=Builtin
-DQUASSEL_ICONS=Builtin"
_common_configure_code
mkdir -p "${WORKDIR}"/${PN}_build
pushd "${WORKDIR}"/${PN}_build > /dev/null
cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
${mycmakeargs} \
-DLINGUAS="${LINGUAS}" \
"${S}" || die "Cmake failed"
}
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 monolithic ) && 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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-01-18 19:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-18 19:44 [gentoo-commits] gentoo-x86 commit in net-irc/quassel: quassel-0.3.1-r3.ebuild metadata.xml ChangeLog quassel-9999.ebuild Markus Ullmann (jokey)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox