Inherit cmake-utils.eclass

(Portage version: 2.1.3.19)

4 files changed, 19 insertions, 41 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index b11a53d3e421..da338353f13c 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.46 2007/12/01 09:36:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.47 2007/12/02 10:33:21 mrness Exp $
+
+*gammu-1.15.0-r1 (02 Dec 2007)
+
+  02 Dec 2007; Alin Năstac <mrness@gentoo.org> -gammu-1.15.0.ebuild,
+  +gammu-1.15.0-r1.ebuild:
+  Inherit cmake-utils.eclass.
 
 *gammu-1.15.0 (01 Dec 2007)
 
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.13.0 b/app-mobilephone/gammu/files/digest-gammu-1.13.0
index 95e327ec3d87..e175a180aedf 100644
--- a/app-mobilephone/gammu/files/digest-gammu-1.13.0
+++ b/app-mobilephone/gammu/files/digest-gammu-1.13.0
@@ -1,3 +1,3 @@
-MD5 f2a9af55ece850cf5917f1365abd186b gammu-1.13.0.tar.bz2 964504
-RMD160 6f9ae52adf89cf5e7d16f9b0531017cd0a5f77d2 gammu-1.13.0.tar.bz2 964504
-SHA256 543cd847431d85cbbbd96c7914a2dd4d9fdcf74419dbe5693b93d8dc94ba945a gammu-1.13.0.tar.bz2 964504
+MD5 59a3417ca7f84ade2433cdbb17a7669c gammu-1.13.0.tar.bz2 661736
+RMD160 6136440ce729ff2bc31f06fe0d2e652f0e268530 gammu-1.13.0.tar.bz2 661736
+SHA256 7fda17cfc2e2eadf43df23ca50a53f3c67f1ccfcf07bf54c085c3a3b5c8a044f gammu-1.13.0.tar.bz2 661736
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.15.0 b/app-mobilephone/gammu/files/digest-gammu-1.15.0-r1
index d8888419920c..d8888419920c 100644
--- a/app-mobilephone/gammu/files/digest-gammu-1.15.0
+++ b/app-mobilephone/gammu/files/digest-gammu-1.15.0-r1
diff --git a/app-mobilephone/gammu/gammu-1.15.0.ebuild b/app-mobilephone/gammu/gammu-1.15.0-r1.ebuild
index 4f6731ca035e..da89617f8207 100644
--- a/app-mobilephone/gammu/gammu-1.15.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.15.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.15.0.ebuild,v 1.1 2007/12/01 09:36:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.15.0-r1.ebuild,v 1.1 2007/12/02 10:33:21 mrness Exp $
 
-inherit multilib
+inherit cmake-utils
 
 DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
 HOMEPAGE="http://www.gammu.org"
@@ -40,40 +40,12 @@ src_unpack() {
 	done
 }
 
-my_use_with() {
-	local WITH_PREFIX
-	if [ -n "${2}" ]; then
-		WITH_PREFIX="-DWITH_${2}"
-	else
-		WITH_PREFIX="-DWITH_${1}"
-	fi
-	if use $1 ; then
-		echo ${WITH_PREFIX}=ON
-	else
-		echo ${WITH_PREFIX}=OFF
-	fi
-}
-
 src_compile() {
-	local myconf="$(my_use_with bluetooth Bluez) \
-		$(my_use_with irda IrDA) \
-		$(my_use_with mysql MySQL) \
-		$(my_use_with postgres Postgres)"
-	use debug && myconf="${myconf} -DCMAKE_BUILD_TYPE=Debug"
-
-	mkdir "${S}/build" && \
-		cd "${S}/build" && \
-		cmake .. \
-			-DCMAKE_INSTALL_PREFIX=/usr \
-			-DINSTALL_LIB_DIR=/usr/$(get_libdir) \
-			-DINSTALL_DOC_DIR="/usr/share/doc/${P}" \
-			-DENABLE_SHARED=ON \
-			-DHAVE_SIN=NO \
-			${myconf} || die "cmake failed"
-	emake || die "make failed"
-}
-
-src_install () {
-	cd "${S}/build"
-	make DESTDIR="${D}" install || die "install failed"
+	# debug flag is used inside cmake-utils.eclass
+	local mycmakeargs="$(cmake-utils_use_with bluetooth Bluez) \
+		$(cmake-utils_use_with irda IrDA) \
+		$(cmake-utils_use_with mysql MySQL) \
+		$(cmake-utils_use_with postgres Postgres) \
+		-DENABLE_SHARED=ON -DHAVE_SIN=NO"
+	cmake-utils_src_compile
 }