1 |
commit: a17c88445a0547f3758f788f65bd7e00945b5c0d |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 28 13:12:48 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 28 13:14:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a17c8844 |
7 |
|
8 |
www-client/conkeror: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/667528 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
profiles/package.mask | 6 --- |
14 |
www-client/conkeror/Manifest | 2 - |
15 |
www-client/conkeror/conkeror-1.0.4.ebuild | 59 ------------------------------ |
16 |
www-client/conkeror/files/conkeror.desktop | 14 ------- |
17 |
www-client/conkeror/files/conkeror.sh | 14 ------- |
18 |
www-client/conkeror/metadata.xml | 16 -------- |
19 |
6 files changed, 111 deletions(-) |
20 |
|
21 |
diff --git a/profiles/package.mask b/profiles/package.mask |
22 |
index 2a3c1e675fe..602ec425f4b 100644 |
23 |
--- a/profiles/package.mask |
24 |
+++ b/profiles/package.mask |
25 |
@@ -485,12 +485,6 @@ net-libs/libosip |
26 |
# Masked for removal on 2018-11-24, bug #669650. |
27 |
dev-db/pgadmin3 |
28 |
|
29 |
-# Ulrich Müller <ulm@g.o> (23 Oct 2018) |
30 |
-# Depends on <www-client/firefox-57 which is package masked. |
31 |
-# Use www-client/surf or www-client/qutebrowser as replacement. |
32 |
-# Masked for removal in 30 days, bug #667528. |
33 |
-www-client/conkeror |
34 |
- |
35 |
# Lars Wendler <polynomial-c@g.o> (22 Oct 2018) |
36 |
# Breaks dev-libs/gobject-introspection and its consumers |
37 |
# See #669278 |
38 |
|
39 |
diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest |
40 |
deleted file mode 100644 |
41 |
index 220ef3d55a1..00000000000 |
42 |
--- a/www-client/conkeror/Manifest |
43 |
+++ /dev/null |
44 |
@@ -1,2 +0,0 @@ |
45 |
-DIST conkeror-1.0.4.tar.xz 243876 BLAKE2B 112a05a8601f67f1a360f8fa947c0d325aac8276f72f02a6162fd3ec886d8b912e75991c94e4ec5bb9ebb44c6762bcbcb7f5a18c89410ba7d2294c38f66aba84 SHA512 4d6f3391b3ddcaedf532b9108cecfea2378c15307a669a46dcdd98ed39bdf25f6facf741aba66be4f683afe951e1c25ca011a94440d98bb0621d9b2cb10adeca |
46 |
-DIST conkeror.png 5105 BLAKE2B 7d8d455e76987d0db00748ea6d5319793685b2e0061539f9378411245644f46a8e40eadfb59a5d543c17d058e2dc5f85c1cc3d2deabe5b988adb9dd689fa2bcd SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f |
47 |
|
48 |
diff --git a/www-client/conkeror/conkeror-1.0.4.ebuild b/www-client/conkeror/conkeror-1.0.4.ebuild |
49 |
deleted file mode 100644 |
50 |
index 7ad54c59d1c..00000000000 |
51 |
--- a/www-client/conkeror/conkeror-1.0.4.ebuild |
52 |
+++ /dev/null |
53 |
@@ -1,59 +0,0 @@ |
54 |
-# Copyright 1999-2018 Gentoo Foundation |
55 |
-# Distributed under the terms of the GNU General Public License v2 |
56 |
- |
57 |
-EAPI=6 |
58 |
- |
59 |
-inherit toolchain-funcs desktop xdg-utils |
60 |
- |
61 |
-DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs" |
62 |
-HOMEPAGE="http://conkeror.org/" |
63 |
-# snapshot from git://repo.or.cz/conkeror.git |
64 |
-# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg |
65 |
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz |
66 |
- https://dev.gentoo.org/~ulm/distfiles/${PN}.png" |
67 |
- |
68 |
-# CC-BY-SA-3.0 for conkeror.png |
69 |
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0" |
70 |
-SLOT="0" |
71 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
72 |
- |
73 |
-RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57 ) |
74 |
- ( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )" |
75 |
- |
76 |
-S="${WORKDIR}/${PN}" |
77 |
- |
78 |
-src_unpack() { |
79 |
- unpack ${P}.tar.xz |
80 |
- cp "${DISTDIR}/${PN}.png" . || die |
81 |
-} |
82 |
- |
83 |
-src_compile() { |
84 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
85 |
-} |
86 |
- |
87 |
-src_install() { |
88 |
- insinto /usr/share/${PN} |
89 |
- doins -r branding chrome components content defaults help locale modules \ |
90 |
- search-engines style tests |
91 |
- doins application.ini *.manifest Info.plist |
92 |
- |
93 |
- exeinto /usr/libexec/${PN} |
94 |
- doexe conkeror-spawn-helper |
95 |
- dosym ../../libexec/${PN}/conkeror-spawn-helper \ |
96 |
- /usr/share/${PN}/conkeror-spawn-helper |
97 |
- |
98 |
- newbin "${FILESDIR}/conkeror.sh" conkeror |
99 |
- domenu "${FILESDIR}/conkeror.desktop" |
100 |
- doicon "${WORKDIR}/conkeror.png" |
101 |
- |
102 |
- doman contrib/man/conkeror.1 |
103 |
- dodoc CREDITS README |
104 |
-} |
105 |
- |
106 |
-pkg_postinst() { |
107 |
- xdg_desktop_database_update |
108 |
-} |
109 |
- |
110 |
-pkg_postrm() { |
111 |
- xdg_desktop_database_update |
112 |
-} |
113 |
|
114 |
diff --git a/www-client/conkeror/files/conkeror.desktop b/www-client/conkeror/files/conkeror.desktop |
115 |
deleted file mode 100644 |
116 |
index fcf6123c9d4..00000000000 |
117 |
--- a/www-client/conkeror/files/conkeror.desktop |
118 |
+++ /dev/null |
119 |
@@ -1,14 +0,0 @@ |
120 |
-[Desktop Entry] |
121 |
-Type=Application |
122 |
-Version=1.0 |
123 |
-Name=Conkeror |
124 |
-GenericName=Web Browser |
125 |
-Comment=Conkeror is a Mozilla-based web browser whose design is inspired by GNU Emacs |
126 |
-Icon=conkeror |
127 |
-TryExec=/usr/bin/conkeror |
128 |
-Exec=/usr/bin/conkeror %u |
129 |
-Terminal=false |
130 |
-Categories=Network;WebBrowser; |
131 |
-MimeType=text/html;text/xml; |
132 |
-StartupNotify=true |
133 |
-StartupWMClass=Conkeror |
134 |
|
135 |
diff --git a/www-client/conkeror/files/conkeror.sh b/www-client/conkeror/files/conkeror.sh |
136 |
deleted file mode 100644 |
137 |
index 9b46d5bb0c0..00000000000 |
138 |
--- a/www-client/conkeror/files/conkeror.sh |
139 |
+++ /dev/null |
140 |
@@ -1,14 +0,0 @@ |
141 |
-#!/bin/bash |
142 |
-# Wrapper script for conkeror |
143 |
- |
144 |
-for cmd in firefox firefox-bin; do |
145 |
- xr=$(type -p ${cmd}) |
146 |
- if [[ -n ${xr} ]]; then |
147 |
- : ${MOZ_PLUGIN_PATH:=/usr/lib/nsbrowser/plugins} #497070 |
148 |
- export MOZ_PLUGIN_PATH |
149 |
- exec "${xr}" -app /usr/share/conkeror/application.ini "$@" |
150 |
- fi |
151 |
-done |
152 |
- |
153 |
-echo "$0: firefox required, but not found." >&2 |
154 |
-exit 1 |
155 |
|
156 |
diff --git a/www-client/conkeror/metadata.xml b/www-client/conkeror/metadata.xml |
157 |
deleted file mode 100644 |
158 |
index 03e6bc93453..00000000000 |
159 |
--- a/www-client/conkeror/metadata.xml |
160 |
+++ /dev/null |
161 |
@@ -1,16 +0,0 @@ |
162 |
-<?xml version="1.0" encoding="UTF-8"?> |
163 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
164 |
-<pkgmetadata> |
165 |
-<maintainer type="person"> |
166 |
- <email>ulm@g.o</email> |
167 |
- <name>Ulrich Müller</name> |
168 |
-</maintainer> |
169 |
-<longdescription> |
170 |
- Conkeror is a keyboard-oriented, highly-customizable, highly-extensible |
171 |
- web browser based on Mozilla XULRunner, written mainly in JavaScript, and |
172 |
- inspired by exceptional software such as Emacs and vi. Conkeror features a |
173 |
- sophisticated keyboard system, allowing users to run commands and interact |
174 |
- with content in powerful and novel ways, and it is self-documenting, |
175 |
- featuring a powerful interactive help system. |
176 |
-</longdescription> |
177 |
-</pkgmetadata> |