[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gammu/, app-mobilephone/gammu/files/

[Andreas Sturmlechner]

commit: 388ecc249e82835faef95a18f510f86db5ad092c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun  3 12:22:12 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  9 12:15:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388ecc24

app-mobilephone/gammu: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-mobilephone/gammu/Manifest |  2 -
 .../gammu/files/gammu-1.32.0-bashcompdir.patch | 12 ---
 .../gammu/files/gammu-1.36.8-bashcompdir.patch | 12 ---
 .../gammu/files/gammu-skip-locktest.patch  | 12 ---
 app-mobilephone/gammu/gammu-1.33.0-r1.ebuild   | 88 --
 app-mobilephone/gammu/gammu-1.36.8.ebuild  | 77 ---
 6 files changed, 203 deletions(-)

diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 649665a5466..ac09a4322d6 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,4 +1,2 @@
-DIST gammu-1.33.0.tar.bz2 6535262 BLAKE2B 
4a5c22dccfec22f1c4158ac3a98376c7c987769fb1a09e727d47ade735b2643d47a6b19aa43aa274be385fc0bbd8460443870211aee3b37bffc88780a607630b
 SHA512 
42252a36c7ad5a2945fcf23fcb1b5bb0201d27e8830d3b4a7f4c36bf00f12f5a0f7797e17098bda8d526d4ddc3b1808c0786dfae0feef9424516fa68bf2f3f1e
-DIST gammu-1.36.8.tar.bz2 2095289 BLAKE2B 
1c04bc1add840c337499d15c2086155bfb122018cf5b1c6b4c9537a9491f59f57c67b0816c5d3d142fa1d68d6801d3d03468cbde0c228ebd6ebe6830e1f9099f
 SHA512 
4ac86b783570db0105e18ef05fc9408e85d1234ab7de720a232a416ad867d3afbe89db7ed408c06d57f8bb38a2e272f86386f11a89e56f1d750da9e9b579ba09
 DIST gammu-1.38.5.tar.bz2 2138742 BLAKE2B 
7a72a7b67475f73dc3580d618dee379893dc82d7950599b41ed1f7efb5fecd80af3a42a0cc0742cb73d055a4a778eaa4d42037c5be74d9b61a4b53cfe827bd00
 SHA512 
89a6b3872dfd9b4ebaf8b0f51265fec7e7ef72a42178f85846c7f52d926e96b3087bbe6650c4246e66c2624822021c5803b1bb6ca8ac90f3e5c109a644c0ee80
 DIST gammu-1.39.0.tar.bz2 2151226 BLAKE2B 
0e9b7a3f5321a166bbafe833134f49ac8dc93a68c5522be1c16e5ceb894cb242b644761a90188fbc9fa9dd62bde51828a72b29d09fc37b2aa2911d301dffac39
 SHA512 
ed8994f6ec25d8ddbed23680e8a02db05c8e7f85aa6b8c0d409b5e8377e7c9e07fc61e62d80f6741d648709fb58a10ec631155d8b1ffc1c7d3b6e425cf53c797

diff --git a/app-mobilephone/gammu/files/gammu-1.32.0-bashcompdir.patch 
b/app-mobilephone/gammu/files/gammu-1.32.0-bashcompdir.patch
deleted file mode 100644
index d7ae0a5b8b1..000
--- a/app-mobilephone/gammu/files/gammu-1.32.0-bashcompdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN gammu-1.32.0/contrib/CMakeLists.txt 
gammu-1.32.0-patched/contrib/CMakeLists.txt
 gammu-1.32.0/contrib/CMakeLists.txt2012-06-27 04:02:27.0 
-0400
-+++ gammu-1.32.0-patched/contrib/CMakeLists.txt2013-09-17 
16:46:22.852164906 -0400
-@@ -85,7 +85,7 @@
- if (INSTALL_BASH_COMPLETION)
- install (
- FILES bash-completion/gammu
--DESTINATION "/etc/bash_completion.d"
-+DESTINATION "/usr/share/bash-completion/"
- COMPONENT "bash"
- )
- endif (INSTALL_BASH_COMPLETION)

diff --git a/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch 
b/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch
deleted file mode 100644
index aceef3da980..000
--- a/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -BurpN gammu-1.36.8.orig/contrib/CMakeLists.txt 
gammu-1.36.8/contrib/CMakeLists.txt
 gammu-1.36.8.orig/contrib/CMakeLists.txt   2015-12-08 13:38:11.0 
+0300
-+++ gammu-1.36.8/contrib/CMakeLists.txt2016-01-16 15:49:45.870431342 
+0300
-@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES)
- if (INSTALL_BASH_COMPLETION)
- macro_optional_find_package (BashCompletion)
- if (NOT BASH_COMPLETION_FOUND)
--  set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH 
"Location of bash_completion.d")
-+  set (BASH_COMPLETION_COMPLETIONSDIR 
"/usr/share/bash-completion/completions" CACHE PATH "Location of 
bash_completion.d")
- endif (NOT BASH_COMPLETION_FOUND)
- install (
- FILES bash-completion/gammu

diff --git a/app-mobilephone/gammu/files/gammu-skip-locktest.patch 
b/app-mobilephone/gammu/files/gammu-skip-locktest.patch
deleted file mode 100644
index a509879d5ed..000
--- a/app-mobilephone/gammu/files/gammu-skip-locktest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru tests/CMakeLists.txt tests/CMakeLists.txt
 tests/CMakeLists.txt   2009-09-04 10:56:25.0 +0200
-+++ tests/CMakeLists.txt   2009-09-05 07:46:58.0 +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 

[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gammu/, app-mobilephone/gammu/files/

[Michael Palimaka]

commit: 8d0bc939e335e51a0d595db992f081537fb9eb63
Author: coyote  bks  tv>
AuthorDate: Mon Sep  4 15:22:22 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 16 11:13:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0bc939

app-mobilephone/gammu: bump version to 1.38.4

Switch to EAPI=6, exclude unneeded patches, fix automagic to ODBC.

Closes: https://bugs.gentoo.org/608002

 app-mobilephone/gammu/Manifest |  1 +
 .../gammu/files/gammu-1.38.4-smsd.patch| 22 
 app-mobilephone/gammu/gammu-1.38.4.ebuild  | 63 ++
 3 files changed, 86 insertions(+)

diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 08f608eeed4..25de9f8692e 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,2 +1,3 @@
 DIST gammu-1.33.0.tar.bz2 6535262 SHA256 
b326223e36a334dbaed68252a9cf2d90fd898d6de4d1085dcf9c2320881aece3 SHA512 
42252a36c7ad5a2945fcf23fcb1b5bb0201d27e8830d3b4a7f4c36bf00f12f5a0f7797e17098bda8d526d4ddc3b1808c0786dfae0feef9424516fa68bf2f3f1e
 WHIRLPOOL 
27c0110da7b686bc7dd19f4f897c59d4e66aa6dbec78dec208fa8c90f70b80c1375c7b8a4b54fe40295d388de61efb11695823a503d1f85a46797c97ddf988fa
 DIST gammu-1.36.8.tar.bz2 2095289 SHA256 
0ed9c91b4cc5844cad04531e765bc1194cb02bc3e69e6658cd88bfb1cad74f80 SHA512 
4ac86b783570db0105e18ef05fc9408e85d1234ab7de720a232a416ad867d3afbe89db7ed408c06d57f8bb38a2e272f86386f11a89e56f1d750da9e9b579ba09
 WHIRLPOOL 
36172cbf129647b2de48dbbe14122e71fc4f46e2f6ddb29ce546a1e37ea5c2ee0cad28ee37b29b7ddfb9605e6984c6d80d50108bfe0962417da35a1c5b2688ef
+DIST gammu-1.38.4.tar.bz2 2132767 SHA256 
31ca9ce966841a9aba1af8397d22d2ae0ab00a6fc9e30211ea040ef4303ad767 SHA512 
1d4a8e34d3bbc7e4d9797db1acd9be2e92eaec57a87e856ebd168444228a1e89942e69baf1569a0e5645dadea6947338d9e55ae96f632885e95ec1ce74d121ff
 WHIRLPOOL 
731fb8f6d7e04d0040b59ba62485ed3ea1cb8a8b0e6d1009579bb80f6c39109d1b9cbc54ce0c40a1fdb00dbd2e6bede60bef03188e36bcbb5f464483b1decfe9

diff --git a/app-mobilephone/gammu/files/gammu-1.38.4-smsd.patch 
b/app-mobilephone/gammu/files/gammu-1.38.4-smsd.patch
new file mode 100644
index 000..cae4afbb6c5
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.38.4-smsd.patch
@@ -0,0 +1,22 @@
+diff -BurpN gammu-1.36.8.orig/smsd/uid.c gammu-1.38.4/smsd/uid.c
+--- gammu-1.38.4.orig/smsd/uid.c   2017-06-18 14:33:32.0 +0300
 gammu-1.38.4/smsd/uid.c2017-10-10 01:48:20.696098522 +0300
+@@ -54,7 +54,7 @@
+ if (pwd == NULL) {
+ /* Try to handle it as a number */
+ uid = strtol(name, , 10);
+-if (*endptr == 0 && uid > 0) {
++if (*endptr == 0 && uid >= 0) {
+ pwd = getpwuid(uid);
+ }
+ }
+@@ -85,7 +85,7 @@
+ /* Try to handle it as a number */
+ if (grp == NULL) {
+ gid = strtol(name, , 10);
+-if (*endptr == 0 && gid > 0) {
++if (*endptr == 0 && gid >= 0) {
+ grp = getgrgid(gid);
+ }
+ }
+

diff --git a/app-mobilephone/gammu/gammu-1.38.4.ebuild 
b/app-mobilephone/gammu/gammu-1.38.4.ebuild
new file mode 100644
index 000..a7afec787ad
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.38.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+DESCRIPTION="A tool to handle your cellular phone"
+HOMEPAGE="https://wammu.eu/gammu/;
+SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb"
+
+COMMON_DEPEND="
+   dev-libs/glib:2=
+   virtual/libgudev:=
+   bluetooth? ( net-wireless/bluez:= )
+   curl? ( net-misc/curl:= )
+   dbi? ( >=dev-db/libdbi-0.8.3:= )
+   mysql? ( virtual/mysql:= )
+   postgres? ( dev-db/postgresql:= )
+   usb? ( virtual/libusb:1= )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   irda? ( virtual/os-headers )
+   nls? ( sys-devel/gettext )
+   odbc? ( dev-db/unixODBC )
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   dev-util/dialog
+   virtual/libiconv
+"
+PATCHES=(
+   "${FILESDIR}/${P}-smsd.patch"
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_BLUETOOTH=$(usex bluetooth)
+   -DWITH_CURL=$(usex curl)
+   -DWITH_Gettext=$(usex nls)
+   -DWITH_Iconv=$(usex nls)
+   -DWITH_IRDA=$(usex irda)
+   -DWITH_LibDBI=$(usex dbi)
+   -DWITH_MySQL=$(usex mysql)
+   -DWITH_ODBC=$(usex odbc)
+   -DWITH_Postgres=$(usex postgres)
+   -DWITH_USB=$(usex usb)
+   -DBUILD_SHARED_LIBS=ON
+   -DINSTALL_DOC_DIR="share/doc/${PF}"
+   )
+   cmake-utils_src_configure
+}
+
+src_test() {
+   addwrite "/run/lock/LCK..bar"
+   MAKEOPTS+=" -j1"