Fix typo in src_configure (#283672).

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

6 files changed, 27 insertions, 110 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 35fe6b91b596..47b6cbe2c739 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.74 2009/09/13 14:47:38 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.75 2009/09/21 04:38:37 mrness Exp $
+
+*gammu-1.26.1-r1 (21 Sep 2009)
+*gammu-1.25.0-r1 (21 Sep 2009)
+
+  21 Sep 2009; Alin Năstac <mrness@gentoo.org> -gammu-1.25.0.ebuild,
+  +gammu-1.25.0-r1.ebuild, -gammu-1.26.0.ebuild,
+  -files/gammu-1.26.0-skip-locktest.patch, -gammu-1.26.1.ebuild,
+  +gammu-1.26.1-r1.ebuild:
+  Fix typo in src_configure (#283672).
 
   13 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gammu-1.25.0.ebuild:
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 63778d402af4..211a8834a8ef 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,15 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX gammu-skip-locktest.patch 522 RMD160 f1b8e663e208a5f683917eb8c6db7e11b3f529ac SHA1 ede02cabb8160e9fa5fd4c70078b273b41e129fd SHA256 fe374362358f1120b1f59a4416c0ee048ba9edaabec02ea7871e812e5404db66
 DIST gammu-1.22.1.tar.bz2 1151897 RMD160 f5e8fdbd5281004af1ff49e9f11da13f2fc81531 SHA1 be48205d1c7c9957b6b3a4db11f08fcc14e2c651 SHA256 1dfbbd9b71dc333b1b674d4a881d5610e88b46755a8b5d677795f436031add6b
 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
 DIST gammu-1.26.1.tar.bz2 2113622 RMD160 a913ac6c999f81ab4fda7c1656232484033ac540 SHA1 122886f29c566f72020e91da119e1e04f7bfbec6 SHA256 668eb037af6aa81cc104067dcb8e1cf44000b82a58638cfd485297eec76fda8d
 EBUILD gammu-1.22.1-r2.ebuild 2181 RMD160 f4a14319407c4350bcd265488a53190cba04e3f2 SHA1 e7b929fb9260c25dddcdfc18c2528d3ce88445d9 SHA256 160337e948c1c189add16bd9bd7c86c753678af91d34f1a637e8d2b0e508c9d8
-EBUILD gammu-1.25.0.ebuild 2525 RMD160 7e42b1aab416bafcf5b9b20c8f0384b9c9f3a679 SHA1 8e38e5b35816fc231931f7df5bfc5923a879ca7f SHA256 5fd2907ef8ef0077f227e269a294cb4d33d939f946ab4bf650c4e080535857ed
-EBUILD gammu-1.26.0.ebuild 2594 RMD160 3814e3d8383094c825f9b98a176b1653dc4f6ae0 SHA1 d4697fbaaa5300648598fc11ef2b7798885971b8 SHA256 bf8f375da0f2076ae44cd62a1ed5aa0e7904bfef5a73f9da49d47e1d0964d399
-EBUILD gammu-1.26.1.ebuild 2595 RMD160 28bd2d2b964fb11a6a22f5273d4054b1c31019a8 SHA1 762c7fd3899d44e7d0a7c69cebf06f315df938b8 SHA256 517d1477e5bf0430e28adbe159f4138029bd0e8cda5de33a565fa87de3a84cc1
-MISC ChangeLog 14833 RMD160 8dd655e4bf90a4e342d73ec664fb990a1d1fe1a3 SHA1 bec74ed316ebe3c23db841e81458052b14b75619 SHA256 e6cf8a50dee5cbf546e4c9a26e47f6e7ea1537d6818ff15f985df31c0f277d2b
+EBUILD gammu-1.25.0-r1.ebuild 2527 RMD160 3c444e94eed5ffb865e299e8c026e6d297aaea10 SHA1 fa19def01d89e7a63a84874a0c022d55aea099ed SHA256 17c47532fbf2937d895fc4bfa1aedd31e057927d59cacad8b0cfa4696da7b5d3
+EBUILD gammu-1.26.1-r1.ebuild 2599 RMD160 e9c8854f34debf836aeefb30a7210f0a81245f6a SHA1 046ff37756a421cd30e4d36643e053367c994e3b SHA256 c204dc1f15234c7a0d2a7219da2dc30f1f05889bc66c4295a249c05c1a109e2e
+MISC ChangeLog 15145 RMD160 d4cd83d896b8ae17bb688babe786d20542f5d29e SHA1 b941d546e2dc3ca8895da4445346ae0835a06833 SHA256 0bd34d8dde6fa195450e16e48c118ed1e0f087c65105532b80391590b32788b3
 MISC metadata.xml 286 RMD160 743a9047a6575f7be745a139257a9b73844c9d3a SHA1 a979e63d0fd5cd567c3068860face7f39729c804 SHA256 76fc99ccd4a9df8d5cc0c00d308cb99a56e36f48e2a1d6d4ed48f7d6e1e2a993
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq3A1oACgkQ9A5kJBGSrsuItgCgp7Nlf+9FcRrmsswv4JfAsCWB
+1KoAn1ZfVYhoYQMvrH/t+8aaCD1xqALk
+=rLNj
+-----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
deleted file mode 100644
index 345aa0a0005b..000000000000
--- a/app-mobilephone/gammu/files/gammu-1.26.0-skip-locktest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-r1.ebuild
index 001a2d4a50d5..dd429f13e27f 100644
--- a/app-mobilephone/gammu/gammu-1.25.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.25.0-r1.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.3 2009/09/13 14:47:38 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.25.0-r1.ebuild,v 1.1 2009/09/21 04:38:37 mrness Exp $
 
 EAPI="2"
 
@@ -67,7 +67,7 @@ src_configure() {
 		$(cmake-utils_use_with nls Iconv) \
 		-DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF}"
 	if use python; then
-		mycmakeargs="${mycmakearg} -DBUILD_PYTHON=/usr/bin/python"
+		mycmakeargs="${mycmakeargs} -DBUILD_PYTHON=/usr/bin/python"
 	fi
 	cmake-utils_src_configure
 }
diff --git a/app-mobilephone/gammu/gammu-1.26.0.ebuild b/app-mobilephone/gammu/gammu-1.26.0.ebuild
deleted file mode 100644
index c286bd154457..000000000000
--- a/app-mobilephone/gammu/gammu-1.26.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.26.0.ebuild,v 1.2 2009/09/05 07:23:02 mrness Exp $
-
-EAPI="2"
-
-inherit cmake-utils distutils
-
-DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
-HOMEPAGE="http://www.gammu.org"
-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 python usb"
-
-RDEPEND="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
-	curl? ( net-misc/curl )
-	usb? ( dev-libs/libusb:1 )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	dev-util/dialog
-	dev-lang/python
-	!dev-python/python-gammu" # needs to be removed from the tree
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-	dev-util/cmake"
-
-# sys-devel/gettext is needed for creating .mo files
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" af bg ca cs da de el es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw zh_CN zh_TW"
-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
-			support_linguas=yes
-			break
-		fi
-	done
-	# install all languages when all selected LINGUAS aren't supported
-	if [ "${support_linguas}" = "yes" ]; then
-		for lang in ${MY_AVAILABLE_LINGUAS} ; do
-			if ! use linguas_${lang} ; then
-				rm -rf locale/${lang} || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	# 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 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}"
-	if use python; then
-		mycmakeargs="${mycmakearg} -DBUILD_PYTHON=/usr/bin/python"
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-mobilephone/gammu/gammu-1.26.1.ebuild b/app-mobilephone/gammu/gammu-1.26.1-r1.ebuild
index d0d78005049a..d746c0ae4c9a 100644
--- a/app-mobilephone/gammu/gammu-1.26.1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.26.1-r1.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.26.1.ebuild,v 1.1 2009/09/12 05:03:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.26.1-r1.ebuild,v 1.1 2009/09/21 04:38:37 mrness Exp $
 
 EAPI="2"
 
@@ -69,7 +69,7 @@ src_configure() {
 		$(cmake-utils_use_with nls Iconv) \
 		-DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF}"
 	if use python; then
-		mycmakeargs="${mycmakearg} -DBUILD_PYTHON=/usr/bin/python"
+		mycmakeargs="${mycmakeargs} -DBUILD_PYTHON=/usr/bin/python"
 	fi
 	cmake-utils_src_configure
 }