gentoo resync : 23.03.2018

10 files changed, 194 insertions, 88 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index a6b76c11d58b..aeac02fcb509 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 3f1d089b6db7..11bf45192283 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -4,10 +4,10 @@ AUX gammu-1.38.4-smsd.patch 717 BLAKE2B ebf49eaf37ebc7bd8f620011971263b33a4a663e
 AUX gammu-skip-locktest.patch 522 BLAKE2B 55345e92e0244081fb4415af97b745878b3168b2c7738900de05f959cabe88400679920d1ea87663b45ad1872c4ec7d85cbe20384d9cd534a40d7aa4090043b2 SHA512 a84eac789df444f734de7273b0571353e242cf579c996d57baec44e7f48ad5505d64c236fc015431684ac874b12777bb0279833671e565b94ba00f49bb612e7a
 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.4.tar.bz2 2132767 BLAKE2B 0780ff2694f7afbe63c5b4c9102005e5f0494932929b635c0252aed52c12e3a3158674b6c49db45459606e77abbe75d8ffb24d52d91ca215b8fae8ba927b7ea6 SHA512 1d4a8e34d3bbc7e4d9797db1acd9be2e92eaec57a87e856ebd168444228a1e89942e69baf1569a0e5645dadea6947338d9e55ae96f632885e95ec1ce74d121ff
 DIST gammu-1.38.5.tar.bz2 2138742 BLAKE2B 7a72a7b67475f73dc3580d618dee379893dc82d7950599b41ed1f7efb5fecd80af3a42a0cc0742cb73d055a4a778eaa4d42037c5be74d9b61a4b53cfe827bd00 SHA512 89a6b3872dfd9b4ebaf8b0f51265fec7e7ef72a42178f85846c7f52d926e96b3087bbe6650c4246e66c2624822021c5803b1bb6ca8ac90f3e5c109a644c0ee80
+DIST gammu-1.39.0.tar.bz2 2151226 BLAKE2B 0e9b7a3f5321a166bbafe833134f49ac8dc93a68c5522be1c16e5ceb894cb242b644761a90188fbc9fa9dd62bde51828a72b29d09fc37b2aa2911d301dffac39 SHA512 ed8994f6ec25d8ddbed23680e8a02db05c8e7f85aa6b8c0d409b5e8377e7c9e07fc61e62d80f6741d648709fb58a10ec631155d8b1ffc1c7d3b6e425cf53c797
 EBUILD gammu-1.33.0-r1.ebuild 2270 BLAKE2B 6eef098acf0508c5b9b18ed0f309f035de0b10108899762a377fd385871eafaa248bac6f0213c5d90655ff5414a95bbd48055680be89e8014945af4c8ce80fcd SHA512 1c95ed281b6fdfee455398bbf9a4032a10d742362d3063fb6532a2863995dac5ca7016d49b2c0003c1b3a9e00f5820d562b38199c9b34b133f05e2da89e0aa6f
 EBUILD gammu-1.36.8.ebuild 1912 BLAKE2B 83e6abe718efd33889357315945fe3883b7bea5c5b90df3c3a9c2d0c28918a7d8eb49cd4f4d5023b232a960f175cf6b65f711cb8255b6aefef18b030f513b07a SHA512 10b381df708e852bd14f34caf6a6af9090387602f8173e299d5ca1c7b37bd751a9343fa761c1005ff33b7fe9ae63ba10249b3e2af93ecbddcf4355ab42c5461c
-EBUILD gammu-1.38.4.ebuild 1423 BLAKE2B 981a3c92cc9e1a98037cd97302d104ae239e66e3fd54f1050099619b199e46eb6d460d9aa713edbfe1a4677fab13c9f2a31ab28123f6696fa1e0a0b872fc3821 SHA512 9c3934d7c2ebd9132da1f5c5719206f24f4a07bdda3b61600b03c1ed6e9bf9013486800d04c92fd56cef5fd94510efa2d07b1a7b537ae9eb6b693077f3df70b5
 EBUILD gammu-1.38.5.ebuild 1370 BLAKE2B 186baca896540594587219a137c496337f85b4270f584d52e2ce6e19969a85c2ca86c93dc55912a788d4c76a4b7a816deca6b6cb3360068644a77e0eba5708c4 SHA512 c6c481ab7206162e59734f04e2c6c5ccf0d9ab27d1de7750b02d89189d71a62db249bc45a0b875a57e9d046f2dd27ccee0be87e4ea2925306e6db81434832c82
