diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2014-05-05 03:40:01 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-05-05 03:40:01 +0000 |
| commit | 4f0dd70b6d277f174c03d73b74d2dfbca5cf5252 (patch) | |
| tree | 93dd9dd40fd91b009b7ed55351ff6ff91f9bd82e /media-libs/sdl-mixer | |
| parent | Fix ChangeLog entry (diff) | |
| download | historical-4f0dd70b6d277f174c03d73b74d2dfbca5cf5252.tar.gz historical-4f0dd70b6d277f174c03d73b74d2dfbca5cf5252.tar.bz2 historical-4f0dd70b6d277f174c03d73b74d2dfbca5cf5252.zip | |
collision avoidance for sdl2-mixer[playtools] (bug #509448)
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Diffstat (limited to 'media-libs/sdl-mixer')
| -rw-r--r-- | media-libs/sdl-mixer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/Manifest | 26 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild | 7 |
3 files changed, 11 insertions, 28 deletions
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog index 4e100922ee23..2d91834f8516 100644 --- a/media-libs/sdl-mixer/ChangeLog +++ b/media-libs/sdl-mixer/ChangeLog @@ -1,6 +1,10 @@ # 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.125 2014/05/03 10:34:42 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.126 2014/05/05 03:39:56 mr_bones_ Exp $ + + 05 May 2014; Michael Sterrett <mr_bones_@gentoo.org> + sdl-mixer-1.2.12-r3.ebuild: + collision avoidance for sdl2-mixer[playtools] (bug #509448) *sdl-mixer-1.2.12-r4 (03 May 2014) diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest index 4076965ff52c..efc188522478 100644 --- a/media-libs/sdl-mixer/Manifest +++ b/media-libs/sdl-mixer/Manifest @@ -1,32 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX sdl-mixer-1.2.12-clang.patch 276 SHA256 4d34bb8ac7f7e33b6f9fb9280d187d6b47c8ccd414489eefb68e5ce7c287c2d8 SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e WHIRLPOOL db4b23b541cf0850eb5fda27698cc87b25659e2366445dabf428720d04ba69b68d964cc91682fcbe8ed947e6011bc6d5f984f286552837f8aaff4bb01c382414 AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 SHA256 f61866f35dbd5e7dc9927df64db2c72cefa32a1093008bf0fe1c7cbc0501def0 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123 WHIRLPOOL cf0e6aebfe512b30d5889d98272b0df91f531e8b881adb242ea3c3533d42bc675aea61ad9169783c1c9bebee0991eff57ff1c5dd5ec72d20a8392a7df2473086 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 SHA256 3b9d959dc6660b3b765d8b4a53bc1b56858ba7023a76fb95798391b6a7c43522 SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704 WHIRLPOOL b07f267348d6cd202f35ae59b79c41ee1dd38799bb561cc5179812b63baba9d580234b2a0ef97dc614324d68a546fe16d9c35e21b10931f939d7b60e3c13d711 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-r1.ebuild 2878 SHA256 7bc2f9790155808aec3623e10e697234ba9bb4346458334b018a6e10909f314b SHA512 1b4feef7c11c74af8ceca50914be97b386d40936baa2913e851507fd8d71c5efebc84bd439709af8715afdc4b998714ebfcd55f8fab8427656b8bd8a8bb2b32c WHIRLPOOL 9de71f8ac0e54aa1f290cab52e741bf09ad8f9f021c74e67e6d9b456603b1daf74a1aa580b0176bac18682858b98fba3e86e44961053bc20eaa75de8f20e8ac8 -EBUILD sdl-mixer-1.2.12-r3.ebuild 2966 SHA256 78f0790a1c29f00b1616cc936cbe8105340ac97a0fd62b462f892aa26c3898cd SHA512 9980e7439bd790a9ed9f39d5efab9c059270999986a747c6101bcce71587a5c9f827f8808ba7e729230d19c3784c149709239b4764c4cea5228318a8dbbdade9 WHIRLPOOL 845034b02fb00ad3e424f6adb43f73c0187a77331e69c9a9953c0b8ba9b3b3ec4961e3938c3084b83b2d973d538e4c8444039106b4fa68bf1ab075c561e02238 +EBUILD sdl-mixer-1.2.12-r3.ebuild 3024 SHA256 b5ba50b391f5505ffe8ec39952aaac3503358f486b1462ec1f31529c5b11edd5 SHA512 6d267c23f4a9b7b21c411e6b9cc2ab48830f32c90b339c13490376d2df1b494e617a6e3919f4a83fd749fd1ca5631b553bf71616d9f04e978e56e46ec717d829 WHIRLPOOL 3fe5ae9352f18370f191547feacb9ec51f387797d828416deb3ac9a320b91bc4633a481aa3d01242ca56822151b0ca7871182a6a5f4077ef9ac4c5b280fed59b EBUILD sdl-mixer-1.2.12-r4.ebuild 3358 SHA256 747af2aeeb4ca307a5e75406bdbb4ad368208690092fa32d457bf4dce691c931 SHA512 c82701e0158191aced1c25431d37178521479ef62fb102b2448fb8d467b841c54d66a853ff0307d639a5bc6ebf9dfd1f21a434ca56b0553d3e75e73fe0968560 WHIRLPOOL cd0121cd7e47888383b96ef8129ccea2cfdf880d92eaaa8cf2a3da450e8e9d771944811a6771440a536882cd5421a7cd2bdcd269bfce5123359307d49fa6c658 -MISC ChangeLog 16663 SHA256 50f24c3fd8c32633986ff5ac13847a7de054634196ffa16fb5ec84ee56f7973e SHA512 8b13c445f61518c2bd68d8dc8ffef761882e452becf9e783676004aa93f38a35c45cb63187486ea60d11aad1ef843639339299fa20d74796282e61efb6bc1718 WHIRLPOOL e2e73ea58a684d0154d0665e0df5a778c17818f861af50e7f146f064f9126a5c27930056682935d9400cb5f5aacb63c75fea5402e34c89738feabce1983de622 +MISC ChangeLog 16814 SHA256 b84b4267cc4f5a2acd468ae1700ca86cd849706b48cac41ed0ba57c850b32971 SHA512 1b2cd35b13748f5032183c1824d75185d5d517852022e6644fccec270cee066db0c83db5897df506debe412ae76a7da7515c679e8a366d9290e4d0e669df4024 WHIRLPOOL eb54954e38a7d2b42f6abbb36a389e82696d562678c7554db7d46f81e61b3a512cbf3c8c6e1a4d363e7f118000a1db25c04cf704c23c078c2f7199ee23566bc5 MISC metadata.xml 572 SHA256 d4c6ae5e121255b47dd978176db7002fd8db1753cbfdf58792e9b4fa7565de35 SHA512 2b0cd28223fffbda314ad0f08415ca39b47b5734e105aea2f802b7ad22bee5aaa1c29c5583848de0605cbfde133901ac7bb1f61dd06c195ed731fc3a1847c656 WHIRLPOOL 50908664fc647d1c2d7c9d83cdb3bb4cb350ae38222dd15ad415bee3e5a85a7caa95ee65f79db44242bf7d94ff48ebe2354d21b1738cfc7a116eedaf4e32dc29 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQJ8BAEBCABmBQJTZMZDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7z4P/3rHZ0TcSc3gVYFiRrDclyXx -ipTHoT/EfkO/HWSZHrs6ERw40OYflqBA2f9xh74b4grTJ8B26k5tAswqhEsj2rCQ -Gmjyh3nSxyVg2Q5LW6e6nHsq0IJsMp7/4v3OgwDTBoTqNKicvCTUO1bHTYlaQ81q -tnVSmc5D5iHEKM/hRFLQVZ41Af4DZFcDj32Powo+v9SVrYApvB8WcpBhSmtmrrtM -maLZnZAtLv7WPAcoylMx7M78TRywL9zzlxan5oejtJfMYgSEVTl/BNj+jVKf1qX0 -TfJrxmSiQqmrCj/ydPol4MAPusjpzYfBVe1XGoWtApmiLB4BziuDtcbuw+DpckSv -2XHSMhja465iS5nRA2bJ82PqfysAXq58L+3o35wZP0++c4xWSLHZ7eYv/cIC9hkx -yMxaMoDcHCReIM8LBMK7pNHHOVXfe8RzPkCBe7BcRx8CqOGt092D+IduLYy0m/qM -E+GPJkkXLMplmTlStxXSgbnYPWZX5lvgPHyrsZPBiTZfTbwah86SJfW6YSmE1IsJ -9JZEY7uvJMd3hnIdyu326Q+XIV8402DsJE6ZCSYaATfGVdlHXWTX01T7+dE4S12m -cF4CZVEIVUbGkTZTenJ25oTfzzlJT/WvWGXr4yN2EaW+agaXlOq+nVfP72Hzd8y9 -ra9fYQtCkktss7LfH+KX -=w7Ac ------END PGP SIGNATURE----- diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild index beb9502147b6..cb0055ba6f2d 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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-r3.ebuild,v 1.11 2013/02/24 18:04:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild,v 1.12 2014/05/05 03:39:56 mr_bones_ Exp $ EAPI=4 inherit eutils @@ -41,7 +41,8 @@ DEPEND=">=media-libs/libsdl-1.2.10 mikmod? ( >=media-libs/libmikmod-3.1.10 ) ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND} + playtools? ( !media-libs/sdl2-mixer[playtools] )" S=${WORKDIR}/${MY_P} |