| 1 |
mgorny 14/03/01 14:04:18 |
| 2 |
|
| 3 |
Modified: harfbuzz-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Update the live ebuild to use multilib. |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.23 media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild?rev=1.23&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild?rev=1.23&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild?r1=1.22&r2=1.23 |
| 15 |
|
| 16 |
Index: harfbuzz-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v |
| 19 |
retrieving revision 1.22 |
| 20 |
retrieving revision 1.23 |
| 21 |
diff -u -r1.22 -r1.23 |
| 22 |
--- harfbuzz-9999.ebuild 22 Feb 2014 22:22:26 -0000 1.22 |
| 23 |
+++ harfbuzz-9999.ebuild 1 Mar 2014 14:04:17 -0000 1.23 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.22 2014/02/22 22:22:26 tetromino Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.23 2014/03/01 14:04:17 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -9,7 +9,7 @@ |
| 33 |
|
| 34 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 35 |
|
| 36 |
-inherit eutils libtool python-any-r1 |
| 37 |
+inherit eutils libtool multilib-minimal python-any-r1 |
| 38 |
|
| 39 |
DESCRIPTION="An OpenType text shaping engine" |
| 40 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz" |
| 41 |
@@ -24,11 +24,11 @@ |
| 42 |
|
| 43 |
RDEPEND=" |
| 44 |
cairo? ( x11-libs/cairo:= ) |
| 45 |
- glib? ( dev-libs/glib:2 ) |
| 46 |
- graphite? ( media-gfx/graphite2:= ) |
| 47 |
- icu? ( dev-libs/icu:= ) |
| 48 |
+ glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) |
| 49 |
+ graphite? ( media-gfx/graphite2:=[${MULTILIB_USEDEP}] ) |
| 50 |
+ icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) |
| 51 |
introspection? ( >=dev-libs/gobject-introspection-1.34 ) |
| 52 |
- truetype? ( media-libs/freetype:2= ) |
| 53 |
+ truetype? ( media-libs/freetype:2=[${MULTILIB_USEDEP}] ) |
| 54 |
" |
| 55 |
DEPEND="${RDEPEND} |
| 56 |
dev-util/gtk-doc-am |
| 57 |
@@ -66,21 +66,25 @@ |
| 58 |
elibtoolize # for Solaris |
| 59 |
} |
| 60 |
|
| 61 |
-src_configure() { |
| 62 |
+multilib_src_configure() { |
| 63 |
+ ECONF_SOURCE="${S}" \ |
| 64 |
econf \ |
| 65 |
--without-coretext \ |
| 66 |
--without-uniscribe \ |
| 67 |
$(use_enable static-libs static) \ |
| 68 |
- $(use_with cairo) \ |
| 69 |
+ $(multilib_is_native_abi \ |
| 70 |
+ && use_with cairo \ |
| 71 |
+ || echo --without-cairo) \ |
| 72 |
$(use_with glib) \ |
| 73 |
$(use_with glib gobject) \ |
| 74 |
$(use_with graphite graphite2) \ |
| 75 |
$(use_with icu) \ |
| 76 |
- $(use_enable introspection) \ |
| 77 |
+ $(multilib_is_native_abi \ |
| 78 |
+ && use_enable introspection \ |
| 79 |
+ || echo --disable-introspection) \ |
| 80 |
$(use_with truetype freetype) |
| 81 |
} |
| 82 |
|
| 83 |
-src_install() { |
| 84 |
- default |
| 85 |
+multilib_src_install_all() { |
| 86 |
prune_libtool_files --modules |
| 87 |
} |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
1.66 media-libs/harfbuzz/ChangeLog |
| 92 |
|
| 93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/ChangeLog?rev=1.66&view=markup |
| 94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/ChangeLog?rev=1.66&content-type=text/plain |
| 95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/harfbuzz/ChangeLog?r1=1.65&r2=1.66 |
| 96 |
|
| 97 |
Index: ChangeLog |
| 98 |
=================================================================== |
| 99 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v |
| 100 |
retrieving revision 1.65 |
| 101 |
retrieving revision 1.66 |
| 102 |
diff -u -r1.65 -r1.66 |
| 103 |
--- ChangeLog 1 Mar 2014 13:33:20 -0000 1.65 |
| 104 |
+++ ChangeLog 1 Mar 2014 14:04:17 -0000 1.66 |
| 105 |
@@ -1,6 +1,9 @@ |
| 106 |
# ChangeLog for media-libs/harfbuzz |
| 107 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 108 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.65 2014/03/01 13:33:20 mgorny Exp $ |
| 109 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.66 2014/03/01 14:04:17 mgorny Exp $ |
| 110 |
+ |
| 111 |
+ 01 Mar 2014; Michał Górny <mgorny@g.o> harfbuzz-9999.ebuild: |
| 112 |
+ Update the live ebuild to use multilib. |
| 113 |
|
| 114 |
*harfbuzz-0.9.26-r1 (01 Mar 2014) |
Archives