gentoo resync : 23.03.2018

4 files changed, 153 insertions, 25 deletions

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
 }