* [gentoo-commits] gentoo-x86 commit in net-irc/quassel: metadata.xml ChangeLog quassel-9999.ebuild
@ 2009-01-03 21:24 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-01-03 21:24 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/01/03 21:24:31
Modified: metadata.xml ChangeLog quassel-9999.ebuild
Log:
Fix build issues in live. Basic ebuild from patrick, i am proxying because he cant test.
(Portage version: 2.2_rc20/cvs/Linux 2.6.27-gentoo x86_64)
Revision Changes Path
1.8 net-irc/quassel/metadata.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?r1=1.7&r2=1.8
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml 29 Nov 2008 17:58:44 -0000 1.7
+++ metadata.xml 3 Jan 2009 21:24:31 -0000 1.8
@@ -15,12 +15,20 @@
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>
+ <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>
+ <flag name="webkit">
+ Use qt-webkit rendering engine for showing url thumbmails and
+ for other things that needs webbrowser intergration.
+ </flag>
</use>
</pkgmetadata>
1.39 net-irc/quassel/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.38&r2=1.39
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog 29 Nov 2008 17:58:44 -0000 1.38
+++ ChangeLog 3 Jan 2009 21:24:31 -0000 1.39
@@ -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.38 2008/11/29 17:58:44 darkside Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.39 2009/01/03 21:24:31 scarabeus Exp $
+
+ 03 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml,
+ quassel-9999.ebuild:
+ Fix build issues in live. Basic ebuild from patrick, i am proxying because
+ he cant test.
29 Nov 2008; Jeremy Olexa <darkside@gentoo.org> metadata.xml:
patrick will be the sole proxy committer now, removing myself from metadata
1.12 net-irc/quassel/quassel-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.11&r2=1.12
Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- quassel-9999.ebuild 25 Nov 2008 00:24:42 -0000 1.11
+++ quassel-9999.ebuild 3 Jan 2009 21:24:31 -0000 1.12
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.11 2008/11/25 00:24:42 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.12 2009/01/03 21:24:31 scarabeus Exp $
-EAPI=1
+EAPI="2"
inherit cmake-utils eutils git
@@ -15,24 +15,31 @@
LICENSE="GPL-3"
KEYWORDS=""
SLOT="0"
-IUSE="+dbus debug +server +ssl +X"
+IUSE="dbus debug kde phonon +server +ssl webkit +X"
-LANGS="nb_NO da de fr ru"
+LANGS="cs da de fr nb_NO ru tr"
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 )"
+RDEPEND="
+ x11-libs/qt-core:4
+ dbus? ( x11-libs/qt-dbus:4 )
+ server? (
+ 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 )
+ )
+ "
DEPEND="${RDEPEND}
>=dev-util/cmake-2.6"
@@ -43,47 +50,41 @@
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
+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
# 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
+ local mycmakeargs="$(cmake-utils_use_want server CORE)
+ $(cmake-utils_use_want X QTCLIENT)
+ $(cmake-utils_use_with webkit WEBKIT)
+ $(cmake-utils_use_with dbus DBUS)
+ $(cmake-utils_use_with kde KDE)
+ $(cmake-utils_use_with phonon PHONON)
+ $(cmake-utils_use_with ssl OPENSSL)"
+
+ if use kde ; then
+ # We don't use our own phonon backend, so don't enable it; also use system icon themes
+ mycmakeargs="${mycmakeargs} -DWITH_PHONON=0 -DOXYGEN_ICONS=External -DQUASSEL_ICONS=External"
+ else
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_with phonon PHONON)
+ -DOXYGEN_ICONS=Builtin -DQUASSEL_ICONS=Builtin"
+ fi
+
_common_configure_code
+ mkdir -p "${WORKDIR}"/${PN}_build
+ pushd "${WORKDIR}"/${PN}_build > /dev/null
+
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 \
+ ${mycmakeargs} \
+ -DLINGUAS="${LINGUAS}" \
+ -DCMAKE_INSTALL_DO_STRIP=OFF \
"${S}" || die "Cmake failed"
- cmake-utils_src_make
}
src_install() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-irc/quassel: metadata.xml ChangeLog quassel-9999.ebuild
@ 2009-10-28 19:24 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-10-28 19:24 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/10/28 19:24:09
Modified: metadata.xml ChangeLog quassel-9999.ebuild
Log:
Update live ebuild. Also i should add myself to maintainers. :]
(Portage version: 2.2_rc46/cvs/Linux i686)
Revision Changes Path
1.14 net-irc/quassel/metadata.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?r1=1.13&r2=1.14
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml 4 Sep 2009 20:42:23 -0000 1.13
+++ metadata.xml 28 Oct 2009 19:24:09 -0000 1.14
@@ -10,6 +10,10 @@
<email>patrick@gentoo.org</email>
</maintainer>
<maintainer>
+ <email>scarabeus@gentoo.org</email>
+ <name>Tomáš Chvátal</name>
+ </maintainer>
+ <maintainer>
<email>sputnick@quassel-irc.org</email>
<description>Upstream author, please CC on bugs</description>
</maintainer>
1.67 net-irc/quassel/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.66&r2=1.67
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog 25 Oct 2009 22:43:50 -0000 1.66
+++ ChangeLog 28 Oct 2009 19:24:09 -0000 1.67
@@ -1,6 +1,10 @@
# 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.66 2009/10/25 22:43:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.67 2009/10/28 19:24:09 scarabeus Exp $
+
+ 28 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild,
+ metadata.xml:
+ Update live ebuild. Also i should add myself to maintainers. :]
25 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild:
Simplify oxygen useflag to be dependant on kde instead of its own.
1.26 net-irc/quassel/quassel-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.25&r2=1.26
Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- quassel-9999.ebuild 25 Oct 2009 22:43:50 -0000 1.25
+++ quassel-9999.ebuild 28 Oct 2009 19:24:09 -0000 1.26
@@ -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.25 2009/10/25 22:43:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.26 2009/10/28 19:24:09 scarabeus Exp $
EAPI="2"
@@ -17,11 +17,6 @@
SLOT="0"
IUSE="dbus debug kde monolithic phonon postgres +server +ssl webkit +X"
-LANGS="cs da de fi fr hu it nb_NO ru sl tr"
-for l in ${LANGS}; do
- IUSE="${IUSE} linguas_${l}"
-done
-
RDEPEND="
dbus? ( x11-libs/qt-dbus:4 )
monolithic? (
@@ -61,11 +56,6 @@
}
src_configure() {
- local my_langs
- for i in ${LINGUAS}; do
- my_langs="${i},${my_langs}"
- done
-
local mycmakeargs="
$(cmake-utils_use_want X QTCLIENT)
$(cmake-utils_use_want server CORE)
@@ -78,8 +68,7 @@
$(cmake-utils_use_with !kde OXYGEN)
-DWITH_LIBINDICATE=OFF
-DEMBED_DATA=OFF
- -DLINGUAS=${my_langs}
- "
+ "
cmake-utils_src_configure
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-irc/quassel: metadata.xml ChangeLog quassel-9999.ebuild
@ 2009-10-30 0:17 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-10-30 0:17 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/10/30 00:17:29
Modified: metadata.xml ChangeLog quassel-9999.ebuild
Log:
Use our brand new added libindicate-qt.
(Portage version: 2.2_rc46/cvs/Linux i686)
Revision Changes Path
1.15 net-irc/quassel/metadata.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?r1=1.14&r2=1.15
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/metadata.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- metadata.xml 28 Oct 2009 19:24:09 -0000 1.14
+++ metadata.xml 30 Oct 2009 00:17:28 -0000 1.15
@@ -48,5 +48,9 @@
want to disable this on the server, but you need it enabled on
the client.
</flag>
+ <flag name="ayatana">
+ Build in support for Ayatana notification using the libindicate-qt
+ plugin.
+ </flag>
</use>
</pkgmetadata>
1.68 net-irc/quassel/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.67&r2=1.68
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog 28 Oct 2009 19:24:09 -0000 1.67
+++ ChangeLog 30 Oct 2009 00:17:28 -0000 1.68
@@ -1,6 +1,10 @@
# 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.67 2009/10/28 19:24:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.68 2009/10/30 00:17:28 scarabeus Exp $
+
+ 30 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild,
+ metadata.xml:
+ Use our brand new added libindicate-qt.
28 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild,
metadata.xml:
1.27 net-irc/quassel/quassel-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.26&r2=1.27
Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- quassel-9999.ebuild 28 Oct 2009 19:24:09 -0000 1.26
+++ quassel-9999.ebuild 30 Oct 2009 00:17:28 -0000 1.27
@@ -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.26 2009/10/28 19:24:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.27 2009/10/30 00:17:28 scarabeus Exp $
EAPI="2"
@@ -15,7 +15,7 @@
LICENSE="GPL-3"
KEYWORDS=""
SLOT="0"
-IUSE="dbus debug kde monolithic phonon postgres +server +ssl webkit +X"
+IUSE="ayatana dbus debug kde monolithic phonon postgres +server +ssl webkit +X"
RDEPEND="
dbus? ( x11-libs/qt-dbus:4 )
@@ -24,6 +24,7 @@
postgres? ( x11-libs/qt-sql:4[postgres] >=virtual/postgresql-base-8.3 )
x11-libs/qt-script:4
x11-libs/qt-gui:4
+ ayatana? ( dev-libs/libindicate-qt )
kde? ( >=kde-base/kdelibs-4.3 )
phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
webkit? ( x11-libs/qt-webkit:4 )
@@ -36,6 +37,7 @@
)
X? (
x11-libs/qt-gui:4
+ ayatana? ( dev-libs/libindicate-qt )
kde? ( >=kde-base/kdelibs-4.1 )
phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
webkit? ( x11-libs/qt-webkit:4 )
@@ -57,16 +59,16 @@
src_configure() {
local mycmakeargs="
+ $(cmake-utils_use_with ayatana LIBINDICATE)
$(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 webkit)
+ $(cmake-utils_use_with phonon)
+ $(cmake-utils_use_with kde)
+ $(cmake-utils_use_with dbus)
$(cmake-utils_use_with ssl OPENSSL)
$(cmake-utils_use_with !kde OXYGEN)
- -DWITH_LIBINDICATE=OFF
-DEMBED_DATA=OFF
"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-10-30 0:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-30 0:17 [gentoo-commits] gentoo-x86 commit in net-irc/quassel: metadata.xml ChangeLog quassel-9999.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2009-10-28 19:24 Tomas Chvatal (scarabeus)
2009-01-03 21:24 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox