Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/qterm/files/, x11-misc/qterm/
Date: Sun, 04 Jun 2017 05:25:39
Message-Id: 1496553928.02d12d39e8b6c16fbeed6f4defd96a986720de43.kensington@gentoo
1 commit: 02d12d39e8b6c16fbeed6f4defd96a986720de43
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 4 05:24:43 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 4 05:25:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d12d39
7
8 x11-misc/qterm: remove old
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 x11-misc/qterm/Manifest | 1 -
13 x11-misc/qterm/files/qterm-0.5.11-gentoo.patch | 11 ------
14 .../qterm/files/qterm-0.5.12-duplicatetarget.patch | 17 ---------
15 x11-misc/qterm/files/qterm-0.5.12-glibc216.patch | 12 ------
16 x11-misc/qterm/files/qterm-0.5.12-qt4.patch | 11 ------
17 x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch | 16 --------
18 x11-misc/qterm/qterm-0.5.12-r1.ebuild | 43 ----------------------
19 7 files changed, 111 deletions(-)
20
21 diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
22 index 999682e94bd..9d31f6d00ff 100644
23 --- a/x11-misc/qterm/Manifest
24 +++ b/x11-misc/qterm/Manifest
25 @@ -1,2 +1 @@
26 -DIST qterm-0.5.12.tar.bz2 749254 SHA256 bd31051a6c117b05fef3ea163480143837c57632a84eab43e8e142860bcab22a SHA512 43f302f28edfb7fe4332d054390011e3eba37863be57191a13cedf2fa76d7b5db53d32947b7acd5e7585f2b0c8afe9b4b43334d86040f1f9249e9e767dd715e8 WHIRLPOOL 77b3fb09ea28901a151f8e0707a107677260a52d38a24427155dfa4e36d208bfc08be4016205d4c4f0c7fd374b967ccfed46271644e6dca2aa6e27ac637a991a
27 DIST qterm-0.7.1.tar.gz 901169 SHA256 7e760dc18afa8c6e20c7d5f0148c41b9a9273667c6ee7716f7cc87ee5eaa0d63 SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd WHIRLPOOL fd9cd74ec010e4d63b7e7ef6c3f756f7e67db58f96a932ef426136fbee1565199ed13c27d27586ef7f81fb89d79b7cde7a2d090903bc3c3e64fecf30e0188d52
28
29 diff --git a/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch b/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch
30 deleted file mode 100644
31 index 08a2c90dc39..00000000000
32 --- a/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch
33 +++ /dev/null
34 @@ -1,11 +0,0 @@
35 ---- src/qterm.desktop 2009-01-07 03:11:15.000000000 +0900
36 -+++ src/qterm.desktop 2009-10-03 01:30:27.000000000 +0900
37 -@@ -3,7 +3,7 @@
38 - Encoding=UTF-8
39 - Type=Application
40 - Name=QTerm
41 --Exec=qterm -caption "%c" %i %m %u
42 -+Exec=QTerm -caption "%c" %i %m %u
43 - GenericName=BBS Client
44 - GenericName[zh_CN]=BBS 客户端程序
45 - GenericName[zh_TW]=BBS 客戶端程式
46
47 diff --git a/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch b/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch
48 deleted file mode 100644
49 index f35625c6d02..00000000000
50 --- a/x11-misc/qterm/files/qterm-0.5.12-duplicatetarget.patch
51 +++ /dev/null
52 @@ -1,17 +0,0 @@
53 -Remove duplicate target that was already created by FindKDE4Internal.
54 -
55 -Gentoo-bug: 559042
56 -
57 ---- a/CMakeLists.txt
58 -+++ b/CMakeLists.txt
59 -@@ -19,10 +19,3 @@
60 - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
61 -
62 - include("package.cmake")
63 --
64 --configure_file(
65 -- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
66 -- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
67 -- IMMEDIATE @ONLY)
68 --add_custom_target(uninstall
69 -- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
70
71 diff --git a/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch b/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch
72 deleted file mode 100644
73 index a2f7c3b625c..00000000000
74 --- a/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch
75 +++ /dev/null
76 @@ -1,12 +0,0 @@
77 -diff --git a/src/main.cpp b/src/main.cpp
78 -index 6c39d4a..859de70 100644
79 ---- a/src/main.cpp
80 -+++ b/src/main.cpp
81 -@@ -41,6 +41,7 @@ AUTHOR: kingson fiasco
82 - #include <fcntl.h>
83 - #include <execinfo.h>
84 - #include <signal.h>
85 -+#include <unistd.h>
86 -
87 - #define QTERM_SIG_MAX_RETS 50
88 - #define QTERM_SIG_LOG_DIR "/var/tmp"
89
90 diff --git a/x11-misc/qterm/files/qterm-0.5.12-qt4.patch b/x11-misc/qterm/files/qterm-0.5.12-qt4.patch
91 deleted file mode 100644
92 index 87005546112..00000000000
93 --- a/x11-misc/qterm/files/qterm-0.5.12-qt4.patch
94 +++ /dev/null
95 @@ -1,11 +0,0 @@
96 ---- CMakeLists.txt~ 2011-08-18 11:34:04.197046828 +0900
97 -+++ CMakeLists.txt 2011-08-18 11:34:09.557046770 +0900
98 -@@ -7,7 +7,7 @@
99 - set(QTERM_VERSION_RELEASE 12)
100 - set(QTERM_VERSION "${QTERM_VERSION_MAJOR}.${QTERM_VERSION_MINOR}.${QTERM_VERSION_RELEASE}" )
101 - set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
102 --find_package(Qt4 REQUIRED)
103 -+# find_package(Qt4 REQUIRED)
104 - find_package(KDE4)
105 -
106 - IF(WIN32 AND MSVC)
107
108 diff --git a/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch b/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch
109 deleted file mode 100644
110 index f23af67c201..00000000000
111 --- a/x11-misc/qterm/files/qterm-0.5.12-qtbindir.patch
112 +++ /dev/null
113 @@ -1,16 +0,0 @@
114 -Ensure that qcollectiongenerator is called from the correct directory.
115 -
116 -Even though QT_BINARY_DIR is specified, cmake will try PATH first.
117 -
118 -Gentoo-bug: 544108
119 -
120 ---- a/src/doc/CMakeLists.txt
121 -+++ b/src/doc/CMakeLists.txt
122 -@@ -9,6 +9,7 @@
123 - FIND_PROGRAM(QT_HELP_COLLECTION_GENERATOR
124 - qcollectiongenerator
125 - PATHS "${QT_BINARY_DIR}"
126 -+ NO_DEFAULT_PATH
127 - DOC "qcollectiongenerator used to compile Qt help collection project files")
128 -
129 - ADD_CUSTOM_COMMAND(
130
131 diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
132 deleted file mode 100644
133 index 61ba755c243..00000000000
134 --- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild
135 +++ /dev/null
136 @@ -1,43 +0,0 @@
137 -# Copyright 1999-2016 Gentoo Foundation
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI=5
141 -
142 -inherit cmake-utils
143 -
144 -DESCRIPTION="A BBS client for Linux"
145 -HOMEPAGE="http://qterm.sourceforge.net"
146 -SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
147 -
148 -LICENSE="GPL-2"
149 -SLOT="0"
150 -KEYWORDS="amd64 ~ppc x86"
151 -IUSE="libressl"
152 -
153 -RDEPEND="
154 - >=dev-qt/qtcore-4.5:4
155 - >=dev-qt/qtdbus-4.5:4
156 - >=dev-qt/qtgui-4.5:4[qt3support]
157 - >=dev-qt/qtscript-4.5:4
158 - !libressl? ( dev-libs/openssl:0 )
159 - libressl? ( dev-libs/libressl )
160 - x11-libs/libX11
161 -"
162 -DEPEND="${RDEPEND}
163 - kde-frameworks/kdelibs:4
164 - dev-qt/qthelp:4
165 - dev-qt/qtwebkit:4"
166 -
167 -PATCHES=(
168 - "${FILESDIR}/${PN}-0.5.11-gentoo.patch"
169 - "${FILESDIR}/${P}-qt4.patch"
170 - "${FILESDIR}/${P}-glibc216.patch"
171 - "${FILESDIR}/${P}-duplicatetarget.patch"
172 - "${FILESDIR}/${P}-qtbindir.patch"
173 -)
174 -
175 -src_install() {
176 - cmake-utils_src_install
177 - mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
178 - dodoc README TODO
179 -}