Inherit cmake-utils.eclass

Package-Manager: portage-2.1.3.19

5 files changed, 37 insertions, 59 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/Manifest b/app-mobilephone/gammu/Manifest
index 107e5f6c1a2d..e5562c2c461b 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -15,7 +15,7 @@ RMD160 3e1d92f54e05e8e6d0b3e4483fc207881c523f44 files/gammu-1.13.0-fixups.patch
 SHA256 850ffc6bf2437a2785dfff0aa2e43bb0512d48e31c39305b6e5328ef5c09ef03 files/gammu-1.13.0-fixups.patch 3927
 DIST gammu-1.11.0.tar.bz2 920489 RMD160 903624c472b9d5225783e064d3a393060a4dcc37 SHA1 8bc28d3dbea86c9076ed5712ced316017c47ccaa SHA256 5d18cbf162edb8f54c47621b8dbf0683359e74ad67a985360cfcc4c810f2a086
 DIST gammu-1.12.0.tar.bz2 940565 RMD160 a44b351777ab6c5d635401e968eb853d2508102b SHA1 0a4fb2745a90cc503e86ad0bb90a27e5e283d2ca SHA256 4ab84e05440f82bcc440030752fcf482a15d284f40de08f2240d43bc528c4fa1
-DIST gammu-1.13.0.tar.bz2 964504 RMD160 6f9ae52adf89cf5e7d16f9b0531017cd0a5f77d2 SHA1 c0d3e9e31b59241553eee39890e3d4321787760b SHA256 543cd847431d85cbbbd96c7914a2dd4d9fdcf74419dbe5693b93d8dc94ba945a
+DIST gammu-1.13.0.tar.bz2 661736 RMD160 6136440ce729ff2bc31f06fe0d2e652f0e268530 SHA1 830fc3a9284fbd4481133bfed4966b9777b72195 SHA256 7fda17cfc2e2eadf43df23ca50a53f3c67f1ccfcf07bf54c085c3a3b5c8a044f
 DIST gammu-1.15.0.tar.bz2 1022842 RMD160 5e38423a56909c3c7a2aa19c8c13d4e221cfb180 SHA1 0988525449a13c36f689661c04c5da1863f6e238 SHA256 1f0987e3fd3fa2d771f5db55c5ad18205a6d561cda9f120af28c1dae6ef0ba35
 EBUILD gammu-1.11.0.ebuild 1352 RMD160 8c50aba0a27bd6920a1046a1f396cd15f4fe8b4c SHA1 d80d69d8740d8c17475e88d89f8b1c2acd9b3da4 SHA256 719c8d9d280e1eee1f1c942d52d9012e19baccf42ea7262ca6d51dce365a6d96
 MD5 aa00b9f44ffdb7ba372f5dba867347dd gammu-1.11.0.ebuild 1352
@@ -29,14 +29,14 @@ EBUILD gammu-1.13.0.ebuild 2042 RMD160 ab38c54ebad39fe1c338b94f19840b761a2de4d5
 MD5 9c12e71121ca156bac4f0532e768e479 gammu-1.13.0.ebuild 2042
 RMD160 ab38c54ebad39fe1c338b94f19840b761a2de4d5 gammu-1.13.0.ebuild 2042
 SHA256 a55a32a172bd1c512a448348f86ab52aea37993d5ab850015672a8d66e571293 gammu-1.13.0.ebuild 2042
