commit:     d1cd1120ffc8dce9b443340439698ce35d893b26
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  3 06:25:39 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb  3 06:25:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=d1cd1120

media-gfx/fontforge: version bump to 20150612

Package-Manager: portage-2.2.26
RepoMan-Options: --force

 media-gfx/fontforge/Manifest                         |  6 ++----
 ...0430-r99.ebuild => fontforge-20150612-r99.ebuild} | 20 ++++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 58de997..9155ef2 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,6 +1,4 @@
 AUX fontforge-20150430-intelligent-execinfo_h.patch 1180 SHA256 
0459b390b0d889558ed8af8af0fa2bd9cab2fd780b64633e89e9350eecdf87cc SHA512 
f86fcc7fc44c0ea03d11a75fbab1d8db37fd13829d0c8d31cefb3d0ad8bec3b3190af8bcce4d84491df8c200920c1b0734911a27a86b4a6d2fe8f0003ff03832
 WHIRLPOOL 
3311e115294d63d5d9f37d1b83a619ebd15260bd34a4382ed9988226323caa10b8879e5a41f9db9347c9d8ceec2da9c9bc957482e1d7b8d5584d3e60623ee7bb
-DIST fontforge-20150430.tar.gz 24531572 SHA256 
430c6d02611c7ca948df743e9241994efe37eda25f81a94aeadd9b6dd286ff37 SHA512 
e530a7e7cec569f9e9419ccf2805ac5bd41e05565b4c24fa6f6a8c6c3684d1d76868a9a19abba3ba92aa66bcca333949d37c8890f72a29c0072c8a3e912269e4
 WHIRLPOOL 
b02912ed66149818da7e406300116465dae6f1c40032549ca820a9cfc7b33e862eeeb9cb1f366628423701e8e39e0a8ced3000a02ff2562f2c27eb5b70c805da
-DIST gnulib-b287b621969d5a3f56058ff01e554839814da4e1.tar.gz 5974028 SHA256 
09e111c8388a7cdcea6c0f08bf8bf5e871f04ac5fa7496494a278b2d009b4dcd SHA512 
80e235c1c3b5c9c5fa6d1f0e88f51be458b8396760928b535dbe3ea80ad779e7ba315d03f33a6debb8ec375d0c4d1a17bdf03d82b1fa0450fa1d064c9d9317e4
 WHIRLPOOL 
71e2fdb311d4183f4b177ea2670be25d069801a3289dcf168e7f4cb258c35d709cb380669ea343dc20ae35fc71492b14ea6594ef238cb43b7dd8c0c34b5de58c
-DIST uthash-ac47d4928e61c5abc6e977d91310d31ed74690e4.tar.gz 233813 SHA256 
6331989d413069a4027b6292646b41d99cad70cefd9e9852f6f6e1bf531ccef4 SHA512 
b0831be7be7d1ff11d9ca9248b121590e4b8ac3c808fcf461c5b192bdf3ae45c42b962d5cc02abc2491de6379d53855d487d798b9e0539007832bfd220ff76f2
 WHIRLPOOL 
7c0e55ba753210f396d736655e5043badaa222eb7e00fcb71b083c59da22f0a54f944c1231622a1378341e22a8583bd624bd5e99a1ca82099f610b373bbc166f
-EBUILD fontforge-20150430-r99.ebuild 3101 SHA256 
1639e23c5ad3e59561ade76d440f3252ee1d01c451e495f97c092ce583085458 SHA512 
936fc40c95819203093c8438bf9f442a1c0d1122d4a1887bb3d0467cf2168a37a5e188ef83ae473cc6698465226333c38dae56284b62c6b61229fdaf2b694e74
 WHIRLPOOL 
adf2f74fb286036ac0630e810dad420bd8629c408ef4d83e19fe60de394c7f93aad6a6561687650187bc78f3e933fe5b1c63b3ff0cf83133030693ab6152ec74
+DIST fontforge-20150612.tar.gz 125037727 SHA256 
0f4ec68a648f7f845d54d1e87cf5fb246a16d528b74e9e1a9b815418510022d7 SHA512 
01a38bdbb55ba3b2638b55caa2f768ba691fdfa730afd843df0cf62417db5465731ed968c5ab7c026622264e20c20fdfd8ec0ceb50da71039588797fe18393b8
 WHIRLPOOL 
