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: sci-libs/torch/, sci-libs/torch/files/, profiles/
Date: Sun, 26 Jun 2016 15:17:41
Message-Id: 1466953993.af5bd0ce8576e0ad533467aa9c7e2d3b8945121d.mgorny@gentoo
1 commit: af5bd0ce8576e0ad533467aa9c7e2d3b8945121d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 26 15:13:13 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 26 15:13:13 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5bd0ce
7
8 sci-libs/torch: Remove last rited packages
9
10 profiles/package.mask | 5 ---
11 sci-libs/torch/Manifest | 2 --
12 sci-libs/torch/files/3.1-prll.patch | 40 ---------------------
13 sci-libs/torch/metadata.xml | 11 ------
14 sci-libs/torch/torch-3.1.ebuild | 57 -----------------------------
15 sci-libs/torch/torch-3.ebuild | 71 -------------------------------------
16 6 files changed, 186 deletions(-)
17
18 diff --git a/profiles/package.mask b/profiles/package.mask
19 index 054e892..b1d268b 100644
20 --- a/profiles/package.mask
21 +++ b/profiles/package.mask
22 @@ -278,11 +278,6 @@ www-client/luakit
23 # See tracker bug https://bugs.gentoo.org/583478
24 >=app-text/hunspell-1.4.0
25
26 -# David Seifert <soap@g.o> (15 May 2016)
27 -# Masked for removal. Deprecated, relies on ancient CUDA APIs,
28 -# does not build with current CUDA releases. See bug #583068.
29 -sci-libs/torch
30 -
31 # Alon Bar-Lev <alonbl@g.o) (13 May 2016)
32 # Force gnutls-3.4 testing so we can stabilize it.
33 >=net-libs/gnutls-3.5.0
34
35 diff --git a/sci-libs/torch/Manifest b/sci-libs/torch/Manifest
36 deleted file mode 100644
37 index 8096562..0000000
38 --- a/sci-libs/torch/Manifest
39 +++ /dev/null
40 @@ -1,2 +0,0 @@
41 -DIST Torch3doc.tgz 1622648 SHA256 c8ff336cf1af89755ed226ca1211f335d5e8a716d0c2fef18aa34afa2a148822 SHA512 955c142da718cbf98e8778df496e6cd30c8397f6cdb976a10044cf03673b581ad7995cfa36a79a11ed0fe67e46c6f3541fded3ae92df0bc93af0c2e5e2a706d9 WHIRLPOOL 49cb726979c79282cebfe6c8a94f74d792011c6706cd38749d54375cf26207be4e0f617079082377e7d9805e4001b4cff39a117f54aeff8daacea8a440523e05
42 -DIST Torch3src.tgz 775622 SHA256 f3ae3b951bd2d966d804f273f7607af6044c06861a01143f661efac2bb15f3bd SHA512 86de7e3b1e95e21424cf2c8b8e92155073cf6b7e755442640acaeb52747d06baff2c37c369eb6c107df41e3f8ce9abe203184fd8acc12f4ef9207079122a632a WHIRLPOOL a2d979e269deb35f68cd41cd5fabcfcfc64cbc377de5c952f62c823c428698a67639fa4e4106f356c21a92773a0ed5950d07a7db660924f54fd9921088a42462
43
44 diff --git a/sci-libs/torch/files/3.1-prll.patch b/sci-libs/torch/files/3.1-prll.patch
45 deleted file mode 100644
46 index 02193c3..0000000
47 --- a/sci-libs/torch/files/3.1-prll.patch
48 +++ /dev/null
49 @@ -1,40 +0,0 @@
50 -diff --git a/Makefile b/Makefile
51 -index 8771305..a39977f 100644
52 ---- a/Makefile
53 -+++ b/Makefile
54 -@@ -5,10 +5,19 @@ include Makefile_options_$(OS)
55 - SUBDIRS := core
56 - SUBDIRS += $(PACKAGES)
57 -
58 --all:
59 -- @echo ">>> Try to compile Torch <<<"
60 -- @for subdir in ${SUBDIRS} ; do ( cd $$subdir ; ${MAKE} $@) || exit 10 ; done
61 -- @echo ">> !!! Ok !!! <<<"
62 -+.PHONY: subdirs $(SUBDIRS)
63 -+
64 -+core: $(PACKAGES)
65 -+
66 -+all: subdirs
67 -+
68 -+subdirs: $(SUBDIRS)
69 -+
70 -+$(SUBDIRS):
71 -+ @\mkdir -p $(OBJS_DIR)
72 -+ @\mkdir -p $(LIBS_DIR)
73 -+ $(MAKE) -C $@ depend
74 -+ $(MAKE) -C $@
75 -
76 - clean:
77 - @echo ">>> Atomise all <<<"
78 -diff --git a/core/Makefile b/core/Makefile
79 -index 588d366..42b8a11 100644
80 ---- a/core/Makefile
81 -+++ b/core/Makefile
82 -@@ -11,6 +11,7 @@ all: $(LIBTORCH)
83 - $(LIBTORCH): $(OBJS)
84 - @echo "Archiving..."
85 - @$(AR) $(LIBTORCH) $(OBJS)
86 -+ @ranlib $(LIBTORCH)
87 -
88 - $(OBJS_DIR)/%.o: %.cc
89 - @echo $<
90
91 diff --git a/sci-libs/torch/metadata.xml b/sci-libs/torch/metadata.xml
92 deleted file mode 100644
93 index ce2e292..0000000
94 --- a/sci-libs/torch/metadata.xml
95 +++ /dev/null
96 @@ -1,11 +0,0 @@
97 -<?xml version="1.0" encoding="UTF-8"?>
98 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
99 -<pkgmetadata>
100 -<maintainer type="project">
101 - <email>sci@g.o</email>
102 - <name>Gentoo Science Project</name>
103 -</maintainer>
104 -<longdescription>
105 - Torch is a machine-learning library, written in simple C++.
106 -</longdescription>
107 -</pkgmetadata>
108
109 diff --git a/sci-libs/torch/torch-3.1.ebuild b/sci-libs/torch/torch-3.1.ebuild
110 deleted file mode 100644
111 index 12805a6..0000000
112 --- a/sci-libs/torch/torch-3.1.ebuild
113 +++ /dev/null
114 @@ -1,57 +0,0 @@
115 -# Copyright 1999-2012 Gentoo Foundation
116 -# Distributed under the terms of the GNU General Public License v2
117 -# $Id$
118 -
119 -EAPI=4
120 -
121 -inherit eutils multilib toolchain-funcs
122 -
123 -DESCRIPTION="Machine-learning library, written in simple C++"
124 -HOMEPAGE="http://www.torch.ch/"
125 -SRC_URI="http://www.torch.ch/archives/Torch${PV%.1}src.tgz
126 - doc? ( http://www.torch.ch/archives/Torch3doc.tgz )"
127 -
128 -LICENSE="BSD"
129 -SLOT="0"
130 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
131 -IUSE="debug doc examples"
132 -
133 -S=${WORKDIR}/Torch${PV%.1}
134 -
135 -TORCH_PACKAGES="convolutions datasets decoder distributions gradients kernels matrix nonparametrics speech"
136 -
137 -src_prepare() {
138 - epatch "${FILESDIR}"/${PV}-prll.patch
139 -}
140 -
141 -src_compile() {
142 - local shalldebug="OPT"
143 - use debug && shalldebug="DBG"
144 - # -malign-double makes no sense on a 64-bit arch
145 - use amd64 || extraflags="-malign-double"
146 - cp config/Makefile_options_Linux .
147 - sed -i \
148 - -e "s:^PACKAGES.*:PACKAGES = ${TORCH_PACKAGES}:" \
149 - -e "s:^DEBUG.*:DEBUG = ${shalldebug}:" \
150 - -e "s:^CFLAGS_OPT_FLOAT.*:CFLAGS_OPT_FLOAT = ${CXXFLAGS} -ffast-math ${extraflags} -fPIC:" \
151 - -e "s:g++:$(tc-getCXX):g" \
152 - Makefile_options_Linux || die
153 -
154 - emake || die "emake failed"
155 -}
156 -
157 -src_install() {
158 - dolib.a lib/*/*.a
159 - insinto /usr/include/torch
160 - for directory in core ${TORCH_PACKAGES}; do
161 - doins ${directory}/*.h
162 - done
163 -
164 - if use examples; then
165 - insinto /usr/share/doc/${PF}
166 - doins -r examples
167 - fi
168 -
169 - use doc && dodoc "${WORKDIR}"/docs/*pdf \
170 - && dohtml -r "${WORKDIR}"/docs/manual/*
171 -}
172
173 diff --git a/sci-libs/torch/torch-3.ebuild b/sci-libs/torch/torch-3.ebuild
174 deleted file mode 100644
175 index e7cf73a..0000000
176 --- a/sci-libs/torch/torch-3.ebuild
177 +++ /dev/null
178 @@ -1,71 +0,0 @@
179 -# Copyright 1999-2010 Gentoo Foundation
180 -# Distributed under the terms of the GNU General Public License v2
181 -# $Id$
182 -
183 -inherit toolchain-funcs multilib
184 -
185 -DESCRIPTION="machine-learning library, written in simple C++"
186 -HOMEPAGE="http://www.torch.ch/"
187 -SRC_URI="http://www.torch.ch/archives/Torch${PV}src.tgz
188 - doc? ( http://www.torch.ch/archives/Torch3doc.tgz )"
189 -
190 -LICENSE="BSD"
191 -SLOT="0"
192 -KEYWORDS="x86 ~amd64"
193 -IUSE="doc debug"
194 -
195 -DEPEND=""
196 -
197 -S=${WORKDIR}/Torch${PV}
198 -
199 -torch_packages="convolutions datasets decoder distributions gradients kernels matrix nonparametrics speech"
200 -
201 -src_compile() {
202 - local shalldebug="OPT"
203 - use debug && shalldebug="DBG"
204 - # -malign-double makes no sense on a 64-bit arch
205 - use amd64 || extraflags="-malign-double"
206 - cp config/Makefile_options_Linux .
207 - sed -i \
208 - -e "s:^PACKAGES.*:PACKAGES = ${torch_packages}:" \
209 - -e "s:^DEBUG.*:DEBUG = ${shalldebug}:" \
210 - -e "s:^CFLAGS_OPT_FLOAT.*:CFLAGS_OPT_FLOAT = -Wall ${CFLAGS} -ffast-math ${extraflags}:" \
211 - Makefile_options_Linux
212 -
213 - make depend
214 - emake || die "emake failed"
215 -}
216 -
217 -src_install() {
218 - dolib lib/*/*.a
219 - dodir /usr/include/torch
220 - insinto /usr/include/torch
221 - for directory in core ${torch_packages}; do
222 - doins ${directory}/*.h
223 - done
224 - # prepare the options Makefile
225 - sed -i \
226 - -e "s:^LIBS_DIR.*:LIBS_DIR=/usr/$(get_libdir):" \
227 - -e 's|^INCS := .*|INCS := -I /usr/include/torch $(MYINCS)|' \
228 - -e '/^INCS +=/c\\' \
229 - Makefile_options_Linux
230 - dodir /usr/share/${PN}
231 - insinto /usr/share/${PN}
232 - doins Makefile_options_Linux
233 - dodir /usr/share/doc/${PF}
234 - insinto /usr/share/doc/${PF}
235 - cp -pPR examples "${D}"/usr/share/doc/${PF}
236 - cd "${D}"/usr/share/doc/${PF}
237 - sed -i \
238 - -e 's|^TORCHDIR.*|TORCHDIR := /usr/share/torch|' \
239 - -e '/MAKE/c\\' -e '/VERSION_KEY/c\\' \
240 - examples/*/Makefile
241 - for ex in examples/*/Makefile; do
242 - echo -e '\t$(CC) $(CFLAGS_$(MODE)) $(INCS) -o $@ $< $(LIBS)' >> ${ex}
243 - done
244 - if use doc; then
245 - cd "${WORKDIR}"/docs
246 - doins *.pdf
247 - dohtml -r manual/.
248 - fi
249 -}