Version bump wrt bug 485260

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

3 files changed, 48 insertions, 27 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 3de56129f9d9..98073ee5dd93 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.94 2013/09/17 21:06:35 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.95 2013/10/09 01:20:17 creffett Exp $
+
+*gammu-1.33.0 (09 Oct 2013)
+
+  09 Oct 2013; Chris Reffett <creffett@gentoo.org> +gammu-1.33.0.ebuild,
+  -gammu-1.25.0-r1.ebuild:
+  Version bump wrt bug 485260
 
 *gammu-1.32.0-r1 (17 Sep 2013)
 
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index f8946c2198b7..29569d901b98 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -4,20 +4,20 @@ Hash: SHA256
 AUX gammu-1.25.0-skip-locktest.patch 584 SHA256 f8c754ba2111cbe8c97a8a53b815d4f4952e6e699df60422889bd3e06a3e3f66 SHA512 e76344b491e568125aaff555532f9dbe52748a11e2de6c9073317809c766d7406eed34e49a887cd651f4f9b6ef5ed9d05bdaed378582dda16dff230a8927719c WHIRLPOOL 4f4ad21f0be3dc1d02c4f396125b7c1177d0cec65902271b12fc72148334ea20890bfa3e399a7206f0ac819e86e6e5397b5ecfd45c86ae13f2dcde7237324cc6
 AUX gammu-1.32.0-bashcompdir.patch 517 SHA256 06cf9783c57f98a9485f099271ddac8b42ef93a940d1cc8188ca79b70fe88d87 SHA512 938734128c82672cc5c10807e47c213a1d13e2de322694ff40d89ddd786f5cc991a978dfb5f78415480af4797831df7619ae689e94cf56a8391473cdd5a5cea0 WHIRLPOOL 4293080cdb1b791ffba08496946d3a95c53a127993785580a3c1be066f1bc3e8340d3f4093ecd3f40bae81acfe05e10d1d5992b0fa8287533bea9fcab4c8fbde
 AUX gammu-skip-locktest.patch 522 SHA256 fe374362358f1120b1f59a4416c0ee048ba9edaabec02ea7871e812e5404db66 SHA512 a84eac789df444f734de7273b0571353e242cf579c996d57baec44e7f48ad5505d64c236fc015431684ac874b12777bb0279833671e565b94ba00f49bb612e7a WHIRLPOOL 77ad5d7000c0d7232d0559dc34dcccc694b0d295613b0c7ae5a7423f91a0042e38518dfd9b93f02561da53f8e74ff81e104de12e06db14a04041629ea80d1aa9
-DIST gammu-1.25.0.tar.bz2 1838498 SHA256 be2c9600d781eb07e1e34975d59d09d8f8701cdb54f3d50a74707f4cdd2d63f5 SHA512 f94fe208c398f9a01898917153b4e78b4714f08d6d466236b0e3084dc04b9ce6ec328653440cbaca03a5386ddf9cb3ef0a2046942df6f61f999f5cc557597ee2 WHIRLPOOL fb0c7cfd15811c78d9c3c1c22aececfc79b16af460c7b95179c06b5682d688d0b5d98b05353e79fd5e406c5f1fbe9b3e60cb0e617ba8566d058dadc7f5ecd378
 DIST gammu-1.28.0.tar.bz2 2391956 SHA256 f620bbb48c15c730cae39feb3e729c6ca070e59ab4e9dee624cc35eae416bf16 SHA512 a183acb6d8120c432630d75cee70e608d3030243084ca1e90c76469d81b358a6e5c16da651a031fb8620410bb131efdaf3926e81662ef3c8356a8631b90f5be7 WHIRLPOOL 5fd3bec505cd66bda14a1949599116fee7b64a00c1ec1621d0af7a35d9cc2b92151f78ba3efdc16be7b7d5a0f539ae0e5e1ed3303294fae7f82042f231b55dc2
 DIST gammu-1.32.0.tar.bz2 6296184 SHA256 de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3 SHA512 8758085c3c3ecb34710513d04ec0e686c8bf06f2c3b60c618eaf77e42eba047f0dbc2898cfbc0c31c0811f30a6c2955cc372e3cb819e7ff41224f55ef1df187d WHIRLPOOL 717ca87674639429a45759b56859c49420e612a8f703003671ca00232ae99ad1424b012d525a65a306baf0ed856d8a61e72105bc89537fcfc12d7bd1210626a4
