x11-libs/qtermwidget: bump to EAPI="7" and apply general updates

- Remove 'nofetch' patch, which does not apply any longer as it is,
  and upstream has changed their translation set-up away from
  'lxqt-base/lxqt-l10n', so disabling them may need a different
  approach.
- Bump the required 'lxqt-build-tools' version.
- Use the same formatting for SRC_URI and friends, as is used in
  other related packages.
- Update SRC_URI, HOMEPAGE, LICENSE, and SLOT.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch b/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
deleted file mode 100644 (file)
index a4827d6..0000000
--- a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Do not fetch translations using git at build time.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,9 +29,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- 
- find_package(Qt5Widgets "${REQUIRED_QT_VERSION}" REQUIRED)
--find_package(Qt5LinguistTools "${REQUIRED_QT_VERSION}" REQUIRED)
- find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
--include(LXQtTranslateTs)
- include(LXQtCompilerSettings NO_POLICY_SCOPE)
- include(LXQtCreatePkgConfigFile)
- 
-@@ -117,26 +115,6 @@
- qt5_wrap_ui(UI_SRCS ${UI})
- set(PKG_CONFIG_REQ "Qt5Widgets")
- 
--lxqt_translate_ts(QTERMWIDGET_QM
--    TRANSLATION_DIR "lib/translations"
--    UPDATE_TRANSLATIONS
--        ${UPDATE_TRANSLATIONS}
--    SOURCES
--        ${SRCS} ${HDRS} ${UI}
--    PULL_TRANSLATIONS
--        ${PULL_TRANSLATIONS}
--    CLEAN_TRANSLATIONS
--        ${CLEAN_TRANSLATIONS}
--    TRANSLATIONS_REPO
--        ${TRANSLATIONS_REPO}
--    TRANSLATIONS_REFSPEC
--        ${TRANSLATIONS_REFSPEC}
--    INSTALL_DIR
--        ${TRANSLATIONS_DIR}
--    COMPONENT
--        Runtime
--)
--
- add_library(${QTERMWIDGET_LIBRARY_NAME} SHARED ${SRCS} ${MOCS} ${UI_SRCS} ${QTERMWIDGET_QM})
- target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt5::Widgets)
- set_target_properties( ${QTERMWIDGET_LIBRARY_NAME} PROPERTIES

diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index cda15baf682acf7c1054db1875e565bbbead4345..9c367cc15cbcf46ad816f201827b18b0c1d18b1b 100644 (file)
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -1,26 +1,31 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils git-r3
+EAPI=7
+
+inherit cmake-utils
 
 DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/lxde/qtermwidget"
-EGIT_REPO_URI="https://github.com/lxde/qtermwidget.git"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ "${PV}" == "9999" ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+       SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
 
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
+LICENSE="BSD GPL-2 LGPL-2+"
+SLOT="0/${PV}"
 
-RDEPEND="
+BDEPEND="
+       dev-qt/linguist-tools:5
+       >=dev-util/lxqt-build-tools-0.6.0
+"
+DEPEND="
        dev-qt/qtcore:5
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5
 "
-DEPEND="${DEPEND}
-       dev-util/lxqt-build-tools
-       dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-nofetch.patch" )
+RDEPEND="${DEPEND}"