Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-gfx/fontforge/files/, media-gfx/fontforge/
Date: Wed, 03 Jan 2018 18:43:09
Message-Id: 1514999183.49b40c9a8f170bfe79fa208f67f8b14d1b72c6ba.lluixhi@gentoo
1 commit: 49b40c9a8f170bfe79fa208f67f8b14d1b72c6ba
2 Author: stefson <herrtimson <AT> yahoo <DOT> de>
3 AuthorDate: Wed Jan 3 17:06:23 2018 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Wed Jan 3 17:06:23 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=49b40c9a
7
8 media-gfx/fontforge: in tree works
9
10 media-gfx/fontforge/Manifest | 1 -
11 ...fontforge-20150430-intelligent-execinfo_h.patch | 34 ------
12 media-gfx/fontforge/fontforge-20150612-r1.ebuild | 127 ---------------------
13 media-gfx/fontforge/metadata.xml | 25 ----
14 4 files changed, 187 deletions(-)
15
16 diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
17 deleted file mode 100644
18 index bf0e90d..0000000
19 --- a/media-gfx/fontforge/Manifest
20 +++ /dev/null
21 @@ -1 +0,0 @@
22 -DIST fontforge-20150612.tar.gz 125037727 SHA256 0f4ec68a648f7f845d54d1e87cf5fb246a16d528b74e9e1a9b815418510022d7 SHA512 01a38bdbb55ba3b2638b55caa2f768ba691fdfa730afd843df0cf62417db5465731ed968c5ab7c026622264e20c20fdfd8ec0ceb50da71039588797fe18393b8 WHIRLPOOL 6662bc52669153ba46e562fbcb287f5bff59eeeec7fe9afcd65918f892282650ab4be4f279fe6fab95f02f36caa753900693532ece439bee114e774e0da3f855
23
24 diff --git a/media-gfx/fontforge/files/fontforge-20150430-intelligent-execinfo_h.patch b/media-gfx/fontforge/files/fontforge-20150430-intelligent-execinfo_h.patch
25 deleted file mode 100644
26 index c7cb74b..0000000
27 --- a/media-gfx/fontforge/files/fontforge-20150430-intelligent-execinfo_h.patch
28 +++ /dev/null
29 @@ -1,34 +0,0 @@
30 -diff -Naur fontforge-20150430.orig/configure.ac fontforge-20150430/configure.ac
31 ---- fontforge-20150430.orig/configure.ac 2015-04-30 20:29:11.000000000 +0000
32 -+++ fontforge-20150430/configure.ac 2015-08-06 07:36:50.535844085 +0000
33 -@@ -377,6 +377,7 @@
34 - if test x"${i_do_want_iconv}" = xyes; then
35 - AC_CHECK_HEADERS([iconv.h])
36 - fi
37 -+AC_CHECK_HEADERS([execinfo.h])
38 - gl_INIT
39 -
40 - #--------------------------------------------------------------------------
41 -diff -Naur fontforge-20150430.orig/fontforge/cvundoes.c fontforge-20150430/fontforge/cvundoes.c
42 ---- fontforge-20150430.orig/fontforge/cvundoes.c 2015-04-30 20:29:11.000000000 +0000
43 -+++ fontforge-20150430/fontforge/cvundoes.c 2015-08-06 07:38:15.766082215 +0000
44 -@@ -24,6 +24,7 @@
45 - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
46 - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
47 - */
48 -+#include "config.h"
49 - #include "fontforgevw.h"
50 - #include "views.h"
51 - #include <math.h>
52 -@@ -33,8 +34,8 @@
53 - #include "inc/gfile.h"
54 - #include "psfont.h"
55 -
56 --#if defined(__MINGW32__)||defined(__CYGWIN__)
57 --// no backtrace on windows yet
58 -+#ifndef HAVE_EXECINFO_H
59 -+// no backtrace available
60 - #else
61 - #include <execinfo.h>
62 - #endif
63 -
64
65 diff --git a/media-gfx/fontforge/fontforge-20150612-r1.ebuild b/media-gfx/fontforge/fontforge-20150612-r1.ebuild
66 deleted file mode 100644
67 index 842b03a..0000000
68 --- a/media-gfx/fontforge/fontforge-20150612-r1.ebuild
69 +++ /dev/null
70 @@ -1,127 +0,0 @@
71 -# Copyright 1999-2017 Gentoo Foundation
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI=5
75 -
76 -PYTHON_COMPAT=( python{2_7,3_4} )
77 -
78 -inherit autotools eutils fdo-mime python-single-r1
79 -
80 -DESCRIPTION="postscript font editor and converter"
81 -HOMEPAGE="http://fontforge.github.io/"
82 -SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar.gz"
83 -
84 -LICENSE="BSD GPL-3+"
85 -SLOT="0"
86 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
87 -IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
88 -
89 -REQUIRED_USE="
90 - cairo? ( png )
91 - python? ( ${PYTHON_REQUIRED_USE} )
92 -"
93 -
94 -RDEPEND="
95 - dev-libs/libltdl:0
96 - dev-libs/libxml2:2=
97 - >=media-libs/freetype-2.3.7:2=
98 - cairo? (
99 - >=x11-libs/cairo-1.6:0=
100 - x11-libs/pango:0=
101 - )
102 - gif? ( media-libs/giflib:0= )
103 - jpeg? ( virtual/jpeg:0 )
104 - png? ( media-libs/libpng:0= )
105 - tiff? ( media-libs/tiff:0= )
106 - truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
107 - gtk? ( x11-libs/gtk+:2= )
108 - python? ( ${PYTHON_DEPS} )
109 - readline? ( sys-libs/readline:0= )
110 - unicode? ( media-libs/libuninameslist:0= )
111 - X? (
112 - x11-libs/libX11:0=
113 - x11-libs/libXi:0=
114 - >=x11-libs/pango-1.10:0=[X]
115 - )
116 - !media-gfx/pfaedit
117 -"
118 -DEPEND="${RDEPEND}
119 - sys-devel/gettext
120 - virtual/pkgconfig
121 - X? ( x11-proto/inputproto )
122 -"
123 -
124 -# Needs keywording on many arches.
125 -# zeromq? (
126 -# >=net-libs/czmq-2.2.0:0=
127 -# >=net-libs/zeromq-4.0.4:0=
128 -# )
129 -
130 -pkg_setup() {
131 - use python && python-single-r1_pkg_setup
132 -}
133 -
134 -gnulib_import() {
135 - (
136 - func_add_hook() { :; }
137 - source bootstrap.conf
138 - set -- "${S}/gnulib/gnulib-tool" --libtool --import ${gnulib_modules}
139 - echo "$@"
140 - "$@"
141 - )
142 -}
143 -
144 -src_prepare() {
145 - # Tarball comes with broken absolute symlinks
146 - # https://github.com/fontforge/fontforge/issues/2439
147 - find . -lname "/*" -delete || die
148 - gnulib_import || die
149 - epatch "${FILESDIR}"/${PN}-20150430-intelligent-execinfo_h.patch
150 - epatch_user
151 - eautoreconf
152 -}
153 -
154 -src_configure() {
155 - local myeconfargs=(
156 - --disable-static
157 - $(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
158 - $(use_enable gtk gtk2-use)
159 - $(use_enable python python-extension)
160 - $(use_enable python python-scripting)
161 - --enable-tile-path
162 - --enable-gb12345
163 - $(use_with cairo)
164 - $(use_with gif giflib)
165 - $(use_with jpeg libjpeg)
166 - $(use_with png libpng)
167 - $(use_with readline libreadline)
168 - --without-libspiro
169 - $(use_with tiff libtiff)
170 - $(use_with unicode libuninameslist)
171 - #$(use_with zeromq libzmq)
172 - --without-libzmq
173 - $(use_with X x)
174 - )
175 - econf "${myeconfargs[@]}"
176 -}
177 -
178 -src_compile() {
179 - # Build system deps are broken
180 - emake -C plugins
181 - emake
182 -}
183 -
184 -src_install() {
185 - default
186 - prune_libtool_files --modules
187 -}
188 -
189 -pkg_postrm() {
190 - fdo-mime_desktop_database_update
191 - fdo-mime_mime_database_update
192 -}
193 -
194 -pkg_postinst() {
195 - fdo-mime_desktop_database_update
196 - fdo-mime_mime_database_update
197 -}
198
199 diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
200 deleted file mode 100644
201 index f200b93..0000000
202 --- a/media-gfx/fontforge/metadata.xml
203 +++ /dev/null
204 @@ -1,25 +0,0 @@
205 -<?xml version="1.0" encoding="UTF-8"?>
206 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
207 -<pkgmetadata>
208 - <maintainer type="person">
209 - <email>floppym@g.o</email>
210 - <name>Mike Gilbert</name>
211 - </maintainer>
212 - <maintainer type="project">
213 - <email>fonts@g.o</email>
214 - <name>Fonts</name>
215 - </maintainer>
216 - <longdescription>
217 - FontForge -- An outline font editor that lets you create your own
218 - postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap
219 - (bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one
220 - format to another. FontForge has support for many macintosh font formats.
221 - </longdescription>
222 - <use>
223 - <flag name="truetype-debugger">Enable truetype debugger in fontforge</flag>
224 - </use>
225 - <upstream>
226 - <remote-id type="github">troydhanson/uthash</remote-id>
227 - <remote-id type="sourceforge">fontforge</remote-id>
228 - </upstream>
229 -</pkgmetadata>