Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nvi/
Date: Fri, 20 Oct 2017 07:45:30
Message-Id: 1508485497.554096bd0cdda94bad8bf19f0bb1a64604cddb3f.monsieurp@gentoo
1 commit: 554096bd0cdda94bad8bf19f0bb1a64604cddb3f
2 Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
3 AuthorDate: Sun Oct 15 13:43:19 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 20 07:44:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554096bd
7
8 app-editors/nvi: clean up old.
9
10 Closes: https://github.com/gentoo/gentoo/pull/5954
11
12 app-editors/nvi/nvi-1.81.6-r4.ebuild | 100 -----------------------------------
13 app-editors/nvi/nvi-1.81.6-r6.ebuild | 100 -----------------------------------
14 2 files changed, 200 deletions(-)
15
16 diff --git a/app-editors/nvi/nvi-1.81.6-r4.ebuild b/app-editors/nvi/nvi-1.81.6-r4.ebuild
17 deleted file mode 100644
18 index d73456df60b..00000000000
19 --- a/app-editors/nvi/nvi-1.81.6-r4.ebuild
20 +++ /dev/null
21 @@ -1,100 +0,0 @@
22 -# Copyright 1999-2015 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=4
26 -
27 -inherit autotools db-use eutils flag-o-matic
28 -
29 -DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
30 -DBSLOTS=
31 -DBDEPENDS=
32 -for DBVER in ${DBVERS}
33 -do
34 - if [[ ${DBVER} = *.*.* ]]; then
35 - DBSLOTS="${DBSLOTS} ${DBVER%.*}"
36 - DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}"
37 - else
38 - DBSLOTS="${DBSLOTS} ${DBVER}"
39 - DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}"
40 - fi
41 -done
42 -
43 -DESCRIPTION="Vi clone"
44 -HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
45 -SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
46 -
47 -LICENSE="BSD"
48 -SLOT="0"
49 -KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
50 -IUSE="perl tcl unicode"
51 -
52 -CDEPEND="|| ( ${DBDEPENDS} )
53 - >=sys-libs/ncurses-5.6-r2
54 - perl? ( dev-lang/perl )
55 - tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
56 -
57 -DEPEND="${CDEPEND}
58 - virtual/pkgconfig"
59 -
60 -RDEPEND="${CDEPEND}
61 - app-eselect/eselect-vi"
62 -
63 -REQUIRED_USE="tcl? ( !unicode )"
64 -
65 -src_prepare() {
66 -
67 - epatch "${FILESDIR}"/${P}-db44.patch
68 - epatch "${FILESDIR}"/${P}-db.patch
69 - epatch "${FILESDIR}"/${P}-perl-as-needed.patch
70 - epatch "${FILESDIR}"/${P}-perl-shortnames.patch
71 - epatch "${FILESDIR}"/${P}-ac_config_header.patch
72 - epatch "${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
73 -
74 - cd dist || die
75 - chmod +x findconfig || die
76 -
77 - append-cppflags -I"$(db_includedir ${DBSLOTS})"
78 -
79 - sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.in || die
80 - rm -f configure || die
81 - eautoreconf -Im4
82 -}
83 -
84 -src_configure() {
85 - local myconf
86 -
87 - use perl && myconf="${myconf} --enable-perlinterp"
88 - use unicode && myconf="${myconf} --enable-widechar"
89 - use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
90 -
91 - append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'
92 -
93 - pushd dist 2>/dev/null
94 - econf \
95 - --program-prefix=n \
96 - ${myconf} \
97 - || die "configure failed"
98 - popd 2>/dev/null
99 -}
100 -
101 -src_compile() {
102 - pushd dist 2>/dev/null
103 - emake || die "make failed"
104 - popd 2>/dev/null
105 -}
106 -
107 -src_install() {
108 - pushd dist 2>/dev/null
109 - emake -j1 DESTDIR="${D}" install || die "install failed"
110 - popd 2>/dev/null
111 -}
112 -
113 -pkg_postinst() {
114 - einfo "Setting /usr/bin/vi symlink"
115 - eselect vi update --if-unset
116 -}
117 -
118 -pkg_postrm() {
119 - einfo "Updating /usr/bin/vi symlink"
120 - eselect vi update --if-unset
121 -}
122
123 diff --git a/app-editors/nvi/nvi-1.81.6-r6.ebuild b/app-editors/nvi/nvi-1.81.6-r6.ebuild
124 deleted file mode 100644
125 index 716ff8d45ba..00000000000
126 --- a/app-editors/nvi/nvi-1.81.6-r6.ebuild
127 +++ /dev/null
128 @@ -1,100 +0,0 @@
129 -# Copyright 1999-2016 Gentoo Foundation
130 -# Distributed under the terms of the GNU General Public License v2
131 -
132 -EAPI=6
133 -
134 -inherit autotools db-use flag-o-matic
135 -
136 -DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
137 -DBSLOTS=
138 -DBDEPENDS=
139 -for DBVER in ${DBVERS}
140 -do
141 - if [[ ${DBVER} = *.*.* ]]; then
142 - DBSLOTS="${DBSLOTS} ${DBVER%.*}"
143 - DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}"
144 - else
145 - DBSLOTS="${DBSLOTS} ${DBVER}"
146 - DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}"
147 - fi
148 -done
149 -
150 -DESCRIPTION="Vi clone"
151 -HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
152 -SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
153 -
154 -LICENSE="BSD"
155 -SLOT="0"
156 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
157 -IUSE="perl tcl unicode"
158 -
159 -CDEPEND="|| ( ${DBDEPENDS} )
160 - >=sys-libs/ncurses-5.6-r2:=
161 - perl? ( dev-lang/perl )
162 - tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
163 -
164 -DEPEND="${CDEPEND}
165 - virtual/pkgconfig"
166 -
167 -RDEPEND="${CDEPEND}
168 - app-eselect/eselect-vi"
169 -
170 -REQUIRED_USE="tcl? ( !unicode )"
171 -
172 -PATCHES=(
173 - "${FILESDIR}"/${P}-strlen-macro-renaming.patch
174 - "${FILESDIR}"/${P}-db44.patch
175 - "${FILESDIR}"/${P}-db.patch
176 - "${FILESDIR}"/${P}-perl-as-needed.patch
177 - "${FILESDIR}"/${P}-perl-shortnames.patch
178 - "${FILESDIR}"/${P}-ac_config_header.patch
179 - "${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
180 - "${FILESDIR}"/${P}-printf-types.patch
181 - )
182 -
183 -src_prepare() {
184 - default
185 -
186 - cd dist || die
187 - chmod +x findconfig || die
188 -
189 - mv configure.{in,ac} || die
190 - sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.ac || die
191 - sed -i -e "s@^install-\(.*\)-local:@install-\1-hook:@" Makefile.am || die
192 - eautoreconf -Im4
193 -}
194 -
195 -src_configure() {
196 - local myconf
197 -
198 - use perl && myconf="${myconf} --enable-perlinterp"
199 - use unicode && myconf="${myconf} --enable-widechar"
200 - use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
201 -
202 - append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'
203 - append-cppflags -I"$(db_includedir ${DBSLOTS})"
204 -
205 - pushd dist 2>/dev/null || die
206 - econf \
207 - --program-prefix=n \
208 - ${myconf}
209 - popd 2>/dev/null || die
210 -}
211 -
212 -src_compile() {
213 - emake -C dist
214 -}
215 -
216 -src_install() {
217 - emake -C dist DESTDIR="${D}" install
218 -}
219 -
220 -pkg_postinst() {
221 - einfo "Setting /usr/bin/vi symlink"
222 - eselect vi update --if-unset
223 -}
224 -
225 -pkg_postrm() {
226 - einfo "Updating /usr/bin/vi symlink"
227 - eselect vi update --if-unset
228 -}