Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/keynote/files/, profiles/, app-crypt/keynote/
Date: Sat, 20 Apr 2019 23:27:01
Message-Id: 1555748396.57adc6634b9c895cfd90e7156a3cbbc04edb6fd7.mgorny@gentoo
1 commit: 57adc6634b9c895cfd90e7156a3cbbc04edb6fd7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 20 08:19:17 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 20 08:19:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57adc663
7
8 app-crypt/keynote: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/675010
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 app-crypt/keynote/Manifest | 1 -
14 .../keynote/files/keynote-2.3-parallel-build.patch | 14 ------
15 app-crypt/keynote/files/keynote-2.3-qa.patch | 44 ------------------
16 app-crypt/keynote/keynote-2.3-r3.ebuild | 53 ----------------------
17 app-crypt/keynote/metadata.xml | 5 --
18 profiles/package.mask | 9 ----
19 6 files changed, 126 deletions(-)
20
21 diff --git a/app-crypt/keynote/Manifest b/app-crypt/keynote/Manifest
22 deleted file mode 100644
23 index 555feb16a0b..00000000000
24 --- a/app-crypt/keynote/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST keynote-2.3.tar.gz 141930 BLAKE2B 9cbf18214ca8d39a09be149370b104989470d8040ea307b263451d0d0c74f4658f4620ac16d8f2a5310edca78555e6b8077d67c96941722cd0bc8afa923a2452 SHA512 c4f2f70718cf6092a9af82d6f6e1d8e24d03be9a938e2bde830b24794cd20610b8f647c552d46e37e840f1a1a432dc797b65548c4d39cdbaa65ec2d11f6cfefe
28
29 diff --git a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
30 deleted file mode 100644
31 index cf4b4926f79..00000000000
32 --- a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
33 +++ /dev/null
34 @@ -1,14 +0,0 @@
35 ---- keynote-2.3.orig/Makefile.in 2010-02-04 09:51:35.757096194 +0100
36 -+++ keynote-2.3/Makefile.in 2010-02-04 09:52:17.441137132 +0100
37 -@@ -86,9 +86,11 @@
38 -
39 - k.tab.c: keynote.y header.h keynote.h assertion.h config.h
40 - $(YACC) $(YACCFLAGS) keynote.y
41 -+k.tab.h: k.tab.c
42 -
43 - z.tab.c: keynote-ver.y keynote.h header.h config.h
44 - $(YACC) $(YACCFLAGS2) keynote-ver.y
45 -+z.tab.h: z.tab.c
46 -
47 - lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h
48 - $(LEX) $(LEXFLAGS) keynote.l
49
50 diff --git a/app-crypt/keynote/files/keynote-2.3-qa.patch b/app-crypt/keynote/files/keynote-2.3-qa.patch
51 deleted file mode 100644
52 index f6b1ff28cdb..00000000000
53 --- a/app-crypt/keynote/files/keynote-2.3-qa.patch
54 +++ /dev/null
55 @@ -1,44 +0,0 @@
56 -Respect CFLAGS, LDFLAGS, and AR.
57 -
58 -The better way to fix AR would be to patch configure.in,
59 -but it is sufficiently old to fail with current autotools.
60 ---- Makefile.in
61 -+++ Makefile.in
62 -@@ -27,7 +27,6 @@
63 - YACC = @YACC@
64 - SSLEAY = @SSLEAY@
65 - RM = @RM@
66 --AR = @AR@
67 - NROFF = @NROFF@
68 - TAR = @TAR@
69 - TRUE = @TRUE@
70 -@@ -41,10 +40,10 @@
71 - YACCFLAGS = -d -p kn -b k
72 - LEXFLAGS2 = -Pkv -s -i
73 - LEXFLAGS = -Cr -Pkn -s -i
74 --CFLAGS = -O2 -Wall # -g
75 - RMFLAGS2 = -rf
76 - RMFLAGS = -f
77 - NROFFFLAGS = -mandoc
78 -+LDFLAGS = @LDFLAGS@
79 -
80 - SSLCONF = testsuite/openssl.cnf
81 - SSLCERT = testsuite/test.cert.pem
82 -@@ -83,7 +82,7 @@
83 - $(RANLIB) $(TARGET)
84 -
85 - $(TARGET2): $(TARGET) $(OBJS2)
86 -- $(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
87 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
88 -
89 - k.tab.c: keynote.y header.h keynote.h assertion.h config.h
90 - $(YACC) $(YACCFLAGS) keynote.y
91 -@@ -131,7 +130,7 @@
92 - -keyout $(SSLKEY)
93 -
94 - test-sample: all $(OBJS3)
95 -- $(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
96 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
97 -
98 - test-sig: all $(SSLCERT) $(SSLKEY)
99 - $(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1
100
101 diff --git a/app-crypt/keynote/keynote-2.3-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild
102 deleted file mode 100644
103 index b4351b69e09..00000000000
104 --- a/app-crypt/keynote/keynote-2.3-r3.ebuild
105 +++ /dev/null
106 @@ -1,53 +0,0 @@
107 -# Copyright 1999-2016 Gentoo Foundation
108 -# Distributed under the terms of the GNU General Public License v2
109 -
110 -EAPI=5
111 -
112 -inherit eutils toolchain-funcs
113 -
114 -DESCRIPTION="The KeyNote Trust-Management System"
115 -HOMEPAGE="http://www1.cs.columbia.edu/~angelos/keynote.html"
116 -SRC_URI="http://www1.cs.columbia.edu/~angelos/Code/${P}.tar.gz"
117 -
118 -LICENSE="keynote"
119 -SLOT="0"
120 -KEYWORDS="amd64 x86"
121 -IUSE="libressl ssl"
122 -
123 -RDEPEND="ssl? (
124 - !libressl? ( dev-libs/openssl:0= )
125 - libressl? ( dev-libs/libressl:0= )
126 - )"
127 -DEPEND="${RDEPEND}
128 - virtual/yacc"
129 -
130 -pkg_setup() {
131 - tc-export AR CC RANLIB
132 - # bug #448904
133 - export ac_cv_path_AR="$(type -p $(tc-getAR))"
134 -}
135 -
136 -src_prepare() {
137 - epatch "${FILESDIR}"/${P}-qa.patch
138 - epatch "${FILESDIR}"/${P}-parallel-build.patch
139 -}
140 -
141 -src_compile() {
142 - if use ssl; then
143 - emake
144 - else
145 - emake nocrypto
146 - fi
147 -}
148 -
149 -src_install() {
150 - dobin keynote
151 -
152 - dolib.a libkeynote.a
153 -
154 - insinto /usr/include
155 - doins keynote.h
156 -
157 - doman man/keynote.[1345]
158 - dodoc README HOWTO.add.crypto TODO
159 -}
160
161 diff --git a/app-crypt/keynote/metadata.xml b/app-crypt/keynote/metadata.xml
162 deleted file mode 100644
163 index 6f49eba8f49..00000000000
164 --- a/app-crypt/keynote/metadata.xml
165 +++ /dev/null
166 @@ -1,5 +0,0 @@
167 -<?xml version="1.0" encoding="UTF-8"?>
168 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
169 -<pkgmetadata>
170 -<!-- maintainer-needed -->
171 -</pkgmetadata>
172
173 diff --git a/profiles/package.mask b/profiles/package.mask
174 index e2dd0622466..122ddc9807f 100644
175 --- a/profiles/package.mask
176 +++ b/profiles/package.mask
177 @@ -601,15 +601,6 @@ dev-libs/libmcal
178 # Removal in 30 days. Bug #676190.
179 x11-libs/hippo-canvas
180
181 -# Michał Górny <mgorny@g.o> (21 Mar 2019)
182 -# The following packages are unmaintained and fail to build against
183 -# openssl-1.1+.
184 -#
185 -# app-crypt/keynote: #675010, last updated upstream in 2000
186 -#
187 -# Removal in 30 days.
188 -app-crypt/keynote
189 -
190 # Miroslav Šulc <fordfrog@g.o> (19 Mar 2019)
191 # Depends on >=virtual/{jdk,jre}-11 which is masked
192 =www-servers/tomcat-9.0.17