summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-12-01 20:34:34 +0000
committerFabian Groffen <grobian@gentoo.org>2013-12-01 20:34:34 +0000
commita19df98dc59c2e7ea83bc8772522e864854af53a (patch)
tree9c03a8d11323d6e4fd17c13e99dfd3a87c96d0cc
parentStable for amd64 wrt bug #490784 (diff)
downloadhistorical-a19df98dc59c2e7ea83bc8772522e864854af53a.tar.gz
historical-a19df98dc59c2e7ea83bc8772522e864854af53a.tar.bz2
historical-a19df98dc59c2e7ea83bc8772522e864854af53a.zip
Apply Solaris fixes to 9999 so I won't get caught by unpleasant surprise again
Package-Manager: portage-2.2.7-prefix/cvs/SunOS i386 Manifest-Sign-Key: 0x5F75F607C5C74E89
-rw-r--r--media-libs/harfbuzz/ChangeLog5
-rw-r--r--media-libs/harfbuzz/Manifest10
-rw-r--r--media-libs/harfbuzz/harfbuzz-9999.ebuild6
3 files changed, 14 insertions, 7 deletions
diff --git a/media-libs/harfbuzz/ChangeLog b/media-libs/harfbuzz/ChangeLog
index 250490a6913e..ba10a2fc8a58 100644
--- a/media-libs/harfbuzz/ChangeLog
+++ b/media-libs/harfbuzz/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/harfbuzz
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.56 2013/12/01 20:29:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/ChangeLog,v 1.57 2013/12/01 20:34:30 grobian Exp $
+
+ 01 Dec 2013; Fabian Groffen <grobian@gentoo.org> harfbuzz-9999.ebuild:
+ Apply Solaris fixes to 9999 so I won't get caught by unpleasant surprise again
01 Dec 2013; Fabian Groffen <grobian@gentoo.org> harfbuzz-0.9.23.ebuild:
Restore 0.9.20 fixes for Solaris :(
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 54340d6d808d..2cdd7b00c988 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -11,13 +11,13 @@ EBUILD harfbuzz-0.9.12.ebuild 1686 SHA256 bb37abe8e6425b37dee64cd95e4a0e31b6ab8b
EBUILD harfbuzz-0.9.18-r1.ebuild 1946 SHA256 e8baab01829217a046eb369a565b601494b202fdc402322dc5b1247982a5e47c SHA512 8b16d82a5a52cceae19e6c5380d8e7c24de7a252202d7804b67cad4fbca13697e859d7b330e56a095c4c5be10ad5e3311bbe03af66c98c942b2a2224431ad971 WHIRLPOOL 2f7df3064047b4e3558b2f478bb1a17a08707e86e3e9f6a8cb52fea01a9a15f865851aa23520204019d6b299b7842d6e9ccb3b6482fdebdd17b5b6d3d1bada36
EBUILD harfbuzz-0.9.20.ebuild 2515 SHA256 0da5dccddb3e60a7f3204e438b04cc74bef4900257debd00ead4103d107fdc1b SHA512 13f4e712505cf310d4677e6d87d2b86abe43bbdc040241e83724ec6e9251f521a986dbdb8bce2161f1cca3da5085a97ba795612a8bafc3eca73b637444b1eb7c WHIRLPOOL 945d50f47a7768ca9de32eceda72b8e733e7f24775d8062f71f45a6d0006e85e76f88de7c5f6358c14346368d6c45dcecc10fffb96c0a2e13c886b8b3aab8f72
EBUILD harfbuzz-0.9.23.ebuild 2465 SHA256 10535e3ab762d4e314489c9775978f890ab60f9755b15b3409e2750786b71996 SHA512 d0b888f3021a9e7c42ce545996d77eb2b87f625db49f7e16ec5eb9a67b96c2f247c0bf84bdae947d5c6cf164aa5bd0a1df0d25dc7d7cc1d2ba20a39bb1c0d0c1 WHIRLPOOL 7513465f21aba7a3cbd404d14d61095aac2aaf4c24ce38748a587718ff033123fd88cdbc3bfe6b5bded7a11c999029e854b9033f8d6230a577049138b2a8dd3d
-EBUILD harfbuzz-9999.ebuild 2357 SHA256 ad29faafdd2bbb8692432da1a78d7f54935eab823b64387720330fe7984e3c85 SHA512 eed6758f1277ec2aa7eda37d2d80d45faa1f9ea65ab2af0ed411f87edafe066fa23ff88d811d4058884b183fde41579f17fb70f74becae5ee122bce338cc2f14 WHIRLPOOL 9f28cee353809842c654c393b57afd9f80a9a40118ba0d2861eb3ef3ecdb61cd2ff959dc3ea7225988f03702bce1c6ab75c2d763c20da27091c2c0353b54ed7a
-MISC ChangeLog 8621 SHA256 d5ce0fc29e55de788ff8daf59774146861d7184ea4b388fcc2471b968bfe992a SHA512 482a174f0cceed0b4003077ed33168353c39e713203026eb662ff4b2fb7f1783907c843848b3a55a163e7b743381ef508d700064f7136059fe2cfd9935d673dc WHIRLPOOL ab6b91c93dd66902316dd7e7fd9627604c52b58ebb527932bad5c0809a38caafe89c0be3a90918429b25eeed071e71596f722dca2d77249257784201396627bd
+EBUILD harfbuzz-9999.ebuild 2465 SHA256 16f400cd6943ea9dcf1bc86ec71692f96f77f778ca5ed586fe6b81a802485b93 SHA512 e084ca1ae61800a12bf6850cec3915ac3d17df81e7d0618d1d3567e61f2c16679d2e0a27cd66053b81026906beaf94504e3c9c22474791e4dd96e7727acabb37 WHIRLPOOL cb1dcff917f52f1c950d238bbb1c6a5cef85b3b90844d132125b8bf4f51302037e7dde9324e3416b719df7d972f4e16c305ad4bcda039b66dafeec657fd2b2b8
+MISC ChangeLog 8776 SHA256 e20bdbdd0f5d06aaad889c47947ccfdc6f60741741e6ce40cde431765a3e8ef5 SHA512 70f0c54e5ff59d55d9758adb8b0c0193706635584cd1a14abb526c4c89b70b984a3b899c8f267b4ff34f58c70bd8c225dd0c78624d7939326bb4b2b7e5b28d96 WHIRLPOOL 0e7dfe9ad681722c98dfb8036c61a07518a8854aa702888e0c1a8def7d84d3910208d6cfccd52abec891f459898da039d0cc6831b528c5569adb2842dec184fe
MISC metadata.xml 348 SHA256 ab40ba306c3499687d57b89247a77e7e8093c88196e6c0fb2333f014ee37c3da SHA512 057542963b2698ddd474970f6b49a6b99c5ff1982c29d7495b6ea05a8bc5266007e328b6658c13052cad8cd2b1c44e2bd6d60ef3e4ef43755c6b4c785b908485 WHIRLPOOL f1799f9bedccd73989ce42f234a28222de692f147553bf4a8bdf154bb544f22ead4ade109700fea7785747d27adbcf30c5543d435f3584f43817b1ed1111b1a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (SunOS)
-iEYEAREIAAYFAlKbnDwACgkQX3X2B8XHTomx7ACdHgccDsx9gtRZ//Qfbg0dRCBk
-vAkAn1PJz5IZljTJL0T+ZMaGRPvkH/pv
-=xY+s
+iEYEAREIAAYFAlKbnVcACgkQX3X2B8XHTomucACfXGNGH7VUhegUakTVYuRCHY6a
+OVMAoIhEGj0/WrmXwKR45TyQjCUf+O/Y
+=hfYc
-----END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 3de4436f29d0..91255165122c 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.18 2013/09/11 02:52:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.19 2013/12/01 20:34:30 grobian Exp $
EAPI=5
@@ -51,9 +51,13 @@ src_prepare() {
sed -i \
-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
src/Makefile.in || die
+ sed -i \
+ -e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+ test/api/Makefile.in || die
fi
[[ ${PV} == 9999 ]] && eautoreconf
+ elibtoolize # for Solaris
}
src_configure() {