+EBUILD gammu-1.39.0.ebuild 1359 BLAKE2B e8ded6da0e4c2b666a2b92c398576b43b82d9fa6376c9bd93644b377bf52a64ad181ba470cef61a93f594d2824e66003cbdaafa0bdbfb430d294ebc09d1fd148 SHA512 dee8d1a1b6197157649d57a8d1e1f6b249e5e03f28916facf0e918fe3eb0dd912bc50f477ba2a04d6c5637bfeb69268e53bc5341fc3eb8bb233d01cc18b10d4f
 MISC metadata.xml 981 BLAKE2B 6918eb352c71db64a9ca356408687888123437160f3cf190e0fca10aa31e614b67aad461884fe7f562a036e8ffe500c49e78afa2ab9070e2a32141adf9a55d21 SHA512 9e50aa06f539259b2f8e5eb8c2b8114435e37a4d84965b86c0629d4933d4dd6a3c1e4e62b7dc5c0e653e3194d5ac0fe50bc7b95b26d0ccea5c02e79d19163595
diff --git a/app-mobilephone/gammu/gammu-1.38.4.ebuild b/app-mobilephone/gammu/gammu-1.39.0.ebuild
index a7afec787ad7..d33aa0433469 100644
--- a/app-mobilephone/gammu/gammu-1.38.4.ebuild
+++ b/app-mobilephone/gammu/gammu-1.39.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 DESCRIPTION="A tool to handle your cellular phone"
 HOMEPAGE="https://wammu.eu/gammu/"
@@ -35,10 +35,6 @@ RDEPEND="
 	dev-util/dialog
 	virtual/libiconv
 "
