1 |
commit: a3a28a87bff4c1f6b9f73299f40e87a7415fe45c |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 30 22:13:44 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 30 22:14:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3a28a87 |
7 |
|
8 |
dev-libs/fribidi: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
11 |
|
12 |
dev-libs/fribidi/Manifest | 2 - |
13 |
dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch | 11 ----- |
14 |
.../files/fribidi-0.19.5-signedwarning.patch | 22 ---------- |
15 |
.../files/fribidi-0.19.6-page-size-header.patch | 20 --------- |
16 |
dev-libs/fribidi/fribidi-0.19.5-r1.ebuild | 49 ---------------------- |
17 |
dev-libs/fribidi/fribidi-0.19.6.ebuild | 46 -------------------- |
18 |
6 files changed, 150 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest |
21 |
index 619d203f174..6ef5a14693c 100644 |
22 |
--- a/dev-libs/fribidi/Manifest |
23 |
+++ b/dev-libs/fribidi/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST fribidi-0.19.5.tar.bz2 625034 BLAKE2B 74929614cc07a574ffaddcde4bcbfd09dd107362a9f82502b940f6be08bf61a2004237429695184d1c59667a3689d5e01787586cdbc536fb17c3c093b7fb22a2 SHA512 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43 |
26 |
-DIST fribidi-0.19.6.tar.bz2 639022 BLAKE2B cf17ec580d93807e7720f7833bcac2e5ffaa16dd52505e1a3158d6d6fc6af5111ad11d75b15c7837185d04b48f18ca72b6b903962b084c5a7f5fbcc0bcf7f1bb SHA512 0661cf8e0985edfd5bf02c8de32432bf2faacadcaf35aef4e039a28f802a0468288e76b60231ebe7b54f909bd4d3ecc31a1fc94e83d434ae16dd21de6089629e |
27 |
DIST fribidi-0.19.7.tar.bz2 648299 BLAKE2B 496d010f29dd8fc3d349ad3f89d60a596dfceaa5350663442d5965cb09bc7a23e2ab8a876d7ca5b05ec3f4c5e178060cae2b493ccc46a6cdfc022d139e778259 SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63 |
28 |
DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2 |
29 |
|
30 |
diff --git a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch b/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch |
31 |
deleted file mode 100644 |
32 |
index 8649db28552..00000000000 |
33 |
--- a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch |
34 |
+++ /dev/null |
35 |
@@ -1,11 +0,0 @@ |
36 |
---- Makefile.am |
37 |
-+++ Makefile.am |
38 |
-@@ -9,7 +9,7 @@ |
39 |
- ############################################################################## |
40 |
- |
41 |
- ## The order of subdirs is important, don't change without a reason. |
42 |
--SUBDIRS = gen.tab charset lib bin doc test |
43 |
-+SUBDIRS = gen.tab charset lib bin test |
44 |
- |
45 |
- EXTRA_DIST = bootstrap ChangeLog.old |
46 |
- |
47 |
|
48 |
diff --git a/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch b/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch |
49 |
deleted file mode 100644 |
50 |
index 2619bf37551..00000000000 |
51 |
--- a/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch |
52 |
+++ /dev/null |
53 |
@@ -1,22 +0,0 @@ |
54 |
-From 78dc3af68ed0e1aafe54c176b28dadee66eb306c Mon Sep 17 00:00:00 2001 |
55 |
-From: Behdad Esfahbod <behdad@××××××.org> |
56 |
-Date: Thu, 06 Dec 2012 17:17:53 +0000 |
57 |
-Subject: Fix theoretically possible overflow |
58 |
- |
59 |
-https://bugzilla.redhat.com/show_bug.cgi?id=884000 |
60 |
---- |
61 |
-diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c |
62 |
-index ac9e2ff..dd27f0d 100644 |
63 |
---- a/bin/fribidi-main.c |
64 |
-+++ b/bin/fribidi-main.c |
65 |
-@@ -519,7 +519,7 @@ main ( |
66 |
- idx++; |
67 |
- } |
68 |
- #endif /* !FRIBIDI_MAIN_USE_ICONV_H */ |
69 |
-- if (wid < 0 && idx > st + 1) |
70 |
-+ if (wid < 0 && idx - st > 1) |
71 |
- idx--; |
72 |
- inlen = idx - st; |
73 |
- |
74 |
--- |
75 |
-cgit v0.9.0.2-2-gbebe |
76 |
|
77 |
diff --git a/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch b/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch |
78 |
deleted file mode 100644 |
79 |
index c2b39155eea..00000000000 |
80 |
--- a/dev-libs/fribidi/files/fribidi-0.19.6-page-size-header.patch |
81 |
+++ /dev/null |
82 |
@@ -1,20 +0,0 @@ |
83 |
-diff -ur fribidi-0.19.6.old/lib/common.h fribidi-0.19.6/lib/common.h |
84 |
---- fribidi-0.19.6.old/lib/common.h 2012-12-30 00:12:59.000000000 +0000 |
85 |
-+++ fribidi-0.19.6/lib/common.h 2014-05-03 11:04:19.969727962 +0100 |
86 |
-@@ -130,14 +130,8 @@ |
87 |
- /* FRIBIDI_CHUNK_SIZE is the number of bytes in each chunk of memory being |
88 |
- * allocated for data structure pools. */ |
89 |
- #ifndef FRIBIDI_CHUNK_SIZE |
90 |
--# if HAVE_ASM_PAGE_H |
91 |
--# ifndef __FRIBIDI_DOC |
92 |
--# include <asm/page.h> |
93 |
--# endif /* __FRIBIDI_DOC */ |
94 |
--# define FRIBIDI_CHUNK_SIZE (PAGE_SIZE - 16) |
95 |
--# else /* !HAVE_ASM_PAGE_H */ |
96 |
--# define FRIBIDI_CHUNK_SIZE (4096 - 16) |
97 |
--# endif /* !HAVE_ASM_PAGE_H */ |
98 |
-+# include <unistd.h> |
99 |
-+# define FRIBIDI_CHUNK_SIZE (sysconf(_SC_PAGESIZE) - 16) |
100 |
- #else /* FRIBIDI_CHUNK_SIZE */ |
101 |
- # if FRIBIDI_CHUNK_SIZE < 256 |
102 |
- # error FRIBIDI_CHUNK_SIZE now should define the size of a chunk in bytes. |
103 |
|
104 |
diff --git a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild b/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild |
105 |
deleted file mode 100644 |
106 |
index f2f12390a25..00000000000 |
107 |
--- a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild |
108 |
+++ /dev/null |
109 |
@@ -1,49 +0,0 @@ |
110 |
-# Copyright 1999-2017 Gentoo Foundation |
111 |
-# Distributed under the terms of the GNU General Public License v2 |
112 |
- |
113 |
-EAPI=5 |
114 |
-inherit autotools eutils |
115 |
- |
116 |
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm" |
117 |
-HOMEPAGE="https://fribidi.org/" |
118 |
-SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2" |
119 |
- |
120 |
-LICENSE="LGPL-2.1" |
121 |
-SLOT="0" |
122 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
123 |
-IUSE="static-libs" |
124 |
- |
125 |
-RESTRICT="test" #397347 |
126 |
- |
127 |
-RDEPEND=">=dev-libs/glib-2" |
128 |
-DEPEND="${RDEPEND} |
129 |
- virtual/pkgconfig" |
130 |
- |
131 |
-DOCS="AUTHORS NEWS README ChangeLog THANKS TODO" |
132 |
- |
133 |
-src_prepare() { |
134 |
- epatch \ |
135 |
- "${FILESDIR}"/${PN}-0.19.2-nodoc.patch \ |
136 |
- "${FILESDIR}"/${P}-signedwarning.patch |
137 |
- |
138 |
- # Fix compability with dev-libs/glib >= 2.31 |
139 |
- sed -i \ |
140 |
- -e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \ |
141 |
- -e '/include/s:<glib/gmem.h>:<glib.h>:' \ |
142 |
- charset/fribidi-char-sets.c lib/mem.h || die |
143 |
- |
144 |
- eautoreconf |
145 |
-} |
146 |
- |
147 |
-src_configure() { |
148 |
- # --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is |
149 |
- # present in /usr/lib/pkgconfig/fribidi.pc |
150 |
- econf \ |
151 |
- $(use_enable static-libs static) \ |
152 |
- --with-glib=yes |
153 |
-} |
154 |
- |
155 |
-src_install() { |
156 |
- default |
157 |
- prune_libtool_files |
158 |
-} |
159 |
|
160 |
diff --git a/dev-libs/fribidi/fribidi-0.19.6.ebuild b/dev-libs/fribidi/fribidi-0.19.6.ebuild |
161 |
deleted file mode 100644 |
162 |
index c93bd2a3679..00000000000 |
163 |
--- a/dev-libs/fribidi/fribidi-0.19.6.ebuild |
164 |
+++ /dev/null |
165 |
@@ -1,46 +0,0 @@ |
166 |
-# Copyright 1999-2017 Gentoo Foundation |
167 |
-# Distributed under the terms of the GNU General Public License v2 |
168 |
- |
169 |
-EAPI=5 |
170 |
- |
171 |
-AUTOTOOLS_AUTORECONF=1 |
172 |
- |
173 |
-inherit autotools eutils autotools-multilib |
174 |
- |
175 |
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm" |
176 |
-HOMEPAGE="https://fribidi.org/" |
177 |
-SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2" |
178 |
- |
179 |
-LICENSE="LGPL-2.1" |
180 |
-SLOT="0" |
181 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
182 |
-IUSE="static-libs" |
183 |
- |
184 |
-RESTRICT="test" #397347 |
185 |
- |
186 |
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]" |
187 |
-DEPEND="${RDEPEND} |
188 |
- virtual/pkgconfig" |
189 |
- |
190 |
-DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO ) |
191 |
- |
192 |
-src_prepare() { |
193 |
- epatch \ |
194 |
- "${FILESDIR}"/${PN}-0.19.2-nodoc.patch \ |
195 |
- "${FILESDIR}"/${P}-page-size-header.patch |
196 |
- |
197 |
- # Fix compability with dev-libs/glib >= 2.31 |
198 |
- sed -i \ |
199 |
- -e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \ |
200 |
- -e '/include/s:<glib/gmem.h>:<glib.h>:' \ |
201 |
- charset/fribidi-char-sets.c lib/mem.h || die |
202 |
- |
203 |
- autotools-multilib_src_prepare |
204 |
-} |
205 |
- |
206 |
-src_configure() { |
207 |
- # --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is |
208 |
- # present in /usr/lib/pkgconfig/fribidi.pc |
209 |
- local myeconfargs=( --with-glib=yes ) |
210 |
- autotools-multilib_src_configure |
211 |
-} |