6662bc52669153ba46e562fbcb287f5bff59eeeec7fe9afcd65918f892282650ab4be4f279fe6fab95f02f36caa753900693532ece439bee114e774e0da3f855
+EBUILD fontforge-20150612-r99.ebuild 2810 SHA256 
3b114ee1f9d80b093383fda2cab95e5e04eb0c70405ce41682ac56d7eca32300 SHA512 
5bfca1da0c969108c2ae21de7c92cbbe14f54eeef2e5770a6c0eac3f4b39deb36e28cb4c27d26d060a1eb59fa85530d92d5075204b7347ad4ef0c337564d4e0d
 WHIRLPOOL 
d4bbd6a2624e76cf69a08a74b511b8d619a8c8dcfa338d30a3b629bddc53737b886fa5910a4027e3fbae1ca7e327e13212fd1f1232aa70907ac15b115ec642a5
 MISC metadata.xml 762 SHA256 
0d44db011fd5b4156017de597f4afb5cd5409a93a94cd111659ca0652aec098a SHA512 
93b0e2edf50dd8fe1a869e27daa6eba0c491e5989ec9470d589e4ae05f0757f91acfb749744a8bb7aefd05f3d62a4f2bd93a65f48cfbf3241bd5571c88252e23
 WHIRLPOOL 
ab0d71136bcb13ec864e218b55bd8992461e1a53b08535170341b90484d3fc2a7bd70379d865515c1bdb4398e1338b8da033f56b8b47329cd8b94490f841d5fc

diff --git a/media-gfx/fontforge/fontforge-20150430-r99.ebuild 
b/media-gfx/fontforge/fontforge-20150612-r99.ebuild
similarity index 77%
rename from media-gfx/fontforge/fontforge-20150430-r99.ebuild
rename to media-gfx/fontforge/fontforge-20150612-r99.ebuild
index 8b65ef7..8e6f0da 100644
--- a/media-gfx/fontforge/fontforge-20150430-r99.ebuild
+++ b/media-gfx/fontforge/fontforge-20150612-r99.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20150430.ebuild,v 1.6 
2015/08/02 18:43:00 ago Exp $
+# $Id$
 
 EAPI=5
 
@@ -8,14 +8,9 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit autotools eutils fdo-mime python-single-r1
 
-GNULIB="b287b621969d5a3f56058ff01e554839814da4e1"
-UTHASH="ac47d4928e61c5abc6e977d91310d31ed74690e4"
-
 DESCRIPTION="postscript font editor and converter"
 HOMEPAGE="http://fontforge.github.io/";
-SRC_URI="https://github.com/fontforge/fontforge/archive/${PV}.tar.gz -> 
${P}.tar.gz
-       http://dev.gentoo.org/~floppym/dist/gnulib-${GNULIB}.tar.gz
-       https://github.com/troydhanson/uthash/archive/${UTHASH}.tar.gz -> 
uthash-${UTHASH}.tar.gz"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar.gz";
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
@@ -47,7 +42,6 @@ RDEPEND="
        X? (
                x11-libs/libX11:0=
                x11-libs/libXi:0=
-               x11-libs/libxkbui:0=
                >=x11-libs/pango-1.10:0=[X]
        )
        !media-gfx/pfaedit
@@ -72,16 +66,18 @@ gnulib_import() {
        (
                func_add_hook() { :; }
                source bootstrap.conf
-               set -- "${WORKDIR}/gnulib/gnulib-tool" --libtool --import 
${gnulib_modules}
+               set -- "${S}/gnulib/gnulib-tool" --libtool --import 
${gnulib_modules}
                echo "$@"
                "$@"
        )
 }
 
 src_prepare() {
-       mv "${WORKDIR}/uthash-${UTHASH}" "${S}/uthash" || die
+       # Tarball comes with broken absolute symlinks
+       # https://github.com/fontforge/fontforge/issues/2439
+       find . -lname "/*" -delete || die
        gnulib_import || die
-       epatch "${FILESDIR}"/${P}-intelligent-execinfo_h.patch
+       epatch "${FILESDIR}"/${PN}-20150430-intelligent-execinfo_h.patch
        epatch_user
        eautoreconf
 }
@@ -118,7 +114,7 @@ src_compile() {
 
 src_install() {
        default
-       prune_libtool_files
+       prune_libtool_files --modules
 }
 
 pkg_postrm() {

Reply via email to