gentoo resync : 17.10.2017

6 files changed, 124 insertions, 14 deletions

diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 23c088f67984..ae0d14288959 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,10 +1,13 @@
 AUX gammu-1.32.0-bashcompdir.patch 517 SHA256 06cf9783c57f98a9485f099271ddac8b42ef93a940d1cc8188ca79b70fe88d87 SHA512 938734128c82672cc5c10807e47c213a1d13e2de322694ff40d89ddd786f5cc991a978dfb5f78415480af4797831df7619ae689e94cf56a8391473cdd5a5cea0 WHIRLPOOL 4293080cdb1b791ffba08496946d3a95c53a127993785580a3c1be066f1bc3e8340d3f4093ecd3f40bae81acfe05e10d1d5992b0fa8287533bea9fcab4c8fbde
 AUX gammu-1.36.8-bashcompdir.patch 740 SHA256 fa87ed7a7e1ce233b9cae9a1b6b9c971ff341234c484b693d420ca8b2fbd235b SHA512 74e22ec644c8d221ae12c8fb53d713aee978d5d32a72e7d04f9a31af00242b8083a6999005fcd5e2c50f23a1e33fe7db7a510299941069ce5ecdf9dffa486da4 WHIRLPOOL 8a160bab365e598b83e5499dc69b2e17a2d699eefe0284d253daccabc0f454bc9d879c4be6a8236f4595219f0b6ac264c0010549666b0872a6574b935b55dd48
+AUX gammu-1.38.4-smsd.patch 717 SHA256 ae2d75c090bc51fdcaf5d144e164a2199facca113e7d40cb6a4142d69df0dd37 SHA512 8bf02f64a8b1a97bb3cd813e0bb013fd7eb67ae217543a86a71c48e4f458792a5ea77ca87d82e3248a06b1317cddcb30cf2083323b0ea150c11b6abe2db6fd14 WHIRLPOOL 6513a88391493e3884dad02803e0aaefa8c611e883f15ce20ca85437b343ebb3f0080f9d7b6154ab5c4fbd6083f0485fb5694599292d9f3165a3ab59aedcbe9f
 AUX gammu-skip-locktest.patch 522 SHA256 fe374362358f1120b1f59a4416c0ee048ba9edaabec02ea7871e812e5404db66 SHA512 a84eac789df444f734de7273b0571353e242cf579c996d57baec44e7f48ad5505d64c236fc015431684ac874b12777bb0279833671e565b94ba00f49bb612e7a WHIRLPOOL 77ad5d7000c0d7232d0559dc34dcccc694b0d295613b0c7ae5a7423f91a0042e38518dfd9b93f02561da53f8e74ff81e104de12e06db14a04041629ea80d1aa9
 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
