Add python USE flag (#283671). Version bump (#283670).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 44 insertions, 16 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 4f7d1500259a..2dc9ccafd138 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.71 2009/08/16 08:05:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.72 2009/09/05 06:19:02 mrness Exp $
+
+*gammu-1.26.0 (05 Sep 2009)
+
+  05 Sep 2009; Alin Năstac <mrness@gentoo.org>
+  +files/gammu-1.26.0-skip-locktest.patch, -gammu-1.24.0-r1.ebuild,
+  gammu-1.25.0.ebuild, +gammu-1.26.0.ebuild:
+  Add python USE flag (#283671). Version bump (#283670).
 
 *gammu-1.25.0 (16 Aug 2009)
 
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index f3ffe0f1811d..fe149e77284d 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX gammu-1.22.1-assert.patch 8780 RMD160 39de83bf457ff06c3628c36f0053e7432792e8fb SHA1 090a5bbe8f1c19eac9867dccf7894436093be340 SHA256 ffd531c3fc6236716ab35f74f4e23c7f472eb8aa936e71e614efdea20f0e67b4
 AUX gammu-1.22.1-skip-locktest.patch 584 RMD160 65e7f6ac7851d57c3096842841cf493f5c404f81 SHA1 5332aca814ba23b6da27be18f8a65192712085e0 SHA256 ff69362a3da7a7010bd0383f88c511db6786755a62ec430eb8ef676655a59f51
 AUX gammu-1.25.0-skip-locktest.patch 584 RMD160 b18e3187cba72b475c7d53ad96d5852d44641c79 SHA1 feb3a9ac71a4a10ee77f527c9f07c2b58a285139 SHA256 f8c754ba2111cbe8c97a8a53b815d4f4952e6e699df60422889bd3e06a3e3f66
+AUX gammu-1.26.0-skip-locktest.patch 584 RMD160 e668bd8308acb52e678982b481943e4e4a0f71b9 SHA1 bd84f449b1925ac875e44fc8cf4f1ed06bc0b2db SHA256 933abb018375b11c64b37d910f42d458a7dbcadf3daa29477e26cb5fe7de3b62
 DIST gammu-1.22.1.tar.bz2 1151897 RMD160 f5e8fdbd5281004af1ff49e9f11da13f2fc81531 SHA1 be48205d1c7c9957b6b3a4db11f08fcc14e2c651 SHA256 1dfbbd9b71dc333b1b674d4a881d5610e88b46755a8b5d677795f436031add6b
-DIST gammu-1.24.0.tar.bz2 1817681 RMD160 d525fa09dbcdba87cde6730edc5b55f0f412bd31 SHA1 9c4fc7474c33d3a40e6bf5a2efb7acbbf9b62dc5 SHA256 dbbacb5685b84d3ee181f9172e2818ebbb3b59b088149ebf320ce0c73e71ba1d
 DIST gammu-1.25.0.tar.bz2 1838498 RMD160 034c2a202b3a425025f13a882dfbae428d91b631 SHA1 379f62217f8f26df2119c9b3204bfc126e3d2161 SHA256 be2c9600d781eb07e1e34975d59d09d8f8701cdb54f3d50a74707f4cdd2d63f5
+DIST gammu-1.26.0.tar.bz2 2114328 RMD160 618e6f8d23902f06303bb6bdd3ee8a2b435ca88d SHA1 884e9393473cb3020fde27b1bbef869b48e60ea9 SHA256 4faf6c23bfd99e78343fb20a53ba4915fc8548f1ec24ee7ca803b68d4db43c9d
 EBUILD gammu-1.22.1-r2.ebuild 2181 RMD160 f4a14319407c4350bcd265488a53190cba04e3f2 SHA1 e7b929fb9260c25dddcdfc18c2528d3ce88445d9 SHA256 160337e948c1c189add16bd9bd7c86c753678af91d34f1a637e8d2b0e508c9d8
-EBUILD gammu-1.24.0-r1.ebuild 2446 RMD160 1af01604b4eab488eea9c5be1c04a4186b09cc83 SHA1 95d3cc7b9c02c68905ed3098908e4154464a9dda SHA256 a1dc930d1bca45c5c29aa7ad08dcc9107ca5a97add89290e812c6ddf3666df26
-EBUILD gammu-1.25.0.ebuild 2491 RMD160 93638170316fc246ac4721ab0cc62e201bd65559 SHA1 540a9d45c72bb780df97c8e3bf7e4d86dae42e4a SHA256 feaf6666fa380faf908cfc09a13366ea907222808538677d3abb07062413d197
-MISC ChangeLog 14254 RMD160 081f05ecd2cba3ad9c01808345e615f9e0466720 SHA1 95d6d09ad237f94a13fd01a0c05aa83be3ca264d SHA256 e9c096d68290675dbe84d28103208f02057326274eaa4b0bdabf59c7cafbf513
+EBUILD gammu-1.25.0.ebuild 2591 RMD160 9aaf9a414f4b38d23ecbfcc30319ec7b4dfa3be0 SHA1 3bfbfd1c99dd5e15da3a22f5d71cc9a7d363cc87 SHA256 b913facf29821d7b0af8aa2dbc369b8073d5dda84ff4da521b8db6cf414265e8
+EBUILD gammu-1.26.0.ebuild 2591 RMD160 0f5f3c1de350679d07d6c8df6efc04e35013bd0f SHA1 843b3e852bec3c32a81bcc0caffb788e45879868 SHA256 d87714032da4cdcb502801f0a3b8244ee897e91a7de754518478619e40935de1
+MISC ChangeLog 14502 RMD160 2b16728639f5497b96a24892b24f10160a2b01d4 SHA1 3ea769b18ebb163b79299a6da75c5675aec15ba7 SHA256 7b93c710db29cc8b5dbcf7dd1a55a6d299e0cd2fed1e6ed9aa58c270b4e68945
 MISC metadata.xml 286 RMD160 743a9047a6575f7be745a139257a9b73844c9d3a SHA1 a979e63d0fd5cd567c3068860face7f39729c804 SHA256 76fc99ccd4a9df8d5cc0c00d308cb99a56e36f48e2a1d6d4ed48f7d6e1e2a993
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqHvegACgkQ9A5kJBGSrssznQCgkG9ROdk0Jzk3KgZxmIg5M7UP
-I3AAnAuNwDQoYwZt6/+pJzxpbUBtmzdS
-=1dpZ
+iEYEARECAAYFAkqiAuEACgkQ9A5kJBGSrssW1gCfUcK5E2zLdVHC1tC0aiiuSRnw
+AHQAoIGj9J2DFH/h8btVHHBd0ovyv7+E
+=81Co
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gammu/files/gammu-1.26.0-skip-locktest.patch b/app-mobilephone/gammu/files/gammu-1.26.0-skip-locktest.patch
new file mode 100644
index 000000000000..345aa0a0005b
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.26.0-skip-locktest.patch
@@ -0,0 +1,12 @@
+diff -Nru gammu-1.26.0.orig/tests/CMakeLists.txt gammu-1.26.0/tests/CMakeLists.txt
+--- gammu-1.26.0.orig/tests/CMakeLists.txt	2009-09-04 10:56:25.000000000 +0200
++++ gammu-1.26.0/tests/CMakeLists.txt	2009-09-05 07:46:58.000000000 +0200
+@@ -739,7 +739,7 @@
+ 
+ # Test for locking, only on !WIN32 and if we can write to lock dir
+ if (NOT WIN32)
+-    execute_process(COMMAND test -w /var/lock/ RESULT_VARIABLE VAR_LOCK_WRITABLE)
++    set (VAR_LOCK_WRITABLE 1)
+     if (VAR_LOCK_WRITABLE EQUAL 0)
+         add_executable(locking locking.c)
+         target_link_libraries(locking libGammu)
diff --git a/app-mobilephone/gammu/gammu-1.25.0.ebuild b/app-mobilephone/gammu/gammu-1.25.0.ebuild
index 3eaf32452c11..603bee8763e8 100644
--- a/app-mobilephone/gammu/gammu-1.25.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.25.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.25.0.ebuild,v 1.1 2009/08/16 08:05:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.25.0.ebuild,v 1.2 2009/09/05 06:19:02 mrness Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://dl.cihar.com/gammu/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="curl debug bluetooth irda mysql postgres dbi nls usb"
+IUSE="curl debug bluetooth irda mysql postgres dbi nls python usb"
 
 RDEPEND="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
 	curl? ( net-misc/curl )
@@ -61,13 +61,16 @@ src_configure() {
 		$(cmake-utils_use_with irda IRDA) \
 		$(cmake-utils_use_with curl CURL) \
 		$(cmake-utils_use_with usb USB) \
+		$(cmake-utils_use_with python PYTHON) \
 		$(cmake-utils_use_with mysql MySQL) \
 		$(cmake-utils_use_with postgres Postgres) \
 		$(cmake-utils_use_with dbi LibDBI) \
 		$(cmake-utils_use_with nls GettextLibs) \
 		$(cmake-utils_use_with nls Iconv) \
-		-DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF} \
-		-DBUILD_PYTHON=/usr/bin/python"
+		-DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF}"
+	if use python; then
+		mycmakeargs="${mycmakearg} -DBUILD_PYTHON=/usr/bin/python"
+	fi
 	cmake-utils_src_configure
 }
 
