[gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/

[Akinori Hattori]

commit:     babe46bd4ba748689f81381b641e58748a166506
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 01:57:42 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 01:57:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babe46bd

x11-misc/qterm: tidy

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/qterm/metadata.xml       |  2 +-
 x11-misc/qterm/qterm-0.7.1.ebuild | 34 +++++++++++-----------------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml
index d9de788cca8..59fe2d65e61 100644
--- a/x11-misc/qterm/metadata.xml
+++ b/x11-misc/qterm/metadata.xml
@@ -6,7 +6,7 @@
                <name>Cjk</name>
        </maintainer>
        <upstream>
-               <remote-id type="sourceforge">qterm</remote-id>
                <remote-id type="github">qterm/qterm</remote-id>
+               <remote-id type="sourceforge">qterm</remote-id>
        </upstream>
 </pkgmetadata>

diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild 
b/x11-misc/qterm/qterm-0.7.1.ebuild
index 9196ecbc57c..2273e5d3069 100644
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ b/x11-misc/qterm/qterm-0.7.1.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 inherit cmake-utils gnome2-utils xdg-utils
 
-DESCRIPTION="A BBS client for Linux"
+DESCRIPTION="A BBS client based on Qt"
 HOMEPAGE="https://github.com/qterm/qterm";
-SRC_URI="https://github.com/qterm/qterm/archive/0.7.1.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="libressl"
 
-RDEPEND="
-       dev-qt/qtcore:5
+RDEPEND="dev-qt/qtcore:5
        dev-qt/qtgui:5
        dev-qt/qtmultimedia:5
        dev-qt/qtnetwork:5
@@ -25,41 +24,30 @@ RDEPEND="
        dev-qt/qtxml:5
        x11-libs/libX11
        !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-"
+       libressl? ( dev-libs/libressl:= )"
 DEPEND="${RDEPEND}
        dev-qt/linguist-tools:5
        dev-qt/qthelp:5
-       x11-base/xorg-proto
-"
+       x11-base/xorg-proto"
 
 DOCS=( README.rst RELEASE_NOTES TODO )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       # file collision with sys-cluster/torque, bug #176533
+       sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt
+       sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop
 
-       sed -i -e "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop || die
+       cmake-utils_src_prepare
+       xdg_environment_reset
 }
 
 src_configure() {
-       xdg_environment_reset
-
        local mycmakeargs=(
                -DQT5=ON
        )
-
        cmake-utils_src_configure
 }
 
-src_install() {
-       cmake-utils_src_install
-       mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
 pkg_postinst() {
        gnome2_icon_cache_update
 }