net-im/qutecom: fix cmake-utils_use_enable calls and allow building with mercurial present

svn path=/sunrise/; revision=7123

4 files changed, 37 insertions, 6 deletions

diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog
index 6ec1fc36e..800604c05 100644
--- a/net-im/qutecom/ChangeLog
+++ b/net-im/qutecom/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Sep 2008; Chi-Thanh Christopher Nguyen (chithead)
+  <chithanh@cs.tu-berlin.de> -qutecom-2.2_rc1.ebuild,
+  +qutecom-2.2_rc1-r1.ebuild, +files/qutecom-cmake-hg-svnrevision.patch:
+  fix cmake-utils_use_enable calls and allow building with mercurial present
+
   18 Sep 2008; Chi-Thanh Christopher Nguyen (chithead)
   <chithanh@cs.tu-berlin.de> qutecom-2.2_rc1.ebuild:
   fix variable assignment
diff --git a/net-im/qutecom/Manifest b/net-im/qutecom/Manifest
index 03e31f657..4611318eb 100644
--- a/net-im/qutecom/Manifest
+++ b/net-im/qutecom/Manifest
@@ -1,8 +1,9 @@
 AUX qutecom-boost-1.35.patch 627 RMD160 758262f720f3d4b303ee40d5f22b5b984009792d SHA1 6592513ab8296d2e89673956f79d6d8a0206cdaf SHA256 7e3b4d19f957007ac27f7bdb0ce689a061b69e316dc297ad17c2ff34a8aa77b7
+AUX qutecom-cmake-hg-svnrevision.patch 1132 RMD160 60de7a9bd0f7b4ef2e40e822472135f6d7946540 SHA1 a85f0444ccd97fa40dc60a5be139e64b7cc05067 SHA256 01b4f7c725bc3e65b68225642841c6895061c7726231632e72abcd30a9b51da3
 AUX qutecom-cstdlib-include.patch 371 RMD160 b2bf62fba4de1c384b6e2d586aea0171ba04d2af SHA1 cba8bdff1395c2e9396e244848ef9e729ad16b2e SHA256 ace997b0049720714bf538b564597a5ba755ff3408023042fe11d15bb8e900ad
 AUX qutecom-gcc-4.3-switch-enum.patch 892 RMD160 89bb4421383bb263b65b302f3909edc9c250d467 SHA1 b8ee70f9f28dec35cb3bb324586872ba2b0ce666 SHA256 db5da9b715991dab954bce5cd8970dabec2cc8700540363ce1aac4242f958ce3
 AUX qutecom-types.h.patch 345 RMD160 3e847c147ee686933d87bfde97b57b1d12d74898 SHA1 fdae61a25fdbc3cad0a0e6f3b3857456ca8acc4d SHA256 b65cca74d41d941aff7467cf1f0ad863b5d504f74b80378bf65457cf1ab114c4
 DIST qutecom-2.2-RC1.tar.gz 43137488 RMD160 33ce9c89660699547c9bfc3dbd77051862622a34 SHA1 fc8dd06339a03806611d93a66c98450d584fbebf SHA256 ec729be2eec6704f11401b4e0f3a2356e884b3d20702ebd3419cf02c197e8eaf