diff --git a/app-mobilephone/gammu/gammu-1.24.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.26.0.ebuild
index 60eb0030f76c..f759b23ea189 100644
--- a/app-mobilephone/gammu/gammu-1.24.0-r1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.26.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.24.0-r1.ebuild,v 1.2 2009/06/15 21:24:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.26.0.ebuild,v 1.1 2009/09/05 06:19:02 mrness Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://dl.cihar.com/gammu/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="curl debug bluetooth irda mysql postgres dbi nls usb"
+IUSE="curl debug bluetooth irda mysql postgres dbi nls python usb"
 
 RDEPEND="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
 	curl? ( net-misc/curl )
@@ -36,6 +36,8 @@ MY_AVAILABLE_LINGUAS=" af bg ca cs da de el es et fi fr gl he hu id it ko nl pl
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-skip-locktest.patch
+
 	local lang support_linguas=no
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
 		if use linguas_${lang} ; then
@@ -59,13 +61,16 @@ src_configure() {
 		$(cmake-utils_use_with irda IRDA) \
 		$(cmake-utils_use_with curl CURL) \
 		$(cmake-utils_use_with usb USB) \
+		$(cmake-utils_use_with python PYTHON) \
 		$(cmake-utils_use_with mysql MySQL) \
 		$(cmake-utils_use_with postgres Postgres) \
 		$(cmake-utils_use_with dbi LibDBI) \
 		$(cmake-utils_use_with nls GettextLibs) \
 		$(cmake-utils_use_with nls Iconv) \
-		-DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF} \
-		-DBUILD_PYTHON=/usr/bin/python"
+		-DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF}"
+	if use python; then
+		mycmakeargs="${mycmakearg} -DBUILD_PYTHON=/usr/bin/python"
+	fi
 	cmake-utils_src_configure
 }