cosmetic cleanups for bug #248217 by Daniel Pielmeier (billie). Add myself to metadata until jokey is free again

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27.6 x86_64

5 files changed, 68 insertions, 56 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 78bfbe8ad595..9c1c3e10ffbb 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.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)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 1f8dff4387d0..d39cffb08ecc 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX quasselcore.conf 386 RMD160 01ce00964866419ea2b11c4f23d09a6542d32ccd SHA1 13f2d8da2ec68c6c8db019900abfa2334c1d0652 SHA256 b0e8873ac4a9a1ab78f8b96141e2c0159eeaf7e8ad0c7d8d3e53320fafcef1da
 AUX quasselcore.init 1521 RMD160 f43a3c29f97cc44a6348d9ebf378d0531342cb05 SHA1 a7acf78a66a048a6cdc4cac54dae1f7e7d3d5b3f SHA256 eae2f4d8fb0a13f1bd449ea21d0493b9dcbed1df3417039ebf7b8c999f9a4a51
 DIST quassel-0.3.0.3.tar.bz2 1971668 RMD160 d8b43242fae90b60e1c89246e352e0aa7b5bb6c6 SHA1 36178a1ee155e4514dfc4373b057c5e31f84927f SHA256 78d164d85ce695c3c3cacc2197d95bf8aeca3e6af3e7f450b6960e44ab632049
-EBUILD quassel-0.3.0.3.ebuild 3491 RMD160 dea51b48897923f8d258d2311895ddfdb5979946 SHA1 37b6d37f5128d24d69e43c6d9afea8f30c3fac4d SHA256 a602efa9a616e37b8810995f26a38da1b53964921773bd21706973a8847562a3
-EBUILD quassel-9999.ebuild 3301 RMD160 da94b6f0e67202f39c17de7f9356052984b7ef30 SHA1 2754feb9617d1eb57f00e5aae9350a86fdeeb5b3 SHA256 5887deec6cd905ebe5a3718bd1736e6056c00ca59a4f4feefa6dfab644676abe
-MISC ChangeLog 6499 RMD160 8abcee556a55724d3ae968c5a51e4866cb724ade SHA1 26b1d8e7752e97df53a3dcdda22b50bf9f0c7ae7 SHA256 02a2faf088747f8e8e26213040dbbb78cbdeb6c26b1e229eb6feb9cdbc083756
-MISC metadata.xml 884 RMD160 70cdb9a5239edf2db9ceffa91208a0ab069118c6 SHA1 f0c649796ddf55e73232b764b862f1e55c2e23a5 SHA256 61b4e8b4790efb1fcf7a919d331c495e880bedab0625788eef632270a3297539
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkEfTAACgkQz974XjDVpbm5MgCgpfgxmT1Uilmov6zveZr9wOD1
-lkEAoILrScl7d5+C+nWoit4VRkq8Fz28
-=H5Es
------END PGP SIGNATURE-----
+EBUILD quassel-0.3.0.3.ebuild 3993 RMD160 af9b35252918af925597794179cb4083dd8f0808 SHA1 3d99e37cb6cf4ead2680b3a5028ab73f74f816b5 SHA256 066896bfa59f4ea300a5d1f8fc08563078a797ac78566d4d2f528e3df2ff8a1f
+EBUILD quassel-9999.ebuild 3899 RMD160 14f8b51663eb73476319a1c56075c70880b4c2d6 SHA1 9dd91776ea780bdc8d75fd07660c2781abc09541 SHA256 dad3544e09e7c783c08251b2d1e0777c7f1d4a779652f887c5535b5dfb48ae59
+MISC ChangeLog 6731 RMD160 6efacd7db33ed54fb1c46f5589d9c89d24aed26c SHA1 b83a1fb9edc4db25d7028ca5a2930621662f589c SHA256 955e08a286b77f487c1886b107c0f8a569fe78f4f4a27bfefc75873da69798d2
+MISC metadata.xml 887 RMD160 606065c2788fff44afa4bf67441ba1645326d7c3 SHA1 fe861fad660a65ad1d7742f7596751dec676528f SHA256 3e6cde3e98003b0ebda0a7cc6e22cab62c06e2d64b53ffaa609048f071600266
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index e023b10a7444..14cdc661a4c2 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -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
diff --git a/net-irc/quassel/quassel-0.3.0.3.ebuild b/net-irc/quassel/quassel-0.3.0.3.ebuild
index 65223a4d3531..ffc9a5b978c4 100644
--- a/net-irc/quassel/quassel-0.3.0.3.ebuild
+++ b/net-irc/quassel/quassel-0.3.0.3.ebuild
@@ -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 @@ pkg_setup() {
 }
 
 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
+# 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_make
 }
 
 src_install() {
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index d7e81041d35c..350673a42a1b 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -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 @@ KEYWORDS=""
 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 @@ pkg_setup() {
 }
 
 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"
-
-	cmake-utils_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() {