-EBUILD gammu-1.25.0-r1.ebuild 2615 SHA256 4f4f697aba531a7263c1cad39d61228659ae67f8226be4038671fc175b3e7fdf SHA512 30ba0a41a260be76ecd75586646535fb6db80b445ffa5b8b54192eca3f7175a3f4039cee118d0a069dfb7c3b46c8c51a1a87d44e6474d54b5a51eb925fd24804 WHIRLPOOL bf4b6c9ab73d5fab0a61162da32d6b7d1e0edaa8fdb64d9057e0d45bc250927c72c9c814a605cb3104db55c355acb2aff3194965db28a24d2e748a1d683863b4
+DIST gammu-1.33.0.tar.bz2 6535262 SHA256 b326223e36a334dbaed68252a9cf2d90fd898d6de4d1085dcf9c2320881aece3 SHA512 42252a36c7ad5a2945fcf23fcb1b5bb0201d27e8830d3b4a7f4c36bf00f12f5a0f7797e17098bda8d526d4ddc3b1808c0786dfae0feef9424516fa68bf2f3f1e WHIRLPOOL 27c0110da7b686bc7dd19f4f897c59d4e66aa6dbec78dec208fa8c90f70b80c1375c7b8a4b54fe40295d388de61efb11695823a503d1f85a46797c97ddf988fa
 EBUILD gammu-1.28.0.ebuild 2750 SHA256 f7665dc26e511b087efc82986dc75bb664249d86998533b8bf396d38ba8e5120 SHA512 8570104f707ed6d01503d6bfec93c3b8827fdbe29b834ce209223c7d88452ab43a7bcb6703f55897adcd85db577609f4ed61fb879199724efcb1907e6e42e41b WHIRLPOOL e7b6e69ad3a10def2f37bc7753c8bcc2e2560484a677ba4d13e1681a206a05dfef8b10ee65f8fbbc40dfb84533d1790a59a92dfa9f3e76c8d0807ac8423339a6
 EBUILD gammu-1.32.0-r1.ebuild 2841 SHA256 d703562f850b913e5edcfefad9f0df8bc8ff018addb501f4359de14fd180a67d SHA512 8a22fc640bd08d00851f209684c5ffabd81bbc3709138b8a5402fb2021f3dd03c3b78f5ebda9859de22933ad3a3175bb1d6ff064ec5cd174ac608e93c4c95f78 WHIRLPOOL e501ac0346bad8dea0df671809019e0404c275b05686328045ac4414245bceff2f530fa65daf59eb701574ca8b7976d549e21f4ffc09f24023ecb1831e78bc77
