summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-10-15 19:58:17 +0000
committerMichał Górny <mgorny@gentoo.org>2014-10-15 19:58:17 +0000
commit9adb29ced47d2443fa5feb3547ba0da461b7b06a (patch)
treee1f12cfc85666b1c43d6035f2008d7772f78b658 /media-libs/sdl2-mixer
parentUse ${CHOST}-libmikmod-config for proper multilib support, bug #511034. (diff)
downloadhistorical-9adb29ced47d2443fa5feb3547ba0da461b7b06a.tar.gz
historical-9adb29ced47d2443fa5feb3547ba0da461b7b06a.tar.bz2
historical-9adb29ced47d2443fa5feb3547ba0da461b7b06a.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/sdl2-mixer')
-rw-r--r--media-libs/sdl2-mixer/ChangeLog5
-rw-r--r--media-libs/sdl2-mixer/Manifest32
-rw-r--r--media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild7
3 files changed, 24 insertions, 20 deletions
diff --git a/media-libs/sdl2-mixer/ChangeLog b/media-libs/sdl2-mixer/ChangeLog
index 7689194c6a32..ba42dc8d4fa2 100644
--- a/media-libs/sdl2-mixer/ChangeLog
+++ b/media-libs/sdl2-mixer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/sdl2-mixer
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-mixer/ChangeLog,v 1.3 2014/06/18 19:53:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-mixer/ChangeLog,v 1.4 2014/10/15 19:58:15 mgorny Exp $
+
+ 15 Oct 2014; Michał Górny <mgorny@gentoo.org> sdl2-mixer-2.0.0-r1.ebuild:
+ Use ${CHOST}-libmikmod-config for proper multilib support, bug #511034.
18 Jun 2014; Michał Górny <mgorny@gentoo.org> sdl2-mixer-2.0.0-r1.ebuild:
Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 411742a5365b..cd1d41cb9d82 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -2,26 +2,26 @@
Hash: SHA256
DIST SDL2_mixer-2.0.0.tar.gz 10119589 SHA256 a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b SHA512 e04594abc13c2b6527cd92a94a8d3e18436e9e6aaee21bab83e288e259a2fb20aae8433765d07feeb3b5bf253951323d67054239091e79720846770beb30be4d WHIRLPOOL 58385d7bdb3382af4f9d3aa9904b40083fe1139af0c938fa807904d70d4561180f65314bb2ab56f3b67a35140252e72802753ed723bca2536a4745fad43cb905
-EBUILD sdl2-mixer-2.0.0-r1.ebuild 3281 SHA256 e8587b30e1ff555c0c5b38de8c257ecb4624517b7cf68a402f46e39769246603 SHA512 2821e7e879264067a83fa95d5c9989512c7cde16b0380415545c199ad8c801aa8c334b8b4f9bcb258b090c18cdce826d591308a0b09f9f6dee289bbc4554db27 WHIRLPOOL 7dfd5ebb30095a16df16c6f70d9c9342f8c0a7c625c4928ab21ca3dd382a32db06a51ab461f5325c3f17fae90c62e54e96bde83e4b5517c9b657b22eabd3a7ad
+EBUILD sdl2-mixer-2.0.0-r1.ebuild 3350 SHA256 89fb91f07b1d2c126ac08c6bda182e8765ece3d48181bfb31f539699ad0a9de4 SHA512 292eb81916c4bfabac5ba107322365c99d98ac7199d0eb3b8acd4ef8bb9c39175e6ad167a572741499325d4e5a4325ecbd2c3ecad63ea59ca78e9e1cafdeb30c WHIRLPOOL cca506136c1113545fe0cc814d41fe59e9de83797d405a8da09afd045a7dbdea88f13a37580a524b1577cd3d758c4d3d4c08550794533e5ad74535bf5550f05d
EBUILD sdl2-mixer-2.0.0.ebuild 2875 SHA256 0541421ca402b5c9a188092dc9fbf2e2783581cb13db78b61c116d5af421db96 SHA512 e90b7ae0d246126032a506f924a3f76e9ca9aa5a4d1dd2ae65507fd8580c3af866ac99d9aa1640fc6b1a67047cea4a1fc5eaeba973e114e5eb7d0255d07ad5b9 WHIRLPOOL 9ee74417e2f00bf7dad7af96498bdd7fd432cc306965d2e76ee5ba87ebb617647ce28ff584ff6ad673d513249c68be5e7d984bae8335801f5394bb7c3a01c1f4
-MISC ChangeLog 680 SHA256 30dcbd1ec897102d512af20ce13ef22c0793b1a031395ba09ab1d0dcccffce95 SHA512 9a6f599638cb057dbd4202d5bbb557f582b3bbce378fc3cb2a75438b4a2d0251b0d3613289a6f16a4287969a435bc91582e0d347ece227524639d7959e81ff1e WHIRLPOOL 6ef0a3b999736f4a062bc4fa1e077a32d3a5efc92f4faef1e0693c31266a3a092cdc57bc7a598b605ac3725fd26da3536105e370f35dcd4d14fd5cd68d963404
+MISC ChangeLog 833 SHA256 674641df0241b2250616d7c649a3dac6d62c7ef247d5bc78c2b3ebd208f65461 SHA512 e15fd10394a50facc9b0956aafa2d769083c858e5ad1e8285b879052e4dc4d712cbbc292251d954d4632dbf00413d12e2d61aa3d2d0ed71f8b62354e3ca7ef4e WHIRLPOOL 1f5be524c8bbd11b75fa738b7d5eed457a68aab8f75913074eefbf6275a754f09fa3233e4dcbed668f96588ddcaef43108247a4043f2f7fe7a32fe749b6f7f00
MISC metadata.xml 657 SHA256 9900dac3ab206adca75ceae4df1c50f840a131d4a779ecac28cc70bac2ff2a00 SHA512 f89f5271c5e364aac3c2ebc4e8b3177bb4472e09bb740c2d54e472ac9e5a2272988781d067b7b68bb1b80f8ba8c20611f74dd2adbb7b59fca68c36193b33bfef WHIRLPOOL caa85695a6653392f233afd978217be3b664d4e2ef0caffd2532620904c3c47c4555ba250b549d0262c111d20ab4b65c7fe4ab8127f46423bd547ff51ac25290
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQJ8BAEBCABmBQJToe5TXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUPtHYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1TwQANJSPlt31jF+XLc1L0E/gbIL
-dGfHcUgjGDwWL4F/9Vowh6BTe0cLxKrrsn0e8c1oYU7BNYTacjQabksq9Yd8nO2d
-UM9ybsU1SqMnavXYEH9P40znGwOqGpFrS4swtkXVYpHLncNGR8wtxrVCsOWMflCA
-C0hy9nqcJpfPDGGiModbDrRnOnCujCNkRpBrKQZ0lGCDZhSSk5NPDnYCts2vVaYU
-ts0KGkbb7VLTCb/t+4ceymd4BR1QuZFXZDRHSSiqErYf4jeHZ7FUphX+ByHdhwD/
-N2vLTm09UidZ9/kfoN+TYsVz+HlBp4KhPCylh8JIpiEnKDyF6olmjvYEOGqiSD01
-AAqmTIEt/GtK0URE9g9WQ/Tv51f8eIM6P8eNRpu0FLFBxRFe9tDIrDLdEOcHgzZb
-TjimghnXuiMlwqnca9NeawTUjm2an8bl0utti/QSegOdN33JTcjQ9jyE07HB7eOu
-eUmfNOox0tskxlhWOo2bJ7yLa6t65L5/248T9BuP/7Ojayn9+6mfNO4GUZ/5IgO+
-mbRhiE8hBpntePnFb9JPq/CEZKdTTub15Rn74LqXur4oMNs+eg6dXxeBbmpIwLcL
-0fIO4WIn0MLH8Bq/Kyx4agl1Pd/g+vHLQpYw8PWRNhOUpQtUlbFs9m/TsB4JNCNl
-Nm/3JDMehv/wvjZzIbNC
-=iJyO
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOskYQAKZEyfGMDeCUa/WbpwZGjYAA
+vFnYwmLcgtuxwtNgdhvjS9MnVt6LWzTL2A2dXKG9VM0q9UBt9v4L/gqEDgJtBi6c
+m8jgKmvgzU9pAr+3jRY/MLI7PCvvag/7XCUMCANr1PVtJJ8y++5K0j/Uz0BEo54E
+FNtZvj0r7L2LenHYXGZuRoZDDBij+E4mkjc5SRdIw6RxJ+5u/nsh6IFyUxbXqI5V
+BT0Yf3RLgZCZU+ELYs9zcxfY2Q9GzUAIFdo+EYw8nMA+BvX2xoLOc2N+X6Z7/XR+
+hAoWGov0gt11TTBL5CtgS8uRNpC/xaQfZVrbywkaZmH4Ied30mM9nfP5pgC2QE4b
+NH3IUXgKW3xIQ9WDL9GQhY4t3trKvOVRhPPOVMTWmUjMDNZYflY0R+Q7sxkutcvh
+Jcu3UDj8wEukuZgWE5mju0lnoDDokCIs694mn9P9yC9yqljeDqyqk6XcU8fsmH/Z
++X/HGJxinLPnFoXspB3Srjl+JCmRUanSjSFHVqlPK506YJbuFqisFonqLel8r8dr
+T+fEmfNWFrl52iyccsqGZOqchiJU2wlDYfmeyHc7Dx3LWR5DzojvXGgYskIsfizt
+tPfmiNPQ8s8rMtkro8mrOnYSLZaXBJxNEwEtfUOZiL1bZ1u53Kv27R/J9/wLfku8
+m02tvghXvt0LUIoKAFeW
+=Gff7
-----END PGP SIGNATURE-----
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
index 92bd854f603b..12fffd11b8d3 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.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/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild,v 1.2 2014/06/18 19:53:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild,v 1.3 2014/10/15 19:58:15 mgorny Exp $
EAPI=5
inherit eutils multilib-minimal
@@ -39,7 +39,7 @@ RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${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? (
tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
@@ -76,7 +76,8 @@ multilib_src_configure() {
$(use_enable smpeg music-mp3-smpeg) \
--disable-music-mp3-smpeg-shared \
--disable-smpegtest \
- $(use_enable mad music-mp3-mad-gpl)
+ $(use_enable mad music-mp3-mad-gpl) \
+ LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
}
multilib_src_install() {