Gentoo Archives: gentoo-commits

From: Keri Harris <keri@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gprolog/, dev-lang/gprolog/files/
Date: Fri, 11 Sep 2020 15:01:42
Message-Id: 1599836471.8b110704a41981d32fd2d7ff30bba3fee2a91a37.keri@gentoo
1 commit: 8b110704a41981d32fd2d7ff30bba3fee2a91a37
2 Author: Keri Harris <keri <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 11 15:01:11 2020 +0000
4 Commit: Keri Harris <keri <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 11 15:01:11 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b110704
7
8 dev-lang/gprolog: remove old version
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.22
11 Signed-off-by: Keri Harris <keri <AT> gentoo.org>
12
13 dev-lang/gprolog/Manifest | 1 -
14 dev-lang/gprolog/files/gprolog-1.4.4-ldflags.patch | 40 --------------
15 dev-lang/gprolog/files/gprolog-1.4.4-links.patch | 16 ------
16 dev-lang/gprolog/files/gprolog-1.4.4-nodocs.patch | 30 -----------
17 .../gprolog/files/gprolog-1.4.4-pic-code.patch | 12 -----
18 .../gprolog/files/gprolog-1.4.4-txt-file.patch | 11 ----
19 dev-lang/gprolog/gprolog-1.4.4.ebuild | 63 ----------------------
20 7 files changed, 173 deletions(-)
21
22 diff --git a/dev-lang/gprolog/Manifest b/dev-lang/gprolog/Manifest
23 index 0f280a843b7..a0bddf84cdf 100644
24 --- a/dev-lang/gprolog/Manifest
25 +++ b/dev-lang/gprolog/Manifest
26 @@ -1,2 +1 @@
27 -DIST gprolog-1.4.4.tar.gz 3538152 BLAKE2B 159cf58e6d7f33662a6bd11f284abd9e52be0f82cafe180263148d13002e66987253e9dcd7db232b33470ddb685570efe3615c7029af96be44bb556bd9c2d261 SHA512 b6227a06794d31162f2c790a025f7372a6676c1891a76e880d2152aeab6322d3341aeab85e11d9be6d97ff1c69801bee73fa3ea6b0659af61f55990a455dc212
28 DIST gprolog-1.4.5.tar.gz 3587361 BLAKE2B c0c73ce249d7c26b914a3f831c6ac93aeb884bded6c5ebbe51223f0685de0be2e746533aade1633a953b93e88a30796fa52ecd5e609d05bc051363cbf34e0477 SHA512 425103bc9e5bdbdb4ae331f5be0cf49524fbdb4f5e2809fb973360de9e7ad9935c1b28f3603e0be696a647153d9f0d3dacdc87251098ac99faf7d0b3c652fc60
29
30 diff --git a/dev-lang/gprolog/files/gprolog-1.4.4-ldflags.patch b/dev-lang/gprolog/files/gprolog-1.4.4-ldflags.patch
31 deleted file mode 100644
32 index 21f256bf71c..00000000000
33 --- a/dev-lang/gprolog/files/gprolog-1.4.4-ldflags.patch
34 +++ /dev/null
35 @@ -1,40 +0,0 @@
36 -diff -ur gprolog-1.4.4.orig/src/Ma2Asm/Makefile.in gprolog-1.4.4/src/Ma2Asm/Makefile.in
37 ---- gprolog-1.4.4.orig/src/Ma2Asm/Makefile.in 2013-04-15 09:24:11.000000000 +0200
38 -+++ gprolog-1.4.4/src/Ma2Asm/Makefile.in 2013-05-15 16:59:59.000000000 +0200
39 -@@ -19,7 +19,7 @@
40 -
41 - ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
42 - ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
43 -- $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
44 -+ $(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
45 -
46 -
47 - clean:
48 -diff -ur gprolog-1.4.4.orig/src/TopComp/Makefile.in gprolog-1.4.4/src/TopComp/Makefile.in
49 ---- gprolog-1.4.4.orig/src/TopComp/Makefile.in 2013-04-15 09:24:12.000000000 +0200
50 -+++ gprolog-1.4.4/src/TopComp/Makefile.in 2013-05-15 16:59:59.000000000 +0200
51 -@@ -15,10 +15,10 @@
52 -
53 - $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
54 - ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
55 -- $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
56 -+ $(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
57 -
58 - $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
59 -- $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
60 -+ $(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
61 -
62 -
63 -
64 -diff -ur gprolog-1.4.4.orig/src/Wam2Ma/Makefile.in gprolog-1.4.4/src/Wam2Ma/Makefile.in
65 ---- gprolog-1.4.4.orig/src/Wam2Ma/Makefile.in 2013-04-15 09:24:11.000000000 +0200
66 -+++ gprolog-1.4.4/src/Wam2Ma/Makefile.in 2013-05-15 16:59:59.000000000 +0200
67 -@@ -12,7 +12,7 @@
68 - $(CC) $(CFLAGS) -c wam2ma.c
69 -
70 - wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
71 -- $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
72 -+ $(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
73 -
74 -
75 - clean:
76
77 diff --git a/dev-lang/gprolog/files/gprolog-1.4.4-links.patch b/dev-lang/gprolog/files/gprolog-1.4.4-links.patch
78 deleted file mode 100644
79 index 25044ac9fc3..00000000000
80 --- a/dev-lang/gprolog/files/gprolog-1.4.4-links.patch
81 +++ /dev/null
82 @@ -1,16 +0,0 @@
83 -diff -ur gprolog-1.4.4.orig/src/Makefile.in gprolog-1.4.4/src/Makefile.in
84 ---- gprolog-1.4.4.orig/src/Makefile.in 2013-04-23 16:56:44.000000000 +0200
85 -+++ gprolog-1.4.4/src/Makefile.in 2013-05-15 17:00:58.000000000 +0200
86 -@@ -81,10 +81,10 @@
87 -
88 - # --- Links --- #
89 -
90 --install-links: uninstall-links
91 -+install-links:
92 - if test $(LINKS_DIR) != none; then \
93 - ./mkinstalldirs $(LINKS_DIR); \
94 -- (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
95 -+ (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
96 - fi
97 -
98 - uninstall-links:
99
100 diff --git a/dev-lang/gprolog/files/gprolog-1.4.4-nodocs.patch b/dev-lang/gprolog/files/gprolog-1.4.4-nodocs.patch
101 deleted file mode 100644
102 index f5246e0302a..00000000000
103 --- a/dev-lang/gprolog/files/gprolog-1.4.4-nodocs.patch
104 +++ /dev/null
105 @@ -1,30 +0,0 @@
106 -diff -ur gprolog-1.4.4.orig/src/Makefile.in gprolog-1.4.4/src/Makefile.in
107 ---- gprolog-1.4.4.orig/src/Makefile.in 2013-04-23 16:56:44.000000000 +0200
108 -+++ gprolog-1.4.4/src/Makefile.in 2013-05-15 17:01:25.000000000 +0200
109 -@@ -97,7 +97,7 @@
110 - # --- Documentation --- #
111 -
112 - install-doc:
113 -- if test $(DOC_DIR) != none; then \
114 -+ if test $(DOC_DIR) != $(DESTDIR)none; then \
115 - ./mkinstalldirs $(DOC_DIR); \
116 - (F=`cd ../doc; echo $(DOC_FILES)`; \
117 - for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
118 -@@ -113,7 +113,7 @@
119 - # --- HTML --- #
120 -
121 - install-html:
122 -- if test $(HTML_DIR) != none; then \
123 -+ if test $(HTML_DIR) != $(DESTDIR)none; then \
124 - ./mkinstalldirs $(HTML_DIR); \
125 - (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
126 - for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
127 -@@ -129,7 +129,7 @@
128 - # --- Examples --- #
129 -
130 - install-examples:
131 -- if test $(EXAMPLES_DIR) != none; then \
132 -+ if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
133 - ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
134 - (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
135 - for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
136
137 diff --git a/dev-lang/gprolog/files/gprolog-1.4.4-pic-code.patch b/dev-lang/gprolog/files/gprolog-1.4.4-pic-code.patch
138 deleted file mode 100644
139 index a85aea0746e..00000000000
140 --- a/dev-lang/gprolog/files/gprolog-1.4.4-pic-code.patch
141 +++ /dev/null
142 @@ -1,12 +0,0 @@
143 -diff -ur gprolog-1.4.4.orig/src/Ma2Asm/x86_64_any.c gprolog-1.4.4/src/Ma2Asm/x86_64_any.c
144 ---- gprolog-1.4.4.orig/src/Ma2Asm/x86_64_any.c 2013-04-22 13:52:16.000000000 +0200
145 -+++ gprolog-1.4.4/src/Ma2Asm/x86_64_any.c 2017-07-19 17:27:37.057124771 +0200
146 -@@ -204,7 +204,7 @@
147 - strcpy(asm_reg_cp, Off_Reg_Bank(MAP_OFFSET_CP));
148 - #endif
149 -
150 --#ifdef M_x86_64_darwin
151 -+#if defined(M_x86_64_darwin) || defined(M_x86_64_linux)
152 - pic_code = 1; /* NB: on darwin everything is PIC code */
153 - #elif defined(_WIN32)
154 - pic_code = 0; /* NB: on MinGW nothing is needed for PIC code */
155
156 diff --git a/dev-lang/gprolog/files/gprolog-1.4.4-txt-file.patch b/dev-lang/gprolog/files/gprolog-1.4.4-txt-file.patch
157 deleted file mode 100644
158 index adeb4428b58..00000000000
159 --- a/dev-lang/gprolog/files/gprolog-1.4.4-txt-file.patch
160 +++ /dev/null
161 @@ -1,11 +0,0 @@
162 -diff -ur gprolog-1.4.4.orig/src/Makefile.in gprolog-1.4.4/src/Makefile.in
163 ---- gprolog-1.4.4.orig/src/Makefile.in 2013-04-23 16:56:44.000000000 +0200
164 -+++ gprolog-1.4.4/src/Makefile.in 2013-05-15 17:01:48.000000000 +0200
165 -@@ -60,7 +60,6 @@
166 - install-system:
167 - ./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
168 - $(INSTALL_DIR)/include $(INSTALL_DIR)/lib
169 -- for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
170 - for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
171 - for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
172 - for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
173
174 diff --git a/dev-lang/gprolog/gprolog-1.4.4.ebuild b/dev-lang/gprolog/gprolog-1.4.4.ebuild
175 deleted file mode 100644
176 index 4d915c78666..00000000000
177 --- a/dev-lang/gprolog/gprolog-1.4.4.ebuild
178 +++ /dev/null
179 @@ -1,63 +0,0 @@
180 -# Copyright 1999-2017 Gentoo Foundation
181 -# Distributed under the terms of the GNU General Public License v2
182 -
183 -EAPI=4
184 -
185 -inherit eutils flag-o-matic multilib
186 -
187 -DESCRIPTION="A native Prolog compiler with constraint solving over finite domains (FD)"
188 -HOMEPAGE="http://www.gprolog.org/"
189 -SRC_URI="mirror://gnu/gprolog/${P}.tar.gz"
190 -S="${WORKDIR}"/${P}
191 -
192 -LICENSE="GPL-2 LGPL-3"
193 -SLOT="0"
194 -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
195 -IUSE="debug doc examples"
196 -
197 -DEPEND=""
198 -RDEPEND=""
199 -
200 -src_prepare() {
201 - epatch "${FILESDIR}"/${P}-ldflags.patch
202 - epatch "${FILESDIR}"/${P}-pic-code.patch
203 - epatch "${FILESDIR}"/${P}-links.patch
204 - epatch "${FILESDIR}"/${P}-nodocs.patch
205 - epatch "${FILESDIR}"/${P}-txt-file.patch
206 -}
207 -
208 -src_configure() {
209 - CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`"
210 -
211 - append-flags -fno-strict-aliasing
212 - use debug && append-flags -DDEBUG
213 -
214 - cd "${S}"/src
215 - econf \
216 - CFLAGS_MACHINE="${CFLAGS_MACHINE}" \
217 - --with-c-flags="${CFLAGS}" \
218 - --with-install-dir="${EPREFIX}"/usr/$(get_libdir)/${P} \
219 - --with-links-dir="${EPREFIX}"/usr/bin \
220 - $(use_with doc doc-dir ${EPREFIX}/usr/share/doc/${PF}) \
221 - $(use_with doc html-dir ${EPREFIX}/usr/share/doc/${PF}/html) \
222 - $(use_with examples examples-dir ${EPREFIX}/usr/share/doc/${PF}/examples)
223 -}
224 -
225 -src_compile() {
226 - cd "${S}"/src
227 - # gprolog is compiled using gplc which cannot be run in parallel
228 - emake -j1
229 -}
230 -
231 -src_test() {
232 - cd "${S}"/src
233 - emake -j1 check
234 -}
235 -
236 -src_install() {
237 - cd "${S}"/src
238 - emake DESTDIR="${D}" install
239 -
240 - cd "${S}"
241 - dodoc ChangeLog NEWS PROBLEMS README VERSION
242 -}