-PATCHES=(
-	"${FILESDIR}/${P}-smsd.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_BLUETOOTH=$(usex bluetooth)
@@ -59,5 +55,5 @@ src_configure() {
 
 src_test() {
 	addwrite "/run/lock/LCK..bar"
-	MAKEOPTS+=" -j1" LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test
+	LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1
 }
diff --git a/app-mobilephone/qtadb/Manifest b/app-mobilephone/qtadb/Manifest
index 0c91735f75a2..b27d9532544b 100644
--- a/app-mobilephone/qtadb/Manifest
+++ b/app-mobilephone/qtadb/Manifest
@@ -1,3 +1,5 @@
-DIST QtADB_0.8.1_src.zip 1084159 BLAKE2B 8d97024fcccc909d6958168933e5f832fb8ce14aa0ed95b20a2e3c6bb44f9f36451f3c6271991c1a791be56dc5352267d3ffcde60c36795963a4a3e5eac9bc6c SHA512 4bcf28a9442873c3d94c33f5b629c1528efb10a34a6825eb8e596ea6fbb23144a56b64bccc258eaf579ca7d86bd7520f6274d611243290ae6f3bee72021346fa
-EBUILD qtadb-0.8.1.ebuild 1604 BLAKE2B 932c0523754c3eb47455f484f6d2c3685b50a2dcb407c63f380c80a0a72c15c632f5be56dde3e34b952c14bad19064aac666c00f5c90e91515d6df55c768953e SHA512 bc98ecf26ab92204cadfdf25cc67341f5d11e908456f58b70cb75c8a6afbf5c9aa924193c3a811f971f273e0d99a10e7d34e0c2893f604dbc08c32d6bbb2dad5
+AUX qtadb-0.8.1-qt5-5.11.patch 384 BLAKE2B 76487036a89f895231b81193bd556b0d4d6587eb44b2d71ce2c4d14cbf236869513763490031c72dd94f5320a1b1985fefdd1c6f1f87aff073f0c33e60af92ae SHA512 364fa51f7185d09c642b770764cf86ceafceb25b1040b7949e69ae929fd7a3ab9ff3dd9556780466de79ac4a90bbc88e0a71d742b8f279072bd3aa87d2b9b04c
+AUX qtadb-0.8.1-qt5.patch 3359 BLAKE2B 05dd84a9ebc3ab983949e9ce8c10ac675298513e14df1cf2a52a8ed8335d57cdfb04a9c65e05cba7811a9e3f2ec79853102749a3b8009cf36fc0ce3ad91ff1d6 SHA512 f7f9c7521dd0803d588e4393b33bf967ac9d67fddae91f1ca9d4627655690375074ac0f50ab9207fc8ed35b430d91586ce36a519b848685f0b900fe362921306
+DIST qtadb-0.8.1.zip 1104845 BLAKE2B f6f7c08b07c2e59d79e9807850f3ccdedbbc1aff2b94556de748aadc7c26ff8f8bc41275e44e4b4f8249bc1806803c5fea27426d5f895959d546610c0ae07245 SHA512 b407198edd6267ef70e5e2e3b8a094c7b9d9a0bc49dce7e60787e76a1da6e752dd92d7ddbf62a133c44b79118365820b0e710c862c15c9b79f2d7ddf3bc13fd7
+EBUILD qtadb-0.8.1-r1.ebuild 1869 BLAKE2B 335eb5089a109d7af23f4999da7b0c92f7ad9dffaba54cd918c7e29f2626ec73d1d8ba27e4835c3d34f7550c5dce9ae04e42512323b4773800935e69920be619 SHA512 930e186fc27d1e936da2f3b264806fd3413284291dcd5e3f2bf54776d7d45d1b417958d63de0f5291443fbc1f3d2d170b9e2ab4ef6b1c03c2135bb4847f76bee
 MISC metadata.xml 469 BLAKE2B 47cb3dbcd2128018f142cdcebbd1495e4f90b3fb8f069a270d46c34607efdb20fbfa991bca25a103ecb9337ddb572e2c953f40d361a22cff0a12002f18b9d196 SHA512 52d97d9e4f98b46a876805012eaf6b445c3902fa2b0f4bc80457c888a8e751498d22c4eff6424d4d138652dfd14e1f82d562bc424e512d4998bdbecf8af3dd3f
diff --git a/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch
new file mode 100644
index 000000000000..49cd49384810
--- /dev/null
+++ b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch
@@ -0,0 +1,14 @@
+--- a/widgets/filewidget.cpp	2014-11-22 12:44:42.000000000 +0100
++++ b/widgets/filewidget.cpp	2018-03-17 22:52:25.103930971 +0100
+@@ -21,9 +21,10 @@
+ #include "filewidget.h"

+ #include "ui_filewidget.h"

+ 

+-#include <QStandardPaths>

++#include <QHeaderView>

+ #include <QMenu>

+ #include <QScrollBar>

++#include <QStandardPaths>

+ 

+ quint32 qbytearrayToInt32(QByteArray array)

+ {

diff --git a/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5.patch b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5.patch
new file mode 100644
index 000000000000..a9d182a0b6d2
--- /dev/null
+++ b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5.patch
@@ -0,0 +1,100 @@
+--- a/QtADB.pro	2018-03-17 12:44:50.933918102 -0400
++++ b/QtADB.pro	2018-03-17 12:46:04.896502772 -0400
+@@ -14,11 +14,13 @@
+ #   limitations under the License.

+ #

+ #   @author Jakub Motyczko

+ # -------------------------------------------------

+ QT += network

+-QT += declarative

++QT += widgets

++QT += qml

++QT += quick

+ TARGET = QtADB

+ 

+ TEMPLATE = app

+ SOURCES += main.cpp \

+     ./dialogs/mainwindow.cpp \

+--- a/widgets/messagewidget.h	2018-03-17 12:48:28.691864775 -0400
++++ b/widgets/messagewidget.h	2018-03-17 12:49:55.190870634 -0400
+@@ -21,12 +21,13 @@
+ #ifndef MESSAGEWIDGET_H

+ #define MESSAGEWIDGET_H

+ 

+ #include <QtGui>

+ #include <QtNetwork>

++#include <QtWidgets>

++#include <QQmlContext>

++#include <QQuickView>

+-#include <QDeclarativeView>

+-#include <QDeclarativeContext>

+ 

+ #include "../classes/models/messagethreadmodel.h"

+ #include "../classes/models/contactmodel.h"

+ 

+ 

+@@ -46,12 +49,12 @@
+ protected:

+     void changeEvent(QEvent *e);

+ 

+ private:

+     Ui::MessageWidget *ui;

+-    QDeclarativeView *qmlView;

+-    QDeclarativeContext *qmlViewCtx;

++    QQuickView *qmlView;

++    QQmlContext *qmlViewCtx;

+ 

+     MessageModel messageModel;

+     MessageThreadModel messageThreadModel;

+     ContactModel contactModel;

+     QSortFilterProxyModel sortModel;

+--- a/widgets/appwidget.h	2018-03-17 12:58:56.731870593 -0400
++++ b/widgets/appwidget.h	2018-03-17 13:03:39.366822784 -0400
+@@ -20,10 +20,11 @@
+ 

+ #ifndef APPWIDGET_H

+ #define APPWIDGET_H

+ 

+ #include <QtGui>

++#include <QtWidgets>

+ 

+ #include "../classes/phone.h"

+ #include "../classes/computer.h"

+ #include "../dialogs/appinfo.h"

+ #include "../dialogs/appdialog.h"

+--- a/widgets/messagewidget.cpp	2018-03-17 16:34:54.003310530 -0400
++++ b/widgets/messagewidget.cpp	2018-03-17 16:34:14.545124690 -0400
+@@ -51,11 +51,11 @@
+     this->sortContactModel.setSortRole(ContactModel::NameRole);

+     this->sortContactModel.sort(0, Qt::AscendingOrder);

+ 

+     this->messageCount=0;

+ 

+-    this->qmlView =  new QDeclarativeView;

++    this->qmlView =  new QQuickView;

+     this->qmlViewCtx = this->qmlView->rootContext();

+     if (QFile::exists("qml/messageView.qml"))

+         this->qmlView->setSource(QUrl::fromLocalFile("qml/messageView.qml"));

+     else

+         //this->qmlView->setSource(QUrl::fromLocalFile("../messages/qml/messageView.qml"));

+@@ -63,15 +63,17 @@
+     this->qmlViewCtx->setContextProperty("threadModel", &sortThreadModel);

+     this->qmlViewCtx->setContextProperty("contactModel", &sortContactModel);

+     this->qmlViewCtx->setContextProperty("messageModel", &sortModel);

+     this->qmlViewCtx->setContextProperty("myNickname", "Me");

+     this->qmlViewCtx->setContextProperty("contactDefault", "qrc:/icons/contactDefault.png");

+-    qmlView->setResizeMode(QDeclarativeView::SizeRootObjectToView);

+-

++    qmlView->setResizeMode(QQuickView::SizeRootObjectToView);

++    

+     this->qmlViewCtx->setContextProperty("messageWidget", this);

++    QWidget *container = QWidget::createWindowContainer(qmlView, this);

++    container->setFocusPolicy(Qt::TabFocus);

+ 

+-    ui->layoutMessages->addWidget(this->qmlView,1,1);

++    ui->layoutMessages->addWidget(container);

+ 

+     //QSettings settings;

+     //this->sdk = settings.value("sdkPath").toString();

+     this->tcpServer.listen(QHostAddress::Any,4445);

+ 

diff --git a/app-mobilephone/qtadb/qtadb-0.8.1.ebuild b/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild
index 498f747f663a..1c1f06337939 100644
--- a/app-mobilephone/qtadb/qtadb-0.8.1.ebuild
+++ b/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild
@@ -1,38 +1,57 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit eutils readme.gentoo qt4-r2
-
-MY_PN="QtADB"
-MY_P="${MY_PN}_${PV}_src"
+COMMIT=ccbb0c86c9eb
+inherit desktop qmake-utils readme.gentoo-r1
 
 DESCRIPTION="Android phone manager via ADB"
-HOMEPAGE="http://qtadb.wordpress.com"
-SRC_URI="http://${PN}.com/${PN}/${MY_P}.zip"
+HOMEPAGE="https://qtadb.wordpress.com"
+SRC_URI="https://bitbucket.org/michalmotyczko/${PN}/get/${COMMIT}.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-qt/qtgui:4
-	dev-qt/qtdeclarative:4"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-qt5.patch
+	"${FILESDIR}"/${P}-qt5-5.11.patch
+)
 
-S="${WORKDIR}/trunk"
+S="${WORKDIR}/michalmotyczko-${PN}-${COMMIT}"
 
-pkg_setup() {
-	DISABLE_AUTOFORMATTING="yes"
-	DOC_CONTENTS="
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	newicon images/android.png ${PN}.png
+	make_desktop_entry QtADB QtADB ${PN} \
+		"Qt;PDA;Utility;" || ewarn "Desktop entry creation failed"
+	dobin QtADB
+
+	local DOC_CONTENTS="
 You will need a working Android SDK installation (adb and aapt executables)
 You can install Android SDK a) through portage (emerge android-sdk-update-manager
 and run android to download the actual sdk), b) manually from
 http://developer.android.com/sdk/index.html or c) just grab the adb, aapt linux
 binaries from http://qtadb.wordpress.com/download/
-adb and aapt executables are in the platform-tools subdir of Android SDK
+adb and aapt executables are in the platform-tools subdir of Android SDK.  You
+must run QtADB from this directory as a user able to write a log file in this
+directory.
 
 Also you will need to have ROOT access to your phone along with busybox
 The latter can be found in the Android market
@@ -43,12 +62,5 @@ QtADB.apk to your device, available here: http://qtadb.wordpress.com/download/
 If you have trouble getting your phone connected through usb (driver problem),
 try adbWireless from Android market to get connected through WiFi
 "
-}
-
-src_install() {
-	newicon images/android.png ${PN}.png
-	make_desktop_entry ${MY_PN} "${MY_PN}" ${PN} \
-		"Qt;PDA;Utility;" || die "Desktop entry creation failed"
-	dobin ${MY_PN}
 	readme.gentoo_create_doc
 }