-EBUILD qutecom-2.2_rc1.ebuild 1536 RMD160 829abf3829d04f799570b785a9e1f78d545f2ff4 SHA1 ec1d7479ff6be4c896fb6551bef2b7585dbb54c9 SHA256 c3c93b8a871657cb9f5d2e056ccedaf5c794fa896c40dc8b517ddd7411e42f39
-MISC ChangeLog 556 RMD160 5e7f40eaf7fdb73b4ea6f85d59527e546f55b682 SHA1 aa880df0fc7001527cf1a629fa7bd24ff311fb8b SHA256 425267b0147624d295478830993f889966429c87d3171d30920d71cb73d3144b
+EBUILD qutecom-2.2_rc1-r1.ebuild 1615 RMD160 997ae000a9d89ebfcd100f1a02a6063432219794 SHA1 cd051ac84f36eec82876c8fef6e67dc8d345d499 SHA256 0e69a59794422c63cb0065ac8cb55385b4fe3eed24172a7026226f076e71e358
+MISC ChangeLog 816 RMD160 e18d1311f8ce6ba899887903bb0b31e56136ef72 SHA1 58ab749b4dd9afc983a27583481747ee017d6c16 SHA256 a42144126dcbf7ad4bb904aa549e977d3bb38068389561e154644ac4e401579e
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-im/qutecom/files/qutecom-cmake-hg-svnrevision.patch b/net-im/qutecom/files/qutecom-cmake-hg-svnrevision.patch
new file mode 100644
index 000000000..a97a9fe7d
--- /dev/null
+++ b/net-im/qutecom/files/qutecom-cmake-hg-svnrevision.patch
@@ -0,0 +1,24 @@
+diff -ur a/owbuild/owbuild/OWGlobalVariables.cmake b/owbuild/owbuild/OWGlobalVariables.cmake
+--- a/owbuild/owbuild/OWGlobalVariables.cmake	2008-08-21 15:10:12.000000000 +0200
++++ b/owbuild/owbuild/OWGlobalVariables.cmake	2008-09-19 13:20:23.705870719 +0200
+@@ -1,6 +1,6 @@
+ # Defines global public variables
+ #
+-# CMAKE_BUILD_TYPE = set to Debug by default

++# CMAKE_BUILD_TYPE = set to Debug by default
+ # BUILD_TYPE = same as CMAKE_BUILD_TYPE but lowercase (debug, release, minsizerel...)
+ # BUILD_DIR = directory where compiled files will be copied, ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE} by default
+ # LOCALE_COPY_DIR = location for translations files (*.qm), ${BUILD_DIR}/lang by default
+@@ -46,10 +46,10 @@
+ 
+ # Gets svn revision
+ set(SVN_REVISION "0")
+-ow_get_hg_revision(SVN_REVISION)
++#ow_get_hg_revision(SVN_REVISION)
+ # Bugfix with svn revision number that can integrate a : and
+ # this does not work under Windows for the installer name, replace it by -
+-string(REPLACE ":" "-" SVN_REVISION ${SVN_REVISION})
++#string(REPLACE ":" "-" SVN_REVISION ${SVN_REVISION})
+ 
+ # Gets current date time
+ set(CURRENT_DATE_TIME "0")
diff --git a/net-im/qutecom/qutecom-2.2_rc1.ebuild b/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild
index fa5b2d6cd..9d7f6a47b 100644
--- a/net-im/qutecom/qutecom-2.2_rc1.ebuild
+++ b/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild
@@ -42,14 +42,15 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-types.h.patch
 	epatch "${FILESDIR}"/${PN}-cstdlib-include.patch
 	epatch "${FILESDIR}"/${PN}-gcc-4.3-switch-enum.patch
+	epatch "${FILESDIR}"/${PN}-cmake-hg-svnrevision.patch
 }
 
 src_compile() {
 	EXTRA_ECONF=" \
-		$(cmake_use_enable portaudio PORTAUDIO_SUPPORT) \
-		$(cmake_use_enable alsa PHAPI_AUDIO_ALSA_SUPPORT) \
-		$(cmake_use_enable oss PHAPI_AUDIO_OSS_SUPPORT) \
-		$(cmake_use_enable xv WENGOPHONE_XV_SUPPORT) "
+		$(cmake-utils_use_enable portaudio PORTAUDIO_SUPPORT) \
+		$(cmake-utils_use_enable alsa PHAPI_AUDIO_ALSA_SUPPORT) \
+		$(cmake-utils_use_enable oss PHAPI_AUDIO_OSS_SUPPORT) \
+		$(cmake-utils_use_enable xv WENGOPHONE_XV_SUPPORT) "
 
 	cmake-utils_src_configureout
 	cmake-utils_src_make