Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-dicts/wordnet/
Date: Sat, 16 Oct 2021 13:59:08
Message-Id: 1634392710.ce13fd747dc1f1ae60a2e0b680d8809ace09c2a7.soap@gentoo
1 commit: ce13fd747dc1f1ae60a2e0b680d8809ace09c2a7
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 16 13:58:30 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 16 13:58:30 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce13fd74
7
8 app-dicts/wordnet: drop 3.0-r4, 3.0-r5
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 app-dicts/wordnet/wordnet-3.0-r4.ebuild | 71 -------------------------------
13 app-dicts/wordnet/wordnet-3.0-r5.ebuild | 75 ---------------------------------
14 2 files changed, 146 deletions(-)
15
16 diff --git a/app-dicts/wordnet/wordnet-3.0-r4.ebuild b/app-dicts/wordnet/wordnet-3.0-r4.ebuild
17 deleted file mode 100644
18 index 8fc6f3f46f7..00000000000
19 --- a/app-dicts/wordnet/wordnet-3.0-r4.ebuild
20 +++ /dev/null
21 @@ -1,71 +0,0 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=5
26 -
27 -inherit autotools epatch flag-o-matic multilib
28 -
29 -DESCRIPTION="A lexical database for the English language"
30 -HOMEPAGE="https://wordnet.princeton.edu/"
31 -SRC_URI="
32 - ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz
33 - mirror://gentoo/${P}-patchset-1.tar.bz2"
34 -LICENSE="Princeton"
35 -
36 -SLOT="0"
37 -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
38 -IUSE="doc"
39 -
40 -# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
41 -# cf. bug 163478 for details. (Yes, it's about 2.1 but it's still the same here.)
42 -DEPEND="
43 - dev-lang/tcl:0=
44 - dev-lang/tk:0="
45 -RDEPEND="${DEPEND}"
46 -
47 -S="${WORKDIR}/WordNet-${PV}"
48 -
49 -PATCHES=(
50 - # Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
51 - "${WORKDIR}/${P}-dict-location.patch"
52 - # Fixes bug 130024, make an additional shared lib
53 - "${WORKDIR}/${P}-shared-lib.patch"
54 - # Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
55 - "${WORKDIR}/${P}-docs-path.patch"
56 - "${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
57 - "${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
58 -
59 - "${FILESDIR}"/${P}-tcl8.6.patch
60 - "${FILESDIR}"/${P}-format-security.patch
61 - "${FILESDIR}"/${P}-src_stubs_c.patch
62 -)
63 -
64 -src_prepare() {
65 - epatch "${PATCHES[@]}"
66 - # Don't install all the extra docs (html, pdf, ps) without doc USE flag.
67 - if ! use doc; then
68 - sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
69 - fi
70 -
71 - # Drop installation of OLD tk.h headers #255590
72 - sed '/^SUBDIRS/d' -i include/Makefile.am || die
73 - sed 's: include/tk/Makefile::' -i configure.ac || die
74 - rm -rf include/tk/ || die
75 -
76 - rm -f configure || die
77 - eautoreconf
78 - MAKEOPTS+=" -e"
79 -}
80 -
81 -src_configure() {
82 - append-cppflags -DUNIX -I"${T}"/usr/include
83 -
84 - PLATFORM=linux WN_ROOT="${T}/usr" \
85 - WN_DICTDIR="${T}/usr/share/wordnet/dict" \
86 - WN_MANDIR="${T}/usr/share/man" \
87 - WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
88 - WNHOME="${EPREFIX}/usr/share/wordnet" \
89 - econf \
90 - --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
91 - --with-tk="${EPREFIX}"/usr/$(get_libdir)
92 -}
93
94 diff --git a/app-dicts/wordnet/wordnet-3.0-r5.ebuild b/app-dicts/wordnet/wordnet-3.0-r5.ebuild
95 deleted file mode 100644
96 index fc8af0edea2..00000000000
97 --- a/app-dicts/wordnet/wordnet-3.0-r5.ebuild
98 +++ /dev/null
99 @@ -1,75 +0,0 @@
100 -# Copyright 1999-2021 Gentoo Authors
101 -# Distributed under the terms of the GNU General Public License v2
102 -
103 -EAPI=6
104 -
105 -inherit autotools epatch flag-o-matic
106 -
107 -DESCRIPTION="A lexical database for the English language"
108 -HOMEPAGE="https://wordnet.princeton.edu/"
109 -SRC_URI="
110 - http://wordnetcode.princeton.edu/${PV}/WordNet-${PV}.tar.gz
111 - mirror://gentoo/${P}-patchset-1.tar.bz2"
112 -LICENSE="Princeton"
113 -
114 -SLOT="0"
115 -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
116 -IUSE="doc"
117 -
118 -# In contrast to what the configure script seems to imply, Tcl/Tk is NOT
119 -# optional. cf. bug 163478 for details. (Yes, it's about 2.1 but it's
120 -# still the same here.)
121 -DEPEND="
122 - dev-lang/tcl:0=
123 - dev-lang/tk:0="
124 -RDEPEND="${DEPEND}"
125 -
126 -S="${WORKDIR}/WordNet-${PV}"
127 -
128 -PATCHES=(
129 - # Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
130 - "${WORKDIR}/${P}-dict-location.patch"
131 - # Fixes bug 130024, make an additional shared lib
132 - "${WORKDIR}/${P}-shared-lib.patch"
133 - # Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
134 - "${WORKDIR}/${P}-docs-path.patch"
135 - "${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
136 - "${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
137 -
138 - "${FILESDIR}"/${P}-tcl8.6.patch
139 - "${FILESDIR}"/${P}-format-security.patch
140 - "${FILESDIR}"/${P}-src_stubs_c.patch
141 - "${FILESDIR}"/${P}-fix-indexing-bug-314799.patch
142 -)
143 -
144 -src_prepare() {
145 - epatch "${PATCHES[@]}"
146 - eapply_user
147 -
148 - # Don't install all the extra docs (html, pdf, ps) without doc USE flag.
149 - if ! use doc; then
150 - sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
151 - fi
152 -
153 - # Drop installation of OLD tk.h headers #255590
154 - sed '/^SUBDIRS/d' -i include/Makefile.am || die
155 - sed 's: include/tk/Makefile::' -i configure.ac || die
156 - rm -rf include/tk/ || die
157 -
158 - rm -f configure || die
159 - eautoreconf
160 - MAKEOPTS+=" -e"
161 -}
162 -
163 -src_configure() {
164 - append-cppflags -DUNIX -I"${T}"/usr/include
165 -
166 - PLATFORM=linux WN_ROOT="${T}/usr" \
167 - WN_DICTDIR="${T}/usr/share/wordnet/dict" \
168 - WN_MANDIR="${T}/usr/share/man" \
169 - WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
170 - WNHOME="${EPREFIX}/usr/share/wordnet" \
171 - econf \
172 - --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
173 - --with-tk="${EPREFIX}"/usr/$(get_libdir)
174 -}