diff --git a/app-mobilephone/wammu/Manifest b/app-mobilephone/wammu/Manifest
index daf10e867255..6a669cc92634 100644
--- a/app-mobilephone/wammu/Manifest
+++ b/app-mobilephone/wammu/Manifest
@@ -1,5 +1,5 @@
-DIST wammu-0.40.tar.bz2 687062 BLAKE2B 413736e40bd2a809123e176f2d00042f407c9a8bea0cc9f4a15561b7f96375c30fa1c8fc65ea8613cc7d369df13fa6841f027e69991ba323374b1dc99bf9c86d SHA512 2ed5d5cdd63b3731808c5fa8cc36caf394c4ccf714eb4ef39a25f1e7967d8ccf8b69db5aeff37ff0d1bbf7cefec51fe070a5f0b90d0cb8271f1a3d243eaf06fd
 DIST wammu-0.43.tar.xz 563832 BLAKE2B 26b075d16d6b26608022eac58260083b7883a3c0b0fe8b73984c625f3ecb2a6ce972cb73bc8e5ebe280726447b6fa188716206f7540a9de42013c221a05589dd SHA512 c8f0aad8d8fc2c852638a77b45d48ba3c512a1e1cf8f8dc54b99a614f7338f366494ef88d786143defd77e55ab9597d9c705569c4e0fceb856f29a05b9c6a843
