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: dev-tcltk/ck/files/, profiles/, dev-tcltk/ck/
Date: Wed, 28 Nov 2018 13:14:57
Message-Id: 1543410880.e77b0614daf126896aefc6389e4a884dc60a67e1.mgorny@gentoo
1 commit: e77b0614daf126896aefc6389e4a884dc60a67e1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 28 13:13:36 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=e77b0614
7
8 dev-tcltk/ck: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/648620
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-tcltk/ck/Manifest | 2 -
14 dev-tcltk/ck/ck-8.0-r4.ebuild | 48 ------------
15 dev-tcltk/ck/files/ck-8.0-gentoo.patch | 133 ---------------------------------
16 dev-tcltk/ck/metadata.xml | 8 --
17 profiles/package.mask | 5 --
18 5 files changed, 196 deletions(-)
19
20 diff --git a/dev-tcltk/ck/Manifest b/dev-tcltk/ck/Manifest
21 deleted file mode 100644
22 index ed29821d486..00000000000
23 --- a/dev-tcltk/ck/Manifest
24 +++ /dev/null
25 @@ -1,2 +0,0 @@
26 -DIST ck-8.0-tcl8.6.patch.xz 12836 BLAKE2B bf3596a921553c17a9cc5c40fec966464dd6f69f1f083e9be881e42ea968ff28e632c7ec9b942b06ddf69830d42b88fb9101830eefd509822a5681115daabe8f SHA512 55682b9490ac5470ef14213f0dac3fa10139a13a7e3d915773c50285038b3b566c140fcc5f4721a091744e45bbef405c2ee3ee22daf71a3a82148acba28b0dde
27 -DIST ck8.0.tar.gz 400262 BLAKE2B 068fc90f1ae8397540a29e6200c2a9e3e42b297489e3181f26d12e992b31218f2e81489bd84a36df9b8448d6f3ea279728e9cb063b6835ef35f9c0872d8793ea SHA512 68d92be354e5ec24830cc9a20d1cbb5a27d4e04369ceecf6fdad7759da3d9b4909970bf54abdf5f5b015fd0d08b8680a33cdcdf468b9007afc21e69c7381b262
28
29 diff --git a/dev-tcltk/ck/ck-8.0-r4.ebuild b/dev-tcltk/ck/ck-8.0-r4.ebuild
30 deleted file mode 100644
31 index 78193f8a902..00000000000
32 --- a/dev-tcltk/ck/ck-8.0-r4.ebuild
33 +++ /dev/null
34 @@ -1,48 +0,0 @@
35 -# Copyright 1999-2014 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=5
39 -
40 -inherit eutils multilib toolchain-funcs
41 -
42 -MY_P=${PN}${PV}
43 -S=${WORKDIR}/${MY_P}
44 -
45 -DESCRIPTION="A curses based toolkit for tcl"
46 -HOMEPAGE="http://www.ch-werner.de/ck/"
47 -SRC_URI="
48 - http://www.ch-werner.de/ck/${MY_P}.tar.gz
49 - https://dev.gentoo.org/~jlec/distfiles/${P}-tcl8.6.patch.xz"
50 -
51 -LICENSE="BSD"
52 -SLOT="0"
53 -KEYWORDS="amd64 x86"
54 -IUSE=""
55 -
56 -RDEPEND="
57 - dev-lang/tk
58 - sys-libs/ncurses[gpm]
59 - sys-libs/gpm
60 - "
61 -DEPEND="${RDEPEND}
62 - virtual/pkgconfig"
63 -
64 -src_prepare() {
65 - epatch \
66 - "${FILESDIR}"/${P}-gentoo.patch \
67 - "${WORKDIR}"/${P}-tcl8.6.patch
68 - sed \
69 - -e "/^LIB_INSTALL_DIR/s:lib$:$(get_libdir):g" \
70 - -i Makefile.in || die
71 -}
72 -
73 -src_configure() {
74 - econf \
75 - --with-tcl="${EPREFIX}/usr/$(get_libdir)" \
76 - --enable-shared
77 -}
78 -
79 -src_compile() {
80 - emake \
81 - CURSES_LIB_SWITCHES="$($(tc-getPKG_CONFIG) --libs ncursesw) -lgpm"
82 -}
83
84 diff --git a/dev-tcltk/ck/files/ck-8.0-gentoo.patch b/dev-tcltk/ck/files/ck-8.0-gentoo.patch
85 deleted file mode 100644
86 index 727f7e8b535..00000000000
87 --- a/dev-tcltk/ck/files/ck-8.0-gentoo.patch
88 +++ /dev/null
89 @@ -1,133 +0,0 @@
90 - Makefile.in | 40 ++++++++++++++++------------------------
91 - 1 files changed, 16 insertions(+), 24 deletions(-)
92 -
93 -diff --git a/Makefile.in b/Makefile.in
94 -index 00960d9..16d4123 100644
95 ---- a/Makefile.in
96 -+++ b/Makefile.in
97 -@@ -29,9 +29,9 @@ exec_prefix = @exec_prefix@
98 - # The following definition can be set to non-null for special systems
99 - # like AFS with replication. It allows the pathnames used for installation
100 - # to be different than those used for actually reference files at
101 --# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
102 -+# run-time. DESTDIR is prepended to $prefix and $exec_prefix
103 - # when installing files.
104 --INSTALL_ROOT =
105 -+DESTDIR =
106 -
107 - # Directory from which applications will reference the library of Tcl
108 - # scripts (note: you can set the CK_LIBRARY environment variable at
109 -@@ -39,22 +39,22 @@ INSTALL_ROOT =
110 - CK_LIBRARY = $(prefix)/lib/ck$(VERSION)
111 -
112 - # Path name to use when installing library scripts:
113 --SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(CK_LIBRARY)
114 -+SCRIPT_INSTALL_DIR = $(DESTDIR)$(CK_LIBRARY)
115 -
116 - # Directory in which to install the archive libck*:
117 --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
118 -+LIB_INSTALL_DIR = $(DESTDIR)$(exec_prefix)/lib
119 -
120 - # Directory in which to install the program cwsh:
121 --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
122 -+BIN_INSTALL_DIR = $(DESTDIR)$(exec_prefix)/bin
123 -
124 - # Directory from which the program cwsh should be referenced by scripts:
125 - BIN_DIR = $(exec_prefix)/bin
126 -
127 - # Directory in which to install the include file ck.h:
128 --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
129 -+INCLUDE_INSTALL_DIR = $(DESTDIR)$(prefix)/include
130 -
131 - # Top-level directory for manual entries:
132 --MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
133 -+MAN_INSTALL_DIR = $(DESTDIR)$(prefix)/share/man
134 -
135 - # Directory in which to install manual entry for cwsh:
136 - MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
137 -@@ -96,7 +96,7 @@ LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(CURSES_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
138 -
139 - # To change the compiler switches, for example to change from -O
140 - # to -g, change the following line:
141 --CFLAGS = -O
142 -+#CFLAGS = -O
143 -
144 - # To disable ANSI-C procedure prototypes reverse the comment characters
145 - # on the following lines:
146 -@@ -231,14 +231,14 @@ configInfo: Makefile
147 - @echo "CK_CURSES_INCLUDES = ${CURSES_INCLUDES}" >> configInfo
148 - @echo "CK_LIBS = ${CURSES_LIB_SWITCHES} @LIBS@" >> configInfo
149 -
150 --install: install-binaries install-libraries
151 -+install: install-man install-binaries install-libraries
152 -
153 - install-binaries: $(CK_LIB_FILE) cwsh
154 - @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
155 - do \
156 - if [ ! -d $$i ] ; then \
157 - echo "Making directory $$i"; \
158 -- mkdir $$i; \
159 -+ mkdir -p $$i; \
160 - chmod 755 $$i; \
161 - else true; \
162 - fi; \
163 -@@ -251,12 +251,12 @@ install-binaries: $(CK_LIB_FILE) cwsh
164 - @$(INSTALL_PROGRAM) cwsh $(BIN_INSTALL_DIR)/cwsh
165 -
166 - install-libraries:
167 -- @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
168 -+ @for i in $(DESTDIR)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
169 - $(SCRIPT_INSTALL_DIR) ; \
170 - do \
171 - if [ ! -d $$i ] ; then \
172 - echo "Making directory $$i"; \
173 -- mkdir $$i; \
174 -+ mkdir -p $$i; \
175 - chmod 755 $$i; \
176 - else true; \
177 - fi; \
178 -@@ -270,13 +270,13 @@ install-libraries:
179 - done;
180 -
181 - install-demos:
182 -- @for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
183 -+ @for i in $(DESTDIR)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
184 - $(SCRIPT_INSTALL_DIR)/demos \
185 - $(SCRIPT_INSTALL_DIR)/demos/images ; \
186 - do \
187 - if [ ! -d $$i ] ; then \
188 - echo "Making directory $$i"; \
189 -- mkdir $$i; \
190 -+ mkdir -p $$i; \
191 - chmod 755 $$i; \
192 - else true; \
193 - fi; \
194 -@@ -301,11 +301,11 @@ install-demos:
195 - done;
196 -
197 - install-man:
198 -- @for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
199 -+ @for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR); \
200 - do \
201 - if [ ! -d $$i ] ; then \
202 - echo "Making directory $$i"; \
203 -- mkdir $$i; \
204 -+ mkdir -p $$i; \
205 - chmod 755 $$i; \
206 - else true; \
207 - fi; \
208 -@@ -326,14 +326,6 @@ install-man:
209 - $$i > $(MAN3_INSTALL_DIR)/$$i; \
210 - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
211 - done;
212 -- @cd $(SRC_DIR)/doc; for i in *.n; \
213 -- do \
214 -- echo "Installing doc/$$i"; \
215 -- rm -f $(MANN_INSTALL_DIR)/$$i; \
216 -- sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
217 -- $$i > $(MANN_INSTALL_DIR)/$$i; \
218 -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \
219 -- done;
220 -
221 - Makefile: $(SRC_DIR)/Makefile.in
222 - $(SHELL) config.status
223
224 diff --git a/dev-tcltk/ck/metadata.xml b/dev-tcltk/ck/metadata.xml
225 deleted file mode 100644
226 index 227dda5ba58..00000000000
227 --- a/dev-tcltk/ck/metadata.xml
228 +++ /dev/null
229 @@ -1,8 +0,0 @@
230 -<?xml version="1.0" encoding="UTF-8"?>
231 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
232 -<pkgmetadata>
233 - <maintainer type="project">
234 - <email>tcltk@g.o</email>
235 - <name>Gentoo Tcltk Project</name>
236 - </maintainer>
237 -</pkgmetadata>
238
239 diff --git a/profiles/package.mask b/profiles/package.mask
240 index 602ec425f4b..467f8659971 100644
241 --- a/profiles/package.mask
242 +++ b/profiles/package.mask
243 @@ -501,11 +501,6 @@ media-gfx/splash-themes-gentoo
244 media-gfx/splash-themes-livecd
245 media-gfx/splash-themes-livedvd
246
247 -# Andreas K. Hüttel <dilfridge@g.o> (20 Oct 2018)
248 -# Fails to build with glibc-2.27, bug 648620. No reverse
249 -# dependencies. Removal in 30 days.
250 -dev-tcltk/ck
251 -
252 # Sobhan Mohammadpour <sobhan@g.o> (15 Oct 2018)
253 # Masked for testing.
254 sys-apps/bubblewrap