1 |
commit: 1e1792579d292b6a6008dbf43dcfb613a9408f83 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 5 19:36:06 2019 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 5 19:36:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e179257 |
7 |
|
8 |
net-irc/irssi-otr: Remove |
9 |
|
10 |
Closes: https://bugs.gentoo.org/696074 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
net-irc/irssi-otr/Manifest | 2 -- |
14 |
.../irssi-otr/files/irssi-otr-1.0.0-cflags.patch | 11 ------- |
15 |
.../irssi-otr/files/irssi-otr-1.0.2-cflags.patch | 11 ------- |
16 |
net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild | 37 ---------------------- |
17 |
net-irc/irssi-otr/irssi-otr-1.0.2.ebuild | 35 -------------------- |
18 |
net-irc/irssi-otr/metadata.xml | 11 ------- |
19 |
profiles/package.mask | 7 ---- |
20 |
7 files changed, 114 deletions(-) |
21 |
|
22 |
diff --git a/net-irc/irssi-otr/Manifest b/net-irc/irssi-otr/Manifest |
23 |
deleted file mode 100644 |
24 |
index cfaf8bab5cb..00000000000 |
25 |
--- a/net-irc/irssi-otr/Manifest |
26 |
+++ /dev/null |
27 |
@@ -1,2 +0,0 @@ |
28 |
-DIST irssi-otr-1.0.0.tar.gz 39481 BLAKE2B 2d62071413db01291bdc223e4feab148f404c93832ccb6c18443c5ce2a2634445fa9ea106fac1e6b57e2da184b19f5a62aad27f448bea6f52c00e2957fc168e3 SHA512 988e50b9df430511ae21a9128ffd27ad27efc102aaa10ec59992c6e642f38dd776396a0768021e3a0588d2a8c30e6316a7b0720d31a05ac21bb47055b0d8c488 |
29 |
-DIST irssi-otr-1.0.2.tar.gz 40947 BLAKE2B b5a10f826fe7d4069bfe743b33c4e6fb29b5e38d46926f3f92115906fe914cd710446578d43e8833296646131102ac003ef9aece14c0f9f060fb898b7c699abd SHA512 983bc861e5d38774305425b412368689f17a1e11298bcef49b9f0ea7a2275b1443ba2ce0a9ef9866e537097f1c6c00e9264085f5cd711f0d78faf252fba18d2f |
30 |
|
31 |
diff --git a/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch b/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch |
32 |
deleted file mode 100644 |
33 |
index 50b57c58e8a..00000000000 |
34 |
--- a/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch |
35 |
+++ /dev/null |
36 |
@@ -1,11 +0,0 @@ |
37 |
---- configure.ac 2014-02-13 04:50:45.000000000 +0400 |
38 |
-+++ configure.ac.new 2014-12-07 12:13:17.346849284 +0300 |
39 |
-@@ -64,7 +64,7 @@ |
40 |
- |
41 |
- LT_INIT |
42 |
- |
43 |
--CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS" |
44 |
-+CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS" |
45 |
- |
46 |
- DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include" |
47 |
- AC_SUBST(DEFAULT_INCLUDES) |
48 |
|
49 |
diff --git a/net-irc/irssi-otr/files/irssi-otr-1.0.2-cflags.patch b/net-irc/irssi-otr/files/irssi-otr-1.0.2-cflags.patch |
50 |
deleted file mode 100644 |
51 |
index 3ab13288e11..00000000000 |
52 |
--- a/net-irc/irssi-otr/files/irssi-otr-1.0.2-cflags.patch |
53 |
+++ /dev/null |
54 |
@@ -1,11 +0,0 @@ |
55 |
---- a/configure.ac 2014-02-13 04:50:45.000000000 +0400 |
56 |
-+++ b/configure.ac 2014-12-07 12:13:17.346849284 +0300 |
57 |
-@@ -64,7 +64,7 @@ |
58 |
- |
59 |
- LT_INIT |
60 |
- |
61 |
--CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS" |
62 |
-+CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS" |
63 |
- |
64 |
- DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include" |
65 |
- AC_SUBST(DEFAULT_INCLUDES) |
66 |
|
67 |
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild |
68 |
deleted file mode 100644 |
69 |
index adc29addfcb..00000000000 |
70 |
--- a/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild |
71 |
+++ /dev/null |
72 |
@@ -1,37 +0,0 @@ |
73 |
-# Copyright 1999-2019 Gentoo Authors |
74 |
-# Distributed under the terms of the GNU General Public License v2 |
75 |
- |
76 |
-EAPI=5 |
77 |
- |
78 |
-inherit autotools-utils multilib |
79 |
- |
80 |
-DESCRIPTION="Off-The-Record messaging (OTR) for irssi" |
81 |
-HOMEPAGE="https://github.com/cryptodotis/irssi-otr" |
82 |
-SRC_URI="https://github.com/cryptodotis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
83 |
- |
84 |
-LICENSE="GPL-2" |
85 |
-SLOT="0" |
86 |
-KEYWORDS="amd64 ~hppa ~sparc x86" |
87 |
-IUSE="" |
88 |
- |
89 |
-# please note >=libotr-4.1.0 is required due to critical bugfix |
90 |
-# d748757e581b74e7298df155ad49174cb914102b, see README.md |
91 |
-RDEPEND=" |
92 |
- !=net-irc/irssi-1.2* |
93 |
- >=dev-libs/glib-2.22.0:2 |
94 |
- >=dev-libs/libgcrypt-1.2.0:0 |
95 |
- >=net-libs/libotr-4.1.0 |
96 |
- >=net-irc/irssi-0.8.15[perl]" |
97 |
- |
98 |
-DEPEND="${RDEPEND} |
99 |
- virtual/pkgconfig" |
100 |
- |
101 |
-AUTOTOOLS_AUTORECONF="yes" |
102 |
-DOCS=( README.md ) |
103 |
-PATCHES=( "${FILESDIR}/${P}-cflags.patch" ) |
104 |
- |
105 |
-src_prepare() { |
106 |
- autotools-utils_src_prepare |
107 |
- |
108 |
- sed -i -e "s|/usr/lib/irssi/modules|/usr/$(get_libdir)/irssi/modules|" configure.ac || die |
109 |
-} |
110 |
|
111 |
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild |
112 |
deleted file mode 100644 |
113 |
index 5a4cc0eb98d..00000000000 |
114 |
--- a/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,35 +0,0 @@ |
117 |
-# Copyright 1999-2019 Gentoo Authors |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
- |
120 |
-EAPI=6 |
121 |
- |
122 |
-inherit autotools |
123 |
- |
124 |
-DESCRIPTION="Off-The-Record messaging (OTR) for irssi" |
125 |
-HOMEPAGE="https://github.com/cryptodotis/irssi-otr" |
126 |
-SRC_URI="https://github.com/cryptodotis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
127 |
- |
128 |
-LICENSE="GPL-2" |
129 |
-SLOT="0" |
130 |
-KEYWORDS="amd64 hppa sparc x86" |
131 |
- |
132 |
-RDEPEND=" |
133 |
- !=net-irc/irssi-1.2* |
134 |
- dev-libs/glib:2 |
135 |
- >=dev-libs/libgcrypt-1.7.3 |
136 |
- >=net-libs/libotr-4.1.0 |
137 |
- >=net-irc/irssi-1.0.0[perl]" |
138 |
- |
139 |
-DEPEND=" |
140 |
- ${RDEPEND} |
141 |
- virtual/pkgconfig" |
142 |
- |
143 |
-DOCS=( README.md ) |
144 |
- |
145 |
-PATCHES=( "${FILESDIR}/${P}-cflags.patch" ) |
146 |
- |
147 |
-src_prepare() { |
148 |
- default |
149 |
- eautoreconf |
150 |
- sed -i -e "s|/usr/lib/irssi/modules|/usr/$(get_libdir)/irssi/modules|" configure.ac || die |
151 |
-} |
152 |
|
153 |
diff --git a/net-irc/irssi-otr/metadata.xml b/net-irc/irssi-otr/metadata.xml |
154 |
deleted file mode 100644 |
155 |
index b6526719490..00000000000 |
156 |
--- a/net-irc/irssi-otr/metadata.xml |
157 |
+++ /dev/null |
158 |
@@ -1,11 +0,0 @@ |
159 |
-<?xml version="1.0" encoding="UTF-8"?> |
160 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
161 |
-<pkgmetadata> |
162 |
- <upstream> |
163 |
- <remote-id type="github">cryptodotis/irssi-otr</remote-id> |
164 |
- </upstream> |
165 |
- <maintainer type="person"> |
166 |
- <email>monsieurp@g.o</email> |
167 |
- <name>Patrice Clement</name> |
168 |
- </maintainer> |
169 |
-</pkgmetadata> |
170 |
|
171 |
diff --git a/profiles/package.mask b/profiles/package.mask |
172 |
index 8537b3b0858..f1489cef642 100644 |
173 |
--- a/profiles/package.mask |
174 |
+++ b/profiles/package.mask |
175 |
@@ -445,13 +445,6 @@ app-dicts/dictd-web1913 |
176 |
# Removal in 30 days. Bug #696176. |
177 |
mail-filter/procmail-lib |
178 |
|
179 |
-# Patrice Clement <monsieurp@g.o> (2019-10-02) |
180 |
-# OTR support is fully integrated within irssi since version 1.2.0. Type /help otr |
181 |
-# at the command prompt to find out more. The OTR module is therefore obsolete |
182 |
-# and can be tree-cleaned. |
183 |
-# Masked for removal in 30 days. Bug #696074. |
184 |
-net-irc/irssi-otr |
185 |
- |
186 |
# Brian Evans <grknight@g.o> (2019-10-01) |
187 |
# End of life. Please upgrade. |
188 |
# Removal in 90 days. Bug 651784 |