summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-10-15 19:43:36 +0000
committerMichał Górny <mgorny@gentoo.org>2014-10-15 19:43:36 +0000
commit987bbc544a50706814896242c2328c9211b8bb04 (patch)
tree7d453490b28380827c3c50e255f81fb3fbeee17b /media-libs/sdl-mixer
parentRevbump to be able to rely on ${CHOST}-libmikmod-config. (diff)
downloadhistorical-987bbc544a50706814896242c2328c9211b8bb04.tar.gz
historical-987bbc544a50706814896242c2328c9211b8bb04.tar.bz2
historical-987bbc544a50706814896242c2328c9211b8bb04.zip
Use ${CHOST}-libmikmod-config for proper multilib support, bug #511034.
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'media-libs/sdl-mixer')
-rw-r--r--media-libs/sdl-mixer/ChangeLog5
-rw-r--r--media-libs/sdl-mixer/Manifest36
-rw-r--r--media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild7
3 files changed, 26 insertions, 22 deletions
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 4c9e3bc1de59..1d30fac8477e 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/sdl-mixer
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.130 2014/08/08 11:57:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.131 2014/10/15 19:43:34 mgorny Exp $
+
+ 15 Oct 2014; Michał Górny <mgorny@gentoo.org> sdl-mixer-1.2.12-r4.ebuild:
+ Use ${CHOST}-libmikmod-config for proper multilib support, bug #511034.
08 Aug 2014; Julian Ospald <hasufell@gentoo.org> sdl-mixer-1.2.12-r3.ebuild,
sdl-mixer-1.2.12-r4.ebuild,
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index aaea94c264d0..d41068981a4a 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -8,25 +8,25 @@ AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 SHA256 3b9d959dc6660b3b765d8b4a53bc1
AUX sdl-mixer-1.2.12-wav.patch 796 SHA256 7d455c08d79c4a957a8ae25e83f7253c5ff307a7fdc2c4d433b482dc3b7d70b9 SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491 WHIRLPOOL 8b26551b494cdb6658538a4220c01d48f3996c2eb74f4a4e97b7b4f1aa4945d951e26d885911ef0cd2d7183befd5cace209e3f88469ab21d4981864c6ee2063c
DIST SDL_mixer-1.2.12.tar.gz 3707781 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96 WHIRLPOOL 046b7a160cfe214cdac8c1a5ea424024a8850d3737908e5630b504f1f12817bfd2f391909f37be3d6994cab7f71ab24ecab92e99f5429dd8405f0e4046bc00a7
EBUILD sdl-mixer-1.2.12-r3.ebuild 3093 SHA256 9afdcce04b39f7edcefd7d4eb6bec39a75c9a33b6740ea1f3ef62c0c3a2f6d93 SHA512 660c579c861eecff73dafde684c5892862a2fbf8d212dd877b0f3c3d9d96c19e2e1edb6f9e9fe9c00b3e15908476165150ff8faaf7cc5622b022401d250160fb WHIRLPOOL a8e1610d62cd8a279cb291f829e007dd3666f53959fc79735bdd2d5d05b4f4a252646c49c083f1bd1cd3615be908e15f87d11c4d714dc6372894cba95c2542ae
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3499 SHA256 688ebeafc8362c4a24d8c5342af19340db17fa1535c5ace0b6e0e0dec5747aec SHA512 1ef63cd2e28e641104ef9157cd1e0d0466c4e98514d72cca5ed8bfaae1dd18abd7aed003728221033958c2d4aa398e61011a864d8ecb7396450395c90d6eae4d WHIRLPOOL f24f918209922c5f599d55b3ebc896604dcecb2a0cae345f931718bc6f4dcf47086ecdc2ce3fd9c2c084a4acf99faaf3b1972b1fe5be08eff7597656403d1e5d
-MISC ChangeLog 17421 SHA256 704a2cc1fee81ac627481b0546c2ba68deb4feda7164627ed25e343c2a91059f SHA512 ec0d18387ef2eede6fcd213e0b8bb7d44406fb7ae9b6bf7dac3a609815ea39c52444bdfd309969aa6a41e3cee3aaef4f968808664a21e27697da82ee77fa3fa8 WHIRLPOOL 44b942ae4d4f3518eb1dc66978b7abeeb556cb52a9ad4c924170135e1645e9222d097a58cf36cb3be289df7452142b1135b040e2cdfeeda37ab3034b6e3c78d8
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3566 SHA256 d4cdb4bb7275845ab5cd2402be3394c7af40f9e81c42f633b1d20f6749639f3c SHA512 dab1d07f7f05580c089b300b4b21798c4073e9002f2cd10826e69e786d1464c32f58733a6cfe62c5e8f99a22158b6478c24847b2ece1b76d86e252b65c9f2ce0 WHIRLPOOL fa9a143fe25210f153f3f17cec7be57c84f2553a9ba242633e950b01b02d3da8f03676c4a29d0acabd5d2e2aba2db8c82cb6c06325da13ef9773c37e91c9eafb
+MISC ChangeLog 17572 SHA256 d38ae6b6ffd9269a1ab481b2ce43bdf013918c817616c522a0ec343d894e200e SHA512 213f33c52fbe7c591b151f9c7b5df2c760021228b2eefbe5b8a1f75e3f2f5c59b5ad7f651221342627c790a6bb9b5be13f8452c62b0c7bfe79beb2b9a9789620 WHIRLPOOL 52eeb5ed77b4c00dff1e3ed171855b3683fc33a543234e52f0296a45688cb26474e9fc7e56bb0d99901db3f0914024716eddfb08b7ba62882d27113b356d67b7
MISC metadata.xml 572 SHA256 d4c6ae5e121255b47dd978176db7002fd8db1753cbfdf58792e9b4fa7565de35 SHA512 2b0cd28223fffbda314ad0f08415ca39b47b5734e105aea2f802b7ad22bee5aaa1c29c5583848de0605cbfde133901ac7bb1f61dd06c195ed731fc3a1847c656 WHIRLPOOL 50908664fc647d1c2d7c9d83cdb3bb4cb350ae38222dd15ad415bee3e5a85a7caa95ee65f79db44242bf7d94ff48ebe2354d21b1738cfc7a116eedaf4e32dc29
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iQJ8BAEBCABmBQJT5LsRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgYfUP/0WOeCzgqeef5ZxuInDlzc7E
-ppGN0g9qlsFTuIbNHNfHNgmzA4zicdpdwrdq8d5ZW/qyNQPU+nkBEF4pLCwpFpwX
-VeZeg+4rtz6/jRWR4o2jTXKAMyIBTP0lCxT7NI4SXhCmc+ZZ83xGpfrFScI0MHxZ
-YV4w6TUYIelr3yKHKM+zOtCcFNIVBP7W1fnsv5G/buF0W4kjYbKiqaIPZVqvQBta
-ZSlB2Aog1NPI/M3j3AAfloq7/9StPZ4zM6hCo3wzfRwcynuxVFbf4pcM2kq7kAJq
-bfH1e5EIxf0SouP0rZK9jR1RSneCSj57NPpidhk5IBiI5GAlCjEyWzURqahmZayX
-Sn8VmrGHkmGPnFkQS+cf1kdQlQQcwgDitIr/Z9T2IZvTspwYy8ZvfdwAlbUmCVcd
-rYQnN/G5uUWvkXKKndkOBhTGc0jC63/SDP4vk7Doui5YXTpRETFd9yeQXtVDDPoT
-ksFjnLui2e/7Mcxm9ejV98GXe14YvOLQ6AXzq7ZBLr3MIZo8qFmshadXJNKk3+J2
-CfLE/x70CYj+0ZXAcuZ6g3s5bbIKXjjZobH3+ATSLBYeRKBRL2r6+qtsid8StcoY
-qrcWMf9Cr9+6kXUZQ+Wo6L1c2rzs600KAgL/Jg2nY1UNA/j2zsSeb3fqLlk69N6r
-dFkKLBCaiHglsr5lxSuc
-=Ypxs
+iQJ8BAEBCABmBQJUPs5nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONtoP/RYsfVAmeifNWjHk0j4BAcd3
+rPXd8ge6WnzGR+V3AUe9QZofabAEVe0yA5aXA2s7Zu6s/2T1A9vViuyxAqslWGxq
+WVq4u5PbffVwmOEXVRs9tYlgntV1zB64Sy1Ocd7Ob/wjk1w8ahhZgqtyn0TMTFlS
+DO7aHlqtOug+mpJ8JWa+FIEfdqkyIeidg14NaqWwMOD6YbTsW6/JA719OanlY+zk
+YQ0baos9bc+169GewW/W12pAGSXCB6LKQVQcA7k2JomB2w8S9t+FZPI5vsAADkpC
+GCTppJL8vcM8C9IhWB/XoLk/EVJWGAfAmEhMZiWDuMi5SF8ok5mFrYHEuILG3FXJ
+fqulmCe2HsjbbY4M9FpVd4TSZdwp/cEFQCZeqevPCbdfc8FQx5eSO2/eSe5HZnzp
+BNDKsSlH70PkGRKBabvrWZXIPHwZfyGD77vy5iIgZLWiQu4hheHMrbZaxeXDRoPU
+/fJDuSai/O/iiYC//wMC3LnRv7GbGs+Fj3+MF/cx855miWTzxWi6VNxwWHdfEP/r
+cSbIwCspsSkWaVYHpzmRKbnjTqScrdMzw0W8RtNPzQ4LnApVhHkeHoCSx19aPmgC
+F+cgCw55lq0SzQPtsiDKE9I+3sUbiHYHKbYPVTrSIUrtbMb9kQ0CSxqRAFOAR1x9
+rcR9OjRMANHKub0U0qls
+=hImv
-----END PGP SIGNATURE-----
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 9a71061a9446..f4b653516f72 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild,v 1.4 2014/08/08 11:57:01 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild,v 1.5 2014/10/15 19:43:34 mgorny Exp $
EAPI=5
inherit eutils multilib-minimal
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
)
mod? (
modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
+ mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
)
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
@@ -80,7 +80,8 @@ multilib_src_configure() {
$(use_enable smpeg music-mp3) \
$(use_enable mad music-mp3-mad-gpl) \
$(use_enable timidity music-timidity-midi) \
- $(use_enable fluidsynth music-fluidsynth-midi)
+ $(use_enable fluidsynth music-fluidsynth-midi) \
+ LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
}
multilib_src_install() {