-EBUILD gammu-1.33.0-r1.ebuild 2599 SHA256 6982f789e4f62baf1c91ec41822ec523fe3de0f2522fefc8a4966217d05e2f68 SHA512 d004ecc07995d02a67edc275f24ab87b16ebbf51df1d58bb07ec366e4e3fab77e2ab0e290f1216e6dc981b12331401d788195fa0028cf1429fd31c84f25b797f WHIRLPOOL 26a929aa10a6264691c9f0361be602ce22fce2dee3af46616cc33bfbf434cb5487eb9df2b92d3259cb392f219b63ba2e29eb81cb97142abff14822ffc42b11b5
-EBUILD gammu-1.36.8.ebuild 2239 SHA256 13000d8726e5384f20dec3b9b46bc562ace2018bc883a3801ee1582dee7ac090 SHA512 27603bedd9434456c5be4c353fe21a651b0cb67690136c7c00c53fafc029a0a77651a42b1289da1b34118d162919c9b0917d9772cb9825d4804db1b6b90ac2dc WHIRLPOOL 4d4b6ac40f933559619152616df2f54bd6ae1013f8174a26ec50c40b716ab312d80a53af49f9af2bd992ed8db640d708927295234e6eb42627e6bc29593ab89d
+DIST gammu-1.38.4.tar.bz2 2132767 SHA256 31ca9ce966841a9aba1af8397d22d2ae0ab00a6fc9e30211ea040ef4303ad767 SHA512 1d4a8e34d3bbc7e4d9797db1acd9be2e92eaec57a87e856ebd168444228a1e89942e69baf1569a0e5645dadea6947338d9e55ae96f632885e95ec1ce74d121ff WHIRLPOOL 731fb8f6d7e04d0040b59ba62485ed3ea1cb8a8b0e6d1009579bb80f6c39109d1b9cbc54ce0c40a1fdb00dbd2e6bede60bef03188e36bcbb5f464483b1decfe9
+EBUILD gammu-1.33.0-r1.ebuild 2623 SHA256 2da2ded46b0a4af2a040c098cabe551a60ebe6d83e53e1bd0d0d0242eddd1593 SHA512 f7630229ff6f218a284bfdc9db4bd4bb8be7a35171f1e607e6e6b8928c1c4077636c49e79eb063bae0b446df2f254bbbe9337c75e94669278460d094bf273081 WHIRLPOOL 0d0d8731424c2d8faa35927f5fd387240b7d74a659e70a7fae7b0f34a8ff9480ce8965139eddbe39af5559ebc5e04de26bcdcdb55259ae66242080dabbdf846a
+EBUILD gammu-1.36.8.ebuild 2267 SHA256 e1cd85c5276f26733eb366a8bd0c47a0c1683ba2fea6dffed50297597b46dc5c SHA512 edd340232d300d24382cac2eb4200309d5b654c131e37fea1636796d6057a3ef95aa9db2ee6842b36976a9402cbaeb58b0263fb343d1f242152367a608f264ae WHIRLPOOL 6c0a5dcfaaebcfcabba58aa892a40bb73175bdad69625fd63f7446b248f9217571a28123278b40ffa3e4ad06b6a08f39c2a02b121cc43343b5d617de510b6751
+EBUILD gammu-1.38.4.ebuild 1423 SHA256 c63edb2484d8dd04592140fdab81c80901ba383c06d22d08dacd4ceee2aba6c7 SHA512 9c3934d7c2ebd9132da1f5c5719206f24f4a07bdda3b61600b03c1ed6e9bf9013486800d04c92fd56cef5fd94510efa2d07b1a7b537ae9eb6b693077f3df70b5 WHIRLPOOL e43ef28cc764816a8614dd3cd87d287e2c9b8c701cd52dc15f4ab08df29a1a431095bfb54c955d98255ae2b6c8eb070c35bbb1a9f6c5f49dce3153a00dda118e
 MISC ChangeLog 3816 SHA256 1e8624e14812e0ab8940f0f8d26ea12941e601e96e693d6a8e920ca395c3717b SHA512 9627cdf909770fedbfc6d4333dfd2ad7bad0a27a0ec470eff39d4cb25fb7f6b837b1134ba6a72faed8f2e057fe31089df7594e1d26eadb2b2d8913a247914609 WHIRLPOOL 0e0b952326cdb0e3a2d8fa57dda823a0e94b07ccc5550e08a388ec236f60d63bdd883753f50f9197f43a839b3ab4f7b406446f5e62a585c9a2e971ea717001aa
 MISC ChangeLog-2015 19224 SHA256 afe4eaaa598e9e590cd49ea5c2b3882347367f0f0341868fc9a79feae0648469 SHA512 706d8db4ea9871b84b33bf720e6c6803bcd5c8e81ff3beb2aec17daf6170f78f4021698b9bce7e16e08cc6b67561064b4a99f5fd1cbb6e3f7ea298674fb2b639 WHIRLPOOL 237c65a38b647be15e7a0ef55b71ad5ec88f86c60517e998e52e470ac92e5d08a4750451fa45dabe01ed0e8d53a1de5ee8276059aeca5d38b3f4973244ded0d3