-EBUILD wammu-0.40.ebuild 1330 BLAKE2B fa670d94720d09ae68fa20af07ce0ce930a6c119ce8ef77b9c9a42a52128b4cd9dc383c3e6a8cb2d5ce27e6f0149590bfea458b9e492bc69513caa56da321ff3 SHA512 f9f230a881ea613c096466c8255906139a839f8f13ec6861c4795fad1d1a50150c604292172993aec963a51994f1cd5493c6eeffefe031bf05cc2855687f90da
+DIST wammu-0.44.tar.xz 582284 BLAKE2B ba0523d4778c0fcebc8c86354d503880ea4a34f8ba05e9c4c8ef9b206366ad11c16f85dba2ce19977587aba0bc791adade4d35422a1727b1e042d5be29f39b54 SHA512 9b1a8c9fad2abc618d3e778338446b154516fff9e176aff02ed8daa64ff6e69a591324368dacd50f40c832d16d197447c575644520102317d95c573ed8d6bc7e
 EBUILD wammu-0.43.ebuild 1284 BLAKE2B e22bf2a9425e6dbe1b600cf54c46c9068589d26528f05be0493fd9e41e781899daef8f9e65770d7665c8665e9aa7e33ce1190d13acc48e098a02ceca38e85651 SHA512 f8075664077424838531afc315bccbc256f5de02a7dcd1e2bbb0d5c02dcb986d32ad62ebdf0cb2fd482ad6f7f6fb0126984579ffbb11c54e2c1f3b979f4fed79
