1 |
commit: c1fad2cdd675feb912e964d0d38cbb3212460d54 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 26 11:42:48 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 26 11:42:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1fad2cd |
7 |
|
8 |
dev-ml/camlimages: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-ml/camlimages/Manifest | 1 - |
13 |
dev-ml/camlimages/camlimages-4.0.1.ebuild | 74 ---------------------- |
14 |
.../files/camlimages-4.0.1-libpng15.patch | 67 -------------------- |
15 |
3 files changed, 142 deletions(-) |
16 |
|
17 |
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest |
18 |
index 07e0449..4bb36cc 100644 |
19 |
--- a/dev-ml/camlimages/Manifest |
20 |
+++ b/dev-ml/camlimages/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST camlimages-4.0.1.tar.bz2 2010729 SHA256 b6a5e79abcfba1316a516f2e0290e6f06c90fa1ed94d8dcd5533a2e3d51c0c89 SHA512 1d80e6b1ab7f48e4219b7bcf6287b8403b6ad56f88d39fb8d9403b5e6f8c4b346c98112874094824ed001c71605e73fd0f4ca044669a07bcf6965619c5ff4811 WHIRLPOOL 22107c7d96995e0e2d68688c5eaa502db21e493a59a9361a59f413fa27349a3f82186d21ea4e17df12bb428d7316c5c4ccaedf0bb03d192671e187b1e5ef6410 |
23 |
DIST camlimages-4.2.2.tar.bz2 789441 SHA256 eb96aa60afb139797836c2569ba1d4e3f2d0e4dbb025c117d7325468ce6c9633 SHA512 672e192255a9335c45d208b7589a344f712baa798dfc7bc7ccee7d3bda71e603bc06c7b012761f9c6372c683560c67ffa9d2af2742552884211ad4ffb541e3dd WHIRLPOOL dfe61d34da78b1d70feba1c2cf2717430ae4c99386d39fde3cfe14163665bd35a02947fcbc05f67c03de56b2fba1a13cd60a40031e1adbf6320ac239c1485c15 |
24 |
|
25 |
diff --git a/dev-ml/camlimages/camlimages-4.0.1.ebuild b/dev-ml/camlimages/camlimages-4.0.1.ebuild |
26 |
deleted file mode 100644 |
27 |
index 52d5f38..00000000 |
28 |
--- a/dev-ml/camlimages/camlimages-4.0.1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,74 +0,0 @@ |
31 |
-# Copyright 1999-2013 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
-# $Id$ |
34 |
- |
35 |
-EAPI=5 |
36 |
- |
37 |
-inherit eutils vcs-snapshot findlib multilib |
38 |
- |
39 |
-DESCRIPTION="An image manipulation library for ocaml" |
40 |
-HOMEPAGE="http://gallium.inria.fr/camlimages/" |
41 |
-SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.bz2 -> ${P}.tar.bz2" |
42 |
- |
43 |
-LICENSE="LGPL-2.1" |
44 |
-SLOT="0/${PV}" |
45 |
-KEYWORDS="~amd64 ppc x86" |
46 |
-IUSE="doc gif gtk jpeg png postscript tiff truetype X xpm zlib" |
47 |
- |
48 |
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt] |
49 |
- gif? ( media-libs/giflib ) |
50 |
- gtk? ( dev-ml/lablgtk ) |
51 |
- jpeg? ( virtual/jpeg ) |
52 |
- tiff? ( media-libs/tiff ) |
53 |
- png? ( >=media-libs/libpng-1.4:0 ) |
54 |
- postscript? ( app-text/ghostscript-gpl ) |
55 |
- truetype? ( >=media-libs/freetype-2 ) |
56 |
- xpm? ( x11-libs/libXpm ) |
57 |
- X? ( x11-apps/rgb ) |
58 |
- zlib? ( sys-libs/zlib ) |
59 |
- " |
60 |
-DEPEND="${DEPEND} |
61 |
- doc? ( dev-python/sphinx[latex] ) |
62 |
- dev-util/omake |
63 |
- dev-ml/findlib" |
64 |
- |
65 |
-REQUIRED_USE="png? ( zlib )" |
66 |
- |
67 |
-src_prepare() { |
68 |
- epatch "${FILESDIR}/${P}-libpng15.patch" |
69 |
-} |
70 |
- |
71 |
-camlimages_disable_have() { |
72 |
- if ! use $1 ; then |
73 |
- sed -i -e "s/^[[:space:]]*HAVE_$2.*\$/ HAVE_$2 = false/" OMakefile || die |
74 |
- sed -i -e "s/^[[:space:]]*SUPPORT_$2.*\$/\0\n SUPPORT_$2 = false/" OMakefile || die |
75 |
- fi |
76 |
-} |
77 |
- |
78 |
-src_configure() { |
79 |
- camlimages_disable_have gif GIF |
80 |
- camlimages_disable_have zlib Z |
81 |
- camlimages_disable_have png PNG |
82 |
- camlimages_disable_have jpeg JPEG |
83 |
- camlimages_disable_have tiff TIFF |
84 |
- camlimages_disable_have xpm XPM |
85 |
- camlimages_disable_have postscript PS |
86 |
- camlimages_disable_have gtk LABLGTK2 |
87 |
- camlimages_disable_have X GRAPHICS |
88 |
- camlimages_disable_have X RGB_TXT |
89 |
- camlimages_disable_have truetype FREETYPE |
90 |
-} |
91 |
- |
92 |
-src_compile() { |
93 |
- omake --force-dotomake || die |
94 |
- if use doc ; then |
95 |
- sphinx-build doc/sphinx sphinxdoc || die |
96 |
- fi |
97 |
-} |
98 |
- |
99 |
-src_install() { |
100 |
- findlib_src_preinst |
101 |
- omake --force-dotomake DESTDIR="${D}" install || die |
102 |
- dodoc README |
103 |
- use doc && dohtml -r sphinxdoc/* |
104 |
-} |
105 |
|
106 |
diff --git a/dev-ml/camlimages/files/camlimages-4.0.1-libpng15.patch b/dev-ml/camlimages/files/camlimages-4.0.1-libpng15.patch |
107 |
deleted file mode 100644 |
108 |
index 460b3c1..00000000 |
109 |
--- a/dev-ml/camlimages/files/camlimages-4.0.1-libpng15.patch |
110 |
+++ /dev/null |
111 |
@@ -1,67 +0,0 @@ |
112 |
-# HG changeset patch |
113 |
-# User Jun Furuse <jun.furuse@×××××.com> |
114 |
-# Date 1329456902 -28800 |
115 |
-# Node ID 4ecc49e79369d413af732c4feeab7128e2f6f11a |
116 |
-# Parent 9b5cbcd07ae5a88561fbaa4eec3938af5e8b7574 |
117 |
-png_ptr->jmpbuf => png_jmpbuf(png_ptr) |
118 |
- |
119 |
-diff -r 9b5cbcd07ae5 -r 4ecc49e79369 src/pngread.c |
120 |
---- a/src/pngread.c Tue Jan 31 22:40:50 2012 +0900 |
121 |
-+++ b/src/pngread.c Fri Feb 17 13:35:02 2012 +0800 |
122 |
-@@ -69,7 +69,7 @@ |
123 |
- } |
124 |
- |
125 |
- /* error handling */ |
126 |
-- if (setjmp(png_ptr->jmpbuf)) { |
127 |
-+ if (setjmp(png_jmpbuf(png_ptr))) { |
128 |
- /* Free all of the memory associated with the png_ptr and info_ptr */ |
129 |
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); |
130 |
- fclose(fp); |
131 |
-@@ -134,7 +134,7 @@ |
132 |
- png_set_rows(png_ptr, info_ptr, row_pointers); |
133 |
- |
134 |
- /* Later, we can return something */ |
135 |
-- if (setjmp(png_ptr->jmpbuf)) { |
136 |
-+ if (setjmp(png_jmpbuf(png_ptr))) { |
137 |
- /* Free all of the memory associated with the png_ptr and info_ptr */ |
138 |
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); |
139 |
- fclose(fp); |
140 |
-@@ -243,7 +243,7 @@ |
141 |
- } |
142 |
- |
143 |
- /* error handling */ |
144 |
-- if (setjmp(png_ptr->jmpbuf)) { |
145 |
-+ if (setjmp(png_jmpbuf(png_ptr))) { |
146 |
- /* Free all of the memory associated with the png_ptr and info_ptr */ |
147 |
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); |
148 |
- fclose(fp); |
149 |
-@@ -302,7 +302,7 @@ |
150 |
- png_set_rows(png_ptr, info_ptr, row_pointers); |
151 |
- |
152 |
- /* Later, we can return something */ |
153 |
-- if (setjmp(png_ptr->jmpbuf)) { |
154 |
-+ if (setjmp(png_jmpbuf(png_ptr))) { |
155 |
- /* Free all of the memory associated with the png_ptr and info_ptr */ |
156 |
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); |
157 |
- fclose(fp); |
158 |
-diff -r 9b5cbcd07ae5 -r 4ecc49e79369 src/pngwrite.c |
159 |
---- a/src/pngwrite.c Tue Jan 31 22:40:50 2012 +0900 |
160 |
-+++ b/src/pngwrite.c Fri Feb 17 13:35:02 2012 +0800 |
161 |
-@@ -62,7 +62,7 @@ |
162 |
- } |
163 |
- |
164 |
- /* error handling */ |
165 |
-- if (setjmp(png_ptr->jmpbuf)) { |
166 |
-+ if (setjmp(png_jmpbuf(png_ptr))) { |
167 |
- /* Free all of the memory associated with the png_ptr and info_ptr */ |
168 |
- png_destroy_write_struct(&png_ptr, &info_ptr); |
169 |
- fclose(fp); |
170 |
-@@ -171,7 +171,7 @@ |
171 |
- } |
172 |
- |
173 |
- /* error handling */ |
174 |
-- if (setjmp(png_ptr->jmpbuf)) { |
175 |
-+ if (setjmp(png_jmpbuf(png_ptr))) { |
176 |
- /* Free all of the memory associated with the png_ptr and info_ptr */ |
177 |
- png_destroy_write_struct(&png_ptr, &info_ptr); |
178 |
- fclose(fp); |