-MISC ChangeLog 17935 SHA256 7785eb9d14f05f822298889b1dfcffe7578a183227d1d7bcddacbedf12e09456 SHA512 2de20bede403a4756d27464ece804ab9757adb9becad80a8c3be2e93206fb82e1202f67efbb70a15b53d90a24136360652b8e005744ed22b405a27051724953a WHIRLPOOL d4e8ce62f3497c995a7e6da6ae904693fa30db9b763e9b4ea5f9dcd556da633b8b7206ac827b4bbdc2891f97ab74ea6cc5ae2c707db1bb991bfbbdbaef6ba616
+EBUILD gammu-1.33.0.ebuild 2838 SHA256 0d061c6c5083856d0363628790fec23ba0e5a5d69d68c4c512dccc3014daa8e7 SHA512 be9deacaed12b9693a5cf401def3b659d88a6aad3fc720f03b35b0582f369f4259449e486c7fcd40ddb78b9eee47f20470005c049f6d5f4c209f11a634a2952a WHIRLPOOL 6e18a940ba02e177b78b2e3b77581416b6a1ccdb27581c7a3dd3b6884c64ab5440ef1156368fe388bb53dd90fbe83dfaafe724590ec341bdd7872ba158548630
+MISC ChangeLog 18095 SHA256 7a20ff0669ad38402f49a492d65a735380b1c489eac1e19eb6d65cb0675a1b1f SHA512 f2fb9e19428274b813ce15be491cc99e42f969efc062ed2a58193553d3468ba3b794efc294e013c71c50f8e1230bcf44768be0bfc7ac7ca0e2684b8ba48621ef WHIRLPOOL 976a42309d19810f4d8663059babc6edab966a2b6e08584b02eaeec89da7dbfb507ac6af9e1616035cbb1696a406fe270370001a76fcb0d2a0957154be342187
 MISC metadata.xml 230 SHA256 b3d8f975317deaaee62c569e9d903ec66989f74df6835aad11938471f239382f SHA512 94f8c1ff0f653b4385d869dff06f0df0d04283b17366502c6a76207e010d04c982ebd4cc00a05c57568a5a267d82135bc68773303c5c672534a5abcd5fc642b1 WHIRLPOOL 888b030dd52b7a187ab8d3caf9b34e007a91386318577b513eeccc601b5bb9f4f1171d3f5d932457522a1d9db56836aebedd4387c0965cbe55209e399f1127f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iKYEAREIAGYFAlI4xFZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iKYEAREIAGYFAlJUr1BfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1QF3ACfbH/GHdJB7Qgkf7DtrpujzOri
-43YAoJk7OjLFzKn+GNVKFDL8EtsFBwoa
-=axPE
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1S5JwCaA/6PwELMWtThU66bhLG4Wm/+
+bIAAn2UfVkfr/RSy55L3bt9CMt6sJ6fm
+=iiX/
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gammu/gammu-1.25.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.33.0.ebuild
index c4311aaa8efb..413e970cacde 100644
--- a/app-mobilephone/gammu/gammu-1.25.0-r1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.33.0.ebuild
@@ -1,41 +1,49 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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-r1.ebuild,v 1.8 2011/08/13 07:15:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.33.0.ebuild,v 1.1 2013/10/09 01:20:17 creffett Exp $
 
-EAPI="3"
+EAPI=5
+
+PYTHON_DEPEND="python? 2"
 
 inherit eutils cmake-utils python
 
-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"
+DESCRIPTION="A tool to handle your cellular phone"
+HOMEPAGE="http://www.wammu.eu/"
+SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl debug bluetooth irda mysql postgres dbi nls python"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion bluetooth curl dbi debug irda mysql nls postgres python usb"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )
 	curl? ( net-misc/curl )
+	usb? ( virtual/libusb:1 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/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
+	dev-util/dialog"
 DEPEND="${RDEPEND}
 	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-	dev-util/cmake"
+	nls? ( sys-devel/gettext )"
 
 # 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 zh_CN zh_TW"
+MY_AVAILABLE_LINGUAS=" af ar bg ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw tr zh_CN zh_TW"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-skip-locktest.patch
+	epatch "${FILESDIR}/${PN}-skip-locktest.patch"
+	epatch "${FILESDIR}/${PN}-1.32.0-bashcompdir.patch"
 
 	local lang support_linguas=no
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
@@ -56,18 +64,25 @@ src_prepare() {
 
 src_configure() {
 	# debug flag is used inside cmake-utils.eclass
-	local mycmakeargs="$(cmake-utils_use_with bluetooth Bluez) \
+	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}"
+		-DBUILD_SHARED_LIBS=ON \
+		-DINSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	if ! use bash-completion; then
+		mycmakeargs+=( -DINSTALL_BASH_COMPLETION=OFF )
+	fi
 	if use python; then
-		mycmakeargs="${mycmakeargs} -DBUILD_PYTHON=/usr/bin/python"
+		mycmakeargs+=( -DBUILD_PYTHON="$(PYTHON -a)" )
 	fi
 	cmake-utils_src_configure
 }
@@ -77,7 +92,7 @@ src_compile() {
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test
+	LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/common" cmake-utils_src_test
 }
 
 src_install() {