+EBUILD wammu-0.44.ebuild 807 BLAKE2B 30eb9847b8ba9417d818b6914a66b278918b5f40cad0c64d089ca992738a43aa8dae1867abdd0c968e722cd9bd7d98af436e0f64327c8bd68142feefa66489ba SHA512 2dfb76c503ed27e92b1b35d1e944435061738e1e1c2d207e7d1b926004e4e33d182cc4d7e2efb8599afd94d308e75a0486b407c9c8093c822bcc93c438b51450
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-mobilephone/wammu/wammu-0.40.ebuild b/app-mobilephone/wammu/wammu-0.40.ebuild
deleted file mode 100644
index 320c41fab713..000000000000
--- a/app-mobilephone/wammu/wammu-0.40.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Front-end for gammu to access mobile phones easily"
-HOMEPAGE="http://www.wammu.eu/"
-SRC_URI="http://dl.cihar.com/wammu/v0/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bluetooth gnome"
-
-RDEPEND="|| ( ( >=app-mobilephone/gammu-1.36 dev-python/python-gammu )
-		>=app-mobilephone/gammu-1.25.0[python] )
-	>=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}]
-	bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}]
-		gnome? ( net-wireless/gnome-bluetooth )
-	)"
-DEPEND="${RDEPEND}"
-
-# Supported languages and translated documentation
-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 uk zh_CN zh_TW"
-
-# Required to source locale content out of the box
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	local lang
-	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if ! has ${lang} ${LINGUAS-${lang}} ; then
-			rm -r locale/${lang} || die
-		fi
-	done
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# SKIPWXCHECK: else 'import wx' results in
-	# Xlib: connection to ":0.0" refused by server
-	SKIPWXCHECK=yes distutils-r1_src_compile
-}
-
-src_install() {
-	SKIPWXCHECK=yes distutils-r1_src_install
-}
diff --git a/app-mobilephone/wammu/wammu-0.44.ebuild b/app-mobilephone/wammu/wammu-0.44.ebuild
new file mode 100644
index 000000000000..9abeda111418
--- /dev/null
+++ b/app-mobilephone/wammu/wammu-0.44.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Front-end for gammu to access mobile phones easily"
+HOMEPAGE="https://www.wammu.eu/"
+SRC_URI="http://dl.cihar.com/wammu/v0/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth gnome"
+
+RDEPEND="
+	>=app-mobilephone/gammu-1.36
+	dev-python/python-gammu
+	>=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}]
+	bluetooth? (
+		dev-python/pybluez[${PYTHON_USEDEP}]
+		gnome? ( net-wireless/gnome-bluetooth )
+	)
+"
+DEPEND="${RDEPEND}"
+
+# Required to source locale content out of the box
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# SKIPWXCHECK: else 'import wx' results in
+# Xlib: connection to ":0.0" refused by server
+SKIPWXCHECK=yes