-MISC metadata.xml 310 SHA256 c04e4b044ad92ec44a61be87cb08ea1c140deb3468c0affafe6a1d632b35b46b SHA512 503a7549a2d87293b79d28bb84206f27b63fc90e34623fc9dd8b60e08eb19667f993a1d3b1c2a6e6db100b71b39f1e86c45b8c2ccfafb558a18e6435512d9f2a WHIRLPOOL b56009c1c06c776bdf3517d8b3e9cd797f01f862834f232103004647764ef70eb855a45b2b0b077f012d1ff79abfb0c7c78dbf0b9bcd0cd4222e84bf8bec04ff
+MISC metadata.xml 981 SHA256 111ded280b8fcc97708f3d53adc38e1a5b789661165aa11f5742445f08b7d2dc SHA512 9e50aa06f539259b2f8e5eb8c2b8114435e37a4d84965b86c0629d4933d4dd6a3c1e4e62b7dc5c0e653e3194d5ac0fe50bc7b95b26d0ccea5c02e79d19163595 WHIRLPOOL 5ad1614681f98e41b02d71662f585fcff52f7b4163ba03e72b205c9d3966e9bfe2b0ff6056fb8c506cf43f75f46c2671e83c849e69c9d42253dc482edf1bb25f
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 000000000000..cae4afbb6c51
--- /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.000000000 +0300
++++ gammu-1.38.4/smsd/uid.c	2017-10-10 01:48:20.696098522 +0300
+@@ -54,7 +54,7 @@
+     if (pwd == NULL) {
+         /* Try to handle it as a number */
+         uid = strtol(name, &endptr, 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, &endptr, 10);
+-        if (*endptr == 0 && gid > 0) {
++        if (*endptr == 0 && gid >= 0) {
+             grp = getgrgid(gid);
+         }
+     }
+
diff --git a/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild
index b6b80f011f95..367aa128dc29 100644
--- a/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild
@@ -38,13 +38,17 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 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_}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-skip-locktest.patch"
+	"${FILESDIR}/${PN}-1.32.0-bashcompdir.patch"
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-skip-locktest.patch"
-	epatch "${FILESDIR}/${PN}-1.32.0-bashcompdir.patch"
+	cmake-utils_src_prepare
 
 	local lang support_linguas=no
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
diff --git a/app-mobilephone/gammu/gammu-1.36.8.ebuild b/app-mobilephone/gammu/gammu-1.36.8.ebuild
index dd5cc078d7c7..0f6cb475dc5d 100644
--- a/app-mobilephone/gammu/gammu-1.36.8.ebuild
+++ b/app-mobilephone/gammu/gammu-1.36.8.ebuild
@@ -40,9 +40,13 @@ RDEPEND="
 MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr zh_CN zh_TW"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-skip-locktest.patch"
+	"${FILESDIR}/${PN}-1.36.8-bashcompdir.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-skip-locktest.patch" \
-		"${FILESDIR}/${PN}-1.36.8-bashcompdir.patch"
+	cmake-utils_src_prepare
 
 	local lang support_linguas=no
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
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 000000000000..a7afec787ad7
--- /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" LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test
+}
diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml
index f9cc2e6e7a53..c54023b89998 100644
--- a/app-mobilephone/gammu/metadata.xml
+++ b/app-mobilephone/gammu/metadata.xml
@@ -1,11 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="irda">Enables infrared support</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">gammu/gammu</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>coyote@bks.tv</email>
+        <name>Victor Kustov</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="bluetooth">Enables bluetooth support</flag>
+        <flag name="curl">Enables curl support</flag>
+        <flag name="irda">Enables infrared support</flag>
+        <flag name="nls">Enable native language support</flag>
+        <flag name="mysql">Use mysql for data storage</flag>
+        <flag name="odbc">Use ODBC as DB connector</flag>
+        <flag name="postgres">Use PostgreSQL for data storage</flag>
+        <flag name="usb">Enable USB suport</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">gammu/gammu</remote-id>
+    </upstream>
 </pkgmetadata>