public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-irc/quassel: metadata.xml quassel-9999.ebuild ChangeLog quassel-0.3.0.3.ebuild
@ 2008-11-25  0:24 Jeremy Olexa (darkside)
  0 siblings, 0 replies; only message in thread
From: Jeremy Olexa (darkside) @ 2008-11-25  0:24 UTC (permalink / raw
  To: gentoo-commits

darkside    08/11/25 00:24:42

  Modified:             metadata.xml quassel-9999.ebuild ChangeLog
                        quassel-0.3.0.3.ebuild
  Log:
  cosmetic cleanups for bug #248217 by Daniel Pielmeier (billie). Add myself to metadata until jokey is free again
  (Portage version: 2.2_rc15/cvs/Linux 2.6.27.6 x86_64)

Revision  Changes    Path
1.5                  net-irc/quassel/metadata.xml

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml	7 Oct 2008 20:37:45 -0000	1.4
+++ metadata.xml	25 Nov 2008 00:24:42 -0000	1.5
@@ -3,12 +3,12 @@
 <pkgmetadata>
   <herd>net-irc</herd>
   <maintainer>
-    <email>jokey@gentoo.org</email>
-  </maintainer>
-  <maintainer>
 	  <email>daniel.pielmeier@googlemail.com</email>
 	  <name>Daniel Pielmeier</name>
   </maintainer>
+  <maintainer>
+    <email>darkside@gentoo.org</email>
+  </maintainer>
   <use>
     <flag name="X">
       Build the Qt 4 GUI client for quassel. If this USE flag is



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

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

Index: quassel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quassel-9999.ebuild	7 Oct 2008 20:37:45 -0000	1.10
+++ quassel-9999.ebuild	25 Nov 2008 00:24:42 -0000	1.11
@@ -1,6 +1,6 @@
 # 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.10 2008/10/07 20:37:45 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.11 2008/11/25 00:24:42 darkside Exp $
 
 EAPI=1
 
@@ -17,7 +17,7 @@
 SLOT="0"
 IUSE="+dbus debug +server +ssl +X"
 
-LANGS="nb_NO da de fr"
+LANGS="nb_NO da de fr ru"
 for l in ${LANGS}; do
 	IUSE="${IUSE} linguas_${l}"
 done
@@ -56,25 +56,34 @@
 }
 
 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 X WEBKIT)
-		$(cmake-utils_use_with dbus DBUS)
-		$(cmake-utils_use_with ssl OPENSSL)
-		-DLINGUAS="${MY_LANGUAGES}"
-		-DOXYGEN_ICONS=Builtin
-		-DQUASSEL_ICONS=Builtin
-		-DWANT_MONO=OFF"
+# 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_compile
+	cmake-utils_src_make
 }
 
 src_install() {



1.34                 net-irc/quassel/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog	26 Oct 2008 13:22:39 -0000	1.33
+++ ChangeLog	25 Nov 2008 00:24:42 -0000	1.34
@@ -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.33 2008/10/26 13:22:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.34 2008/11/25 00:24:42 darkside Exp $
+
+  25 Nov 2008; Jeremy Olexa <darkside@gentoo.org> metadata.xml,
+  quassel-0.3.0.3.ebuild, quassel-9999.ebuild:
+  cosmetic cleanups for bug #248217 by Daniel Pielmeier (billie). Add myself
+  to metadata until jokey is free again
 
 *quassel-0.3.0.3 (26 Oct 2008)
 



1.2                  net-irc/quassel/quassel-0.3.0.3.ebuild

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

Index: quassel-0.3.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.3.0.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quassel-0.3.0.3.ebuild	26 Oct 2008 13:22:39 -0000	1.1
+++ quassel-0.3.0.3.ebuild	25 Nov 2008 00:24:42 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2008/10/26 13:22:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.3.0.3.ebuild,v 1.2 2008/11/25 00:24:42 darkside Exp $
 
 EAPI=1
 
@@ -55,22 +55,30 @@
 }
 
 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"
+# 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 dbus DBUS)"
+#		"$(cmake-utils_use_with ssl OPENSSL)"
+#		"-DLINGUAS=\"${LINGUAS}\""
+#		'-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 dbus DBUS) $(cmake-utils_use_with ssl OPENSSL) \
+		-DLINGUAS="${LINGUAS}" -DWANT_MONO=OFF \
+		"${S}" || die "Cmake failed"
 
-	cmake-utils_src_compile
+	cmake-utils_src_make
 }
 
 src_install() {






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-11-25  0:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-25  0:24 [gentoo-commits] gentoo-x86 commit in net-irc/quassel: metadata.xml quassel-9999.ebuild ChangeLog quassel-0.3.0.3.ebuild Jeremy Olexa (darkside)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox