gentoo resync : 10.11.2019

7 files changed, 64 insertions, 151 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index aca96c4e3311..346791b0f7fb 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/cobex/Manifest b/app-mobilephone/cobex/Manifest
deleted file mode 100644
index 51ac18de799c..000000000000
--- a/app-mobilephone/cobex/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cobex-0.2.13-build.patch 2725 BLAKE2B 39fbcc67b43548dcd703ce19a30cd06ac361f280c30b86039728a2d86680ab7ac84179627506119b4c4ddfebee2c44403ee4fbe8c1edc614e42fe010e34616bc SHA512 62458ff64467f3a29f298fa0f54d2fc220f9c4b35fa93eacd1ff7f62b38827940fb4cb7b1fee48136518d61ff008f0612913645183e2a2ffbcd3d4c9faff7fa5
-DIST cobex-0.2.13.tar.gz 27020 BLAKE2B cb5dc2a52f8e94bb3d59d64e15f730f04a8315b9ff668314795621fb0b90fd2293d343b6210a21df9c3c284ae698deba6cd6973b19d439447edaa7077d32fa8a SHA512 f05293d9d9f9fdf04809f2a5395bf8be3dd8bfbc592a9ca93b3b2e9b2a78157291b6d38e53b9c7f86e0e32567ee6d4028a9c48062eab4640c9cd85894e7e6a84
-EBUILD cobex-0.2.13.ebuild 685 BLAKE2B 2872d76b285940dc57df2e6d0c1074a0e1f0afeb5af615c8329ac0cc67a1e21b9a72f42dfb5eb8e5a4dc8f9d91a6fe6f670f3a42f1167b08485868abf987e620 SHA512 77f99af528025fcd010995516d20a46e9a474299ad420b5ddde548726aadcb4dca7746fe20db403c849b177d5a4440316d29fe0861955cf10683c1f7642f8d85
-MISC metadata.xml 242 BLAKE2B afe71b6e55885504e3d6f9c42d6b22980beab6e746009ce8df18a45dc3f43cb3ff76599a7d9793e14c1df4501241ad1db0ba3b458ef2c18dea4e928d572a94f9 SHA512 e5b7fb02f748e2655e6c03a88c34366e510087229269e450465b9d8094983edef80eee1de64e273e435b31961ec0786d6a86cbf6cfed7c7124419b789496215c
diff --git a/app-mobilephone/cobex/cobex-0.2.13.ebuild b/app-mobilephone/cobex/cobex-0.2.13.ebuild
deleted file mode 100644
index 060d72031b58..000000000000
--- a/app-mobilephone/cobex/cobex-0.2.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="small implementation of Obex for phones using the DCU-11 USB-to-serial adapter"
-HOMEPAGE="http://cobex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cobex/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-libs/libezV24
-	dev-libs/expat"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	local f
-	for f in get ls mkdir put rm ; do mv ${f}.c cobex_${f}.c || die ; done
-}
-
-src_install() {
-	dobin cobex_{ls,mkdir,put,rm} || die
-	dodoc Changelog README Things_to_know_T310.txt
-}
diff --git a/app-mobilephone/cobex/files/cobex-0.2.13-build.patch b/app-mobilephone/cobex/files/cobex-0.2.13-build.patch
deleted file mode 100644
index 32ac20deb671..000000000000
--- a/app-mobilephone/cobex/files/cobex-0.2.13-build.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -1,75 +1,37 @@
--CC=gcc
--CCFLAGS=-O2 -Wall
--EXTRACCFLAGS=-s -lezV24
--EXPATCCFLAGS=-lexpat
--CFILES=put.c get.c cobex_core.c ls.c cobex_tools.c cobex_serial.c rm.c mkdir.c
--HFILES=cobex_defs.h cobex_core.h capabilities.h cobex_tools.h cobex_serial.h
--O2FILES=cobex_core.o cobex_tools.o cobex_serial.o
--PUTO=put.o
--GETO=get.o
--LSO=ls.o
--RMO=rm.o
--MKDIRO=mkdir.o
--CAPAO=capability.o
--COBEXPUT=cobex_put
--COBEXGET=cobex_get
--COBEXLS=cobex_ls
--COBEXRM=cobex_rm
--COBEXCAPA=cobex_capa
--COBEXMKDIR=cobex_mkdir
-+CC ?= gcc
-+CFLAGS ?= -O2
-+CFLAGS += -Wall
-+LDLIBS += -lezV24
-+
-+PROGS = cobex_put cobex_get cobex_ls cobex_rm cobex_mkdir
-+CFILES = $(wildcard *.c)
-+HFILES = $(wildcard *.h)
-+O2FILES = cobex_core.o cobex_tools.o cobex_serial.o
-+
- EXTRAFILES = README Changelog COPYING Makefile cobex_put.pl Things_to_know_T310.txt Hacking_pl2303_driver.txt
- VERSION = 0.2.13
- PROJNAME = cobex-$(VERSION)
- 
--all: $(COBEXPUT) $(COBEXGET) $(COBEXLS) $(COBEXRM) $(COBEXMKDIR)
-+all: $(PROGS)
- 
- model:
- 	cd modeldb && make all 
- 
--$(COBEXPUT): $(O2FILES) $(PUTO)
--	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXPUT) $(PUTO) $(O2FILES)
--
--$(COBEXGET): $(O2FILES) $(GETO)
--	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXGET) $(GETO) $(O2FILES)
--
--$(COBEXRM): $(O2FILES) $(RMO)
--	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXRM) $(RMO) $(O2FILES)
--
--$(COBEXLS): $(O2FILES) $(LSO)
--	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) $(EXPATCCFLAGS) -o $(COBEXLS) $(LSO) $(O2FILES)
--
--$(COBEXCAPA): $(O2FILES) $(CAPAO)
--	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXCAPA) $(CAPAO) $(O2FILES)
--
--$(COBEXMKDIR): $(O2FILES) $(MKDIRO)
--	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXMKDIR) $(MKDIRO) $(O2FILES)
--
--
--test2: $(O2FILES) test2.o
--	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) $(EXPATCCFLAGS) -o test2 test2.o $(O2FILES)
--
--.c.o:
--	$(CC) $(CCFLAGS) $(LOCKSERIAL) -c $<
--
--$(PUTO): put.c $(O2FILES)
--
--$(GETO): get.c $(O2FILES)
--
--$(LSO): ls.c $(O2FILES)
--
--$(RMO): rm.c $(O2FILES)
--
--test2.o: test2.c $(O2FILES)
--
--cobex_core.o: cobex_core.c cobex_core.h cobex_defs.h
--
--cobex_tools.o: cobex_tools.c cobex_tools.h cobex_defs.h cobex_core.c cobex_core.h
--
--cobex_serial.o: cobex_serial.c cobex_serial.h cobex_core.c cobex_core.h
-+cobex_put:   $(O2FILES)
-+cobex_get:   $(O2FILES)
-+cobex_ls:    $(O2FILES)
-+cobex_rm:    $(O2FILES)
-+cobex_mkdir: $(O2FILES)
-+cobex_capa:  $(O2FILES)
-+
-+cobex_ls: LDLIBS += -lexpat
-+
-+-include .depend
-+.depend: $(CFILES) $(HFILES)
-+	$(CC) -MM $^ > .depend
- 
- clean:
--	rm -f *.o
--	cd modeldb && make clean
-+	rm -f *.o $(PROGS)
- 
- printfiles: $(CFILES) $(HFILES)
- 	@echo $?
-@@ -88,3 +50,5 @@
- 
- dist-contrib :
- 	cd contrib && make dist VERSION=$(VERSION)
-+
-+.PHONY: all clean dist dist2 dist-modeldb dist-contrib model printfiles
diff --git a/app-mobilephone/cobex/metadata.xml b/app-mobilephone/cobex/metadata.xml
deleted file mode 100644
index f39727f3d846..000000000000
--- a/app-mobilephone/cobex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cobex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index afcae8fc75d2..02a4e7f42c1c 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,7 +1,9 @@
 DIST gammu-1.38.5.tar.bz2 2138742 BLAKE2B 7a72a7b67475f73dc3580d618dee379893dc82d7950599b41ed1f7efb5fecd80af3a42a0cc0742cb73d055a4a778eaa4d42037c5be74d9b61a4b53cfe827bd00 SHA512 89a6b3872dfd9b4ebaf8b0f51265fec7e7ef72a42178f85846c7f52d926e96b3087bbe6650c4246e66c2624822021c5803b1bb6ca8ac90f3e5c109a644c0ee80
 DIST gammu-1.39.0.tar.bz2 2151226 BLAKE2B 0e9b7a3f5321a166bbafe833134f49ac8dc93a68c5522be1c16e5ceb894cb242b644761a90188fbc9fa9dd62bde51828a72b29d09fc37b2aa2911d301dffac39 SHA512 ed8994f6ec25d8ddbed23680e8a02db05c8e7f85aa6b8c0d409b5e8377e7c9e07fc61e62d80f6741d648709fb58a10ec631155d8b1ffc1c7d3b6e425cf53c797
 DIST gammu-1.40.0.tar.bz2 2156194 BLAKE2B b030e1293eaf1aeb38a553d45507ec2c3b4ba9ae34e7cb6589a60bd34451b545cc8e1f7bebfe28c9c1a12c89cecedeac17ffe27ddffab27c274590801b2091dc SHA512 6dbab68f30567a501487cf4edf19e23b7b23b7b78e3dfff69fc8d3c95b62f74ee14fe25ca380eac071e67f1a523dfd69cb9137fe049bf6477dfcc94930b71ce9
+DIST gammu-1.41.0.tar.bz2 2167233 BLAKE2B 4b0bf77246cc6a07a52457cff2bae44e63ebfe2715cb0c0b7d89c3d6352bb2df4cd5e7fd9b62d316e316fb1e73108fe561e030b7444eccd601cd0d2541b9f0e9 SHA512 f2c2534d3827216bf015607431938e0cf2524d5f2c670a5f76bb5ab7928962d22de981bbbf2dfa7af833c7903b60a775242048210bac6c35b1a9ee7668db4543
 EBUILD gammu-1.38.5.ebuild 1368 BLAKE2B 2c839ea8c30ee57cb22841e676a99ef6fcb77a2a895213bbc5be1c7cdf666460922458867a6c3f1d1b7fecabdc8a75c7b0ade783537d171856f8dd32db1297b0 SHA512 a41824eb92b71bcaa43ae4f008ca889a5da22b670e9803ae9231feffc040bcc1aeb28d22f69663671dde66cc4422b3fb2d503cae690159db96c10534be957d74
 EBUILD gammu-1.39.0-r1.ebuild 1368 BLAKE2B 2987c753bfbbe73bf2af17111e7cb22a30fd343ce783fc0e0eb531266e88f7999a4cacbde4531cf672cc30e4de70af012a5e8004fa5079e02c2508fc5a7875dc SHA512 bcef70f25d22081b8b2c27c851604411335b29e3d50d9b2adacde6437c164d8e9fa0fd5517eb81175857c986fddcc4c30ecc561bb4791bc6b5fff2bb550a324e
 EBUILD gammu-1.40.0.ebuild 1438 BLAKE2B 34d577a833cb0061384fc17088333f1a4000c851734f182337b52d8ed7dd6a2201c1e1c4bb9adfe0cab77a49350b2955a5f8e59b1d6007026e60fb72d192b24f SHA512 916d69b55e0937e6f9f86692064646aabb4e7a1c7b650aa32e9e8d98592a5e424420e9de4b4a6ba6bd079c6e2eb8bb6c7638bd3fa1ffe54eb4b8677a3bb69356
+EBUILD gammu-1.41.0.ebuild 1410 BLAKE2B b0d67c04169eaf7b92c6394526ed385bb00db790bf6cbcfb21366a32a89d6d20b84bb18310de7da469662faa2236c926f89c1d09ef52f4d3732c1e48a89c72ed SHA512 988584adcbdc8af34333eb779c8cededc4df84561da0434eec83d13737983597eaa87f1f2b3015538d068f2426311214a86671acb83cd0dbdba2b06fa7fa4773
 MISC metadata.xml 984 BLAKE2B 3e0df0fd12d705aae2205d86942131a2cc482aeef6a4c963d8179fb84189df45eaa294b7701a0d0ada00596d171808df6e7f0c9f7b1b4f0467cddd12ee47b316 SHA512 2d6eeac0eb8c89178ee3c66f778d5db8e9b24bd645a47ba2996c0e676ba229f59fa2e1be908ee46a5e182c18d0638e473d8076cede396c910157bd286f084397
diff --git a/app-mobilephone/gammu/gammu-1.41.0.ebuild b/app-mobilephone/gammu/gammu-1.41.0.ebuild
new file mode 100644
index 000000000000..8be8100b03e1
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.41.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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"
+
+DEPEND="
+	dev-libs/glib:2=
+	virtual/libgudev:=
+	virtual/libiconv
+	bluetooth? ( net-wireless/bluez:= )
+	curl? ( net-misc/curl:= )
+	dbi? ( >=dev-db/libdbi-0.8.3:= )
+	irda? ( virtual/os-headers )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:= )
+	usb? ( virtual/libusb:1= )
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-util/dialog
+"
+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"
+	LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1
+}
+
+src_install() {
+	cmake-utils_src_install
+	docompress -x /usr/share/doc/${PF}/examples/
+}