| 1 |
commit: babe46bd4ba748689f81381b641e58748a166506 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 18 01:57:42 2018 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 18 01:57:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babe46bd |
| 7 |
|
| 8 |
x11-misc/qterm: tidy |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
x11-misc/qterm/metadata.xml | 2 +- |
| 13 |
x11-misc/qterm/qterm-0.7.1.ebuild | 34 +++++++++++----------------------- |
| 14 |
2 files changed, 12 insertions(+), 24 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml |
| 17 |
index d9de788cca8..59fe2d65e61 100644 |
| 18 |
--- a/x11-misc/qterm/metadata.xml |
| 19 |
+++ b/x11-misc/qterm/metadata.xml |
| 20 |
@@ -6,7 +6,7 @@ |
| 21 |
<name>Cjk</name> |
| 22 |
</maintainer> |
| 23 |
<upstream> |
| 24 |
- <remote-id type="sourceforge">qterm</remote-id> |
| 25 |
<remote-id type="github">qterm/qterm</remote-id> |
| 26 |
+ <remote-id type="sourceforge">qterm</remote-id> |
| 27 |
</upstream> |
| 28 |
</pkgmetadata> |
| 29 |
|
| 30 |
diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild |
| 31 |
index 9196ecbc57c..2273e5d3069 100644 |
| 32 |
--- a/x11-misc/qterm/qterm-0.7.1.ebuild |
| 33 |
+++ b/x11-misc/qterm/qterm-0.7.1.ebuild |
| 34 |
@@ -1,21 +1,20 @@ |
| 35 |
# Copyright 1999-2018 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI=6 |
| 39 |
+EAPI="6" |
| 40 |
|
| 41 |
inherit cmake-utils gnome2-utils xdg-utils |
| 42 |
|
| 43 |
-DESCRIPTION="A BBS client for Linux" |
| 44 |
+DESCRIPTION="A BBS client based on Qt" |
| 45 |
HOMEPAGE="https://github.com/qterm/qterm" |
| 46 |
-SRC_URI="https://github.com/qterm/qterm/archive/0.7.1.tar.gz -> ${P}.tar.gz" |
| 47 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 48 |
|
| 49 |
LICENSE="GPL-3" |
| 50 |
SLOT="0" |
| 51 |
KEYWORDS="amd64 x86" |
| 52 |
IUSE="libressl" |
| 53 |
|
| 54 |
-RDEPEND=" |
| 55 |
- dev-qt/qtcore:5 |
| 56 |
+RDEPEND="dev-qt/qtcore:5 |
| 57 |
dev-qt/qtgui:5 |
| 58 |
dev-qt/qtmultimedia:5 |
| 59 |
dev-qt/qtnetwork:5 |
| 60 |
@@ -25,41 +24,30 @@ RDEPEND=" |
| 61 |
dev-qt/qtxml:5 |
| 62 |
x11-libs/libX11 |
| 63 |
!libressl? ( dev-libs/openssl:0= ) |
| 64 |
- libressl? ( dev-libs/libressl:= ) |
| 65 |
-" |
| 66 |
+ libressl? ( dev-libs/libressl:= )" |
| 67 |
DEPEND="${RDEPEND} |
| 68 |
dev-qt/linguist-tools:5 |
| 69 |
dev-qt/qthelp:5 |
| 70 |
- x11-base/xorg-proto |
| 71 |
-" |
| 72 |
+ x11-base/xorg-proto" |
| 73 |
|
| 74 |
DOCS=( README.rst RELEASE_NOTES TODO ) |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
- cmake-utils_src_prepare |
| 78 |
+ # file collision with sys-cluster/torque, bug #176533 |
| 79 |
+ sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt |
| 80 |
+ sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop |
| 81 |
|
| 82 |
- sed -i -e "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop || die |
| 83 |
+ cmake-utils_src_prepare |
| 84 |
+ xdg_environment_reset |
| 85 |
} |
| 86 |
|
| 87 |
src_configure() { |
| 88 |
- xdg_environment_reset |
| 89 |
- |
| 90 |
local mycmakeargs=( |
| 91 |
-DQT5=ON |
| 92 |
) |
| 93 |
- |
| 94 |
cmake-utils_src_configure |
| 95 |
} |
| 96 |
|
| 97 |
-src_install() { |
| 98 |
- cmake-utils_src_install |
| 99 |
- mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die |
| 100 |
-} |
| 101 |
- |
| 102 |
-pkg_preinst() { |
| 103 |
- gnome2_icon_savelist |
| 104 |
-} |
| 105 |
- |
| 106 |
pkg_postinst() { |
| 107 |
gnome2_icon_cache_update |
| 108 |
} |
Archives