-EBUILD gammu-1.15.0.ebuild 2013 RMD160 5dfb759c5569a37a0bd5fe85ddb0e2152fcf1925 SHA1 c584de88f4c23a76738277408d845ab229590494 SHA256 358ee5b2505e9c28e05c57ff11f61decdc8016d3f4bc78e2b141a21c327d3ce0
-MD5 9da6ac0b7bc30d93c3af9768d736edff gammu-1.15.0.ebuild 2013
-RMD160 5dfb759c5569a37a0bd5fe85ddb0e2152fcf1925 gammu-1.15.0.ebuild 2013
-SHA256 358ee5b2505e9c28e05c57ff11f61decdc8016d3f4bc78e2b141a21c327d3ce0 gammu-1.15.0.ebuild 2013
-MISC ChangeLog 10468 RMD160 ed73dbcd57fb67f233add50953ab268830662cd0 SHA1 6030778c1bc099a76a61fd67478ed499a683f4da SHA256 09d7a833ee55393164811e4716b762314f7ea6800738dab3c104cbfe10e097aa
-MD5 0bf3f291b88b5005545810d767a3db5b ChangeLog 10468
-RMD160 ed73dbcd57fb67f233add50953ab268830662cd0 ChangeLog 10468
-SHA256 09d7a833ee55393164811e4716b762314f7ea6800738dab3c104cbfe10e097aa ChangeLog 10468
+EBUILD gammu-1.15.0-r1.ebuild 1527 RMD160 8b1d6a5fc1f37eb1c159cc41b01c8067c03e8139 SHA1 a314c9a99c043f688bceb55ab78757eda3ccee9a SHA256 fdd147370cae0de7d5dd0cc9fd8b9a55696b438c8d1311449caa0c58fcef76e9
+MD5 bed0b9b6d9ad33862312f4ab27347a65 gammu-1.15.0-r1.ebuild 1527
+RMD160 8b1d6a5fc1f37eb1c159cc41b01c8067c03e8139 gammu-1.15.0-r1.ebuild 1527
+SHA256 fdd147370cae0de7d5dd0cc9fd8b9a55696b438c8d1311449caa0c58fcef76e9 gammu-1.15.0-r1.ebuild 1527
+MISC ChangeLog 10628 RMD160 010b27ecf7d809d648951489a88217f22f0d8bc6 SHA1 fa69218b43b759e9b5689d00c5d014dde227d0f9 SHA256 25a5a51d8a1a5a51263d37bf34d59a648edd130ce3601e9eef5da5f4f2ba03df
+MD5 8740750df7249060a0be019f396c1a02 ChangeLog 10628
+RMD160 010b27ecf7d809d648951489a88217f22f0d8bc6 ChangeLog 10628
+SHA256 25a5a51d8a1a5a51263d37bf34d59a648edd130ce3601e9eef5da5f4f2ba03df ChangeLog 10628
 MISC metadata.xml 165 RMD160 1bf9089beacb19ba770d553d02356566ecd76892 SHA1 866903a1177187bfcc803fb62e0e3be2a2674481 SHA256 576ea680ccc744a6279987ce542f52f215515a2b4e95bd08c61a66bba9af1c57
 MD5 8e1fd49c29f85eea8da87d6e7de450c6 metadata.xml 165
 RMD160 1bf9089beacb19ba770d553d02356566ecd76892 metadata.xml 165
@@ -47,16 +47,16 @@ SHA256 a6d97b3634b05fbfa6d0ae1fd9aecec5dc0eb3f52264579765f9b848c628f50d files/di
 MD5 7318f9f3624fff2a584efafaa8e94338 files/digest-gammu-1.12.0 241
 RMD160 7e56e9857a035cf147ebcdff71a324d7f00c9143 files/digest-gammu-1.12.0 241
 SHA256 a32ed8faf55d46766d9aaab4314552e297b9f99f21ab846edba1faa81530cd65 files/digest-gammu-1.12.0 241
-MD5 d4a4c86ae5981bb486fd420322babe1e files/digest-gammu-1.13.0 241
-RMD160 3316a0ef6ed31f7d9054a5c21a5f1152dbcd63c5 files/digest-gammu-1.13.0 241
-SHA256 39e102a6cf73983dea4f724f95027379d797a25a3cde2b17122268a0a3d5eef1 files/digest-gammu-1.13.0 241
-MD5 777350bc2dc51efc2b6383d6a175813c files/digest-gammu-1.15.0 244
-RMD160 1cf9be984dcdd67904869658f955ffaf65ebac35 files/digest-gammu-1.15.0 244
-SHA256 39887b029ab4d5fe2b44cda3913eb6398696a3bdd9a50ee239041e5502ba994d files/digest-gammu-1.15.0 244
+MD5 265e325df63a75b82b5ebb987b98f9ab files/digest-gammu-1.13.0 241
+RMD160 06738bcf9eb55f75d6a780339ce21a741946e888 files/digest-gammu-1.13.0 241
+SHA256 8aaf298e6954f091d7c6d4a79e56d4135b6aef9a63af20f2c7606da6170c67f0 files/digest-gammu-1.13.0 241
+MD5 777350bc2dc51efc2b6383d6a175813c files/digest-gammu-1.15.0-r1 244
+RMD160 1cf9be984dcdd67904869658f955ffaf65ebac35 files/digest-gammu-1.15.0-r1 244
+SHA256 39887b029ab4d5fe2b44cda3913eb6398696a3bdd9a50ee239041e5502ba994d files/digest-gammu-1.15.0-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHUSscVSA5X31g7/gRAgqkAJ0TqVtOVTHudUsuGfJ5PAMFA3JwbwCfQ2nX
-YPlL5lvFOXpiMEoUWWkpZQ8=
-=bVpP
+iD8DBQFHUon+VSA5X31g7/gRAgfeAJ9VJtksx6+LD7OuwmdQQsSWOUN9JgCdGZj0
+2q/PTot/Yr8KfcBa/1d3f2Q=
+=XVpO
 -----END PGP SIGNATURE-----
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
 }