diff options
author | 2013-08-17 01:35:15 +0000 | |
---|---|---|
committer | 2013-08-17 01:35:15 +0000 | |
commit | 2352dc388e9b0393c1167a9529ce18fa6be06913 (patch) | |
tree | 18e98aa429b884255a2a15463f7ab1016808255b /sys-kernel/linux-headers | |
parent | Add blocker for alsa-headers to avoid file collisions (diff) | |
download | historical-2352dc388e9b0393c1167a9529ce18fa6be06913.tar.gz historical-2352dc388e9b0393c1167a9529ce18fa6be06913.tar.bz2 historical-2352dc388e9b0393c1167a9529ce18fa6be06913.zip |
Fix alsa-headers block
Package-Manager: portage-2.2.0/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel/linux-headers')
-rw-r--r-- | sys-kernel/linux-headers/ChangeLog | 5 | ||||
-rw-r--r-- | sys-kernel/linux-headers/Manifest | 4 | ||||
-rw-r--r-- | sys-kernel/linux-headers/linux-headers-3.10.ebuild | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index c1b1efb98c7f..570b4f358c10 100644 --- a/sys-kernel/linux-headers/ChangeLog +++ b/sys-kernel/linux-headers/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-kernel/linux-headers # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.387 2013/08/17 01:25:10 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.388 2013/08/17 01:35:06 patrick Exp $ + + 17 Aug 2013; Patrick Lauer <patrick@gentoo.org> linux-headers-3.10.ebuild: + Fix alsa-headers block 17 Aug 2013; Patrick Lauer <patrick@gentoo.org> linux-headers-3.10.ebuild: Add blocker for alsa-headers to avoid file collisions diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest index 03e01ca61050..35099d25005a 100644 --- a/sys-kernel/linux-headers/Manifest +++ b/sys-kernel/linux-headers/Manifest @@ -28,7 +28,7 @@ DIST patch-2.4.33.3.xz 5796 SHA256 89fe1dbf5cb9513b73f9825328765c342f6054186f0b4 EBUILD linux-headers-2.4.33.3.ebuild 609 SHA256 6884f13a2085f1a39b1872e75ca56c877367de4113cf4ed0ced64ff7cc39bd84 SHA512 72b711e6215a598311a98f9cb90c172ea920141dd3d6c9b1423ad7f6b3ca4c648f5aeabe66cae0b71b49a246af1d37ae5929efbd4101188b7765947e7a4cc662 WHIRLPOOL 9fbc139358ba75d7820690c7146e08c75b483d382e9f1ede168212c3eb6a3833df6663bc36cb9b8e3e1b13a79aeed262bffb7c784e5f76201e21c5c96756ad59 EBUILD linux-headers-2.4.36.ebuild 620 SHA256 34aeac399c62d14f244ce03dfcb28d352a1aa446980ff8948395992346ce8234 SHA512 8122f19a91acd33710b277bdf72b8ef47f6c699411259cb614d29eabe669a00956842f1269d3cfb829c99429dc64117488db085e4c06bbeee01c44d0abfd1c8e WHIRLPOOL 4f23ec450fa52c2dd29d62825e43ee2ea324d730597d5d9f54ee71fd695a2862cf8e75960adfc7a0e4969f526c58d4b71bca3a1935c723885794b34ac458ac1d EBUILD linux-headers-3.1.ebuild 1465 SHA256 56f1f39b4b8a8f861d11386450db0c5cfcd9a93e91c077b514e1c7d9b86c8296 SHA512 54cf386cbdb82001d73bff2e355bcb1f97482f8663550cf90233ebcf9221c3fde15ba9afe47e8bb99eb95c41f01663366982180e00e58b623449ed8740a2abdc WHIRLPOOL 5747b1d0acbf70926b535debc69e604c97669bbf74d78e7257cdaaa516184931b945391e464f4cb42dbbc833d061c85a1847a904987f9ab355b050fe23fb1fbd -EBUILD linux-headers-3.10.ebuild 1424 SHA256 46825706fdaf7c64484aed61538c6936248167ec2b82af35fc1fee4325390432 SHA512 b24b390c3bddbe78b6ad9ac65647c1c4e3b8ae9d14e072e9ece7eac16a0f7b7d8335a7f63d0ff1388f97e0a8aa0cb6b7761d1275519f4ae136bb6b10e533cdd5 WHIRLPOOL a3e53da40e435eb980fe412c81e776da66a6242b0f84b7fdc0628b6ca94a442c958bbf7eb38b23064af9eae92b2c4b10af14c0b9725030e7dd5bee4081243ceb +EBUILD linux-headers-3.10.ebuild 1425 SHA256 8997c802d63a9117b779f5747d3c83e3a5df86fa5b1106a3d78e519ca5c3be81 SHA512 f9c796853a1c3d3c35cbb693a621edf880a88245caffc18ecdd3fa4e9af89dde05fc9b404020ae46f8fb4fea1dbc72fd75e0460a120828fde7d4fb5036ef4149 WHIRLPOOL b65af565d87da8d4b8771309e80cfda2e24c0c9ae516cf4eebd254692bf1a79d7a9099509965375b48480e2caa0503ddeb10972309796747407f75e02ba809e8 EBUILD linux-headers-3.2-r1.ebuild 1479 SHA256 1e1bf8e4222bd637e15bf63cfa3d237cdc2fe766d08416aba8931c403b2be943 SHA512 84e2d5a932fda3ae0d6e163c08a829f211c96bcef336d0f78308b383007d138192f6ddcbc99f4e329c36d069fa82904cd807970d098458146da4f2626c422962 WHIRLPOOL 22ae1da282c3d5956bbe6594aef8b955125794b227931204dcd15e0fb98547ceb0ae2b52b5ef495c2740850536c57a2a991137a11f2820573bec332a25d941b1 EBUILD linux-headers-3.3.ebuild 1476 SHA256 f79706fc7a57f3860e60c6743d25265d6a20d5acb5de571688c189a66748839a SHA512 d37d5f8f948c850c9bff695739d526805419b9a14e6ed30bf208de76f9ecd3c977998a5b3c8be23bdf5c6279fec0ac368995ce8d604e8d13ed8aa3e4e17ecff3 WHIRLPOOL b1c5720e1d7260e8fb976232fd5f39ad5d6824c5e176cc941c4b6d9fcc27cf05165d5e3ae02c3941a1a467c2f62cc511150f100a2af7d493a6a5a3c6b499f93a EBUILD linux-headers-3.4-r1.ebuild 1372 SHA256 bc945d7062e078506bc185cfe50394febb772cbc7128fdbf91c97337538278fc SHA512 25009e2abcacf345db75142a8f3d619903fa25f841a0180f0810b0a4c9bd74baf8e6a598afe50081ac26f497b62542fa297db8b590ab3e06990d59483914fbd3 WHIRLPOOL 985c0373666c95493a1024e92e1ce2586d3e77417fe35a469955092aadabaa4c81b832b394fb7b4375e4e8511b867682d271436a28e75768f8de2c30644dd870 @@ -39,5 +39,5 @@ EBUILD linux-headers-3.6.ebuild 1375 SHA256 630a9237c33ac12b51ce5697be63c387345d EBUILD linux-headers-3.7.ebuild 1375 SHA256 5fc58ab8e3e53eab8ed0bbd62c9830e9fbc052cebd306ada51338a16a6fe3777 SHA512 3f1f7e62db7fd353681ffcc38ca4871754bb09ae19828bfff7cbd74d04ae8f0e45ca0f17eb1aec63206281c976b51009a1681e08ef085204d6e099aca315ec9d WHIRLPOOL 918e7ad6c5864ecb58555a4ee8c93e70c924708318310a35a4a75729ee0c39457ace8c88379f012c2ecdbba7c5d5bec427d380d5210486048eea88d410d07cf2 EBUILD linux-headers-3.8.ebuild 1388 SHA256 4e89ec02e1317603a557678695922bfc152917fd8998711209533bc0a8d97e77 SHA512 598b61a3183784b3327e558bf97bfad10601be1e0e23851995d3ff64e2ca1873b8e6a0ccf304b84ee8abc7bbadd717dff30f9934c241567af8a84881e46a96d1 WHIRLPOOL b1842d98095967869330803cdb47597ea3c5c8d1a2d27ea2947fc679faea8c1fa0ce11bbe23d536833433d8c30200e33ba1a16a365e5d3974a61a2f460dff94a EBUILD linux-headers-3.9.ebuild 1439 SHA256 5054d8b3cda8d61e3f5ffb1b251fc1225129ebc042fb1f9dd3331bbe45df6089 SHA512 0b8d2c984949761dfa75a37c30677cc8f8805b939ffe4e001c7f5901ff4fbabf2b0af9a666408b8e7b03aac6dc4198735adb69e8df66a31834c496505fcf5839 WHIRLPOOL 5697ae2f28db925dc608f47d40805d842d6191a9f70d3e7159100043138a0a45b5db362260f00d33a3c1384071a7705f81b191f60023b15ab2c54062b9683375 -MISC ChangeLog 62182 SHA256 93a74df9f4fdc6031bec407928d65ee4213b73a4dd7f1fa7db9359a0569ff364 SHA512 684f3a12de5cee4a39dcf60e4563a6084c119349a152729037c724db9d56ddea6235e7cf0f21bfbac770e7a228430f79185c66b491d92dee833b35bfc61d47f7 WHIRLPOOL a8d9af304b6b0e513e0d4bbf447ceda3eb39c2bdbe90dca5808b8342beb4482713db8afcba6a199f918c051899123ac44fe8f92800fe089aeafd6ff46c0c629d +MISC ChangeLog 62285 SHA256 ef61935899f2d78a81d2643f1a6b2d8fb3b0c14b3f5dbffbb5e2b5606d550976 SHA512 bb0b54a82e0190bf68add66e667c96a6973f4fb8d4f0ba3d31806c2415f9cebcf4449b71d26783b994ca5c17b90eb98c40bc383326022725e882d3a65e17afcb WHIRLPOOL 5cbbfb32584e0f2d3f23049a50b4e4986a172a10382cce02864ce6b95a10b852e78a5a124248990a20f9a84967615aa3bfb4f725e38cc26806c3d94f7d7ceab6 MISC metadata.xml 247 SHA256 6858f34fb3375b80b0071f911f6ead887ae327e0e27ecd39be3e8ccb2609fa0a SHA512 b82456bc3441754e0f316575316497d293374ac4bb80e1b7e4b158358a3e920a6da4bb223a97412bbeba8f51ea4555a84267f4ebc8eecdb06941038efd03c47f WHIRLPOOL 96213c23913ccc5a89e2fa924701b916106c15cd24940f7bc2c8896c6a5545f840c1bd21ccc0882a928fd44628cce49c7cd8d25957ffe6c64b4755b467e6344d diff --git a/sys-kernel/linux-headers/linux-headers-3.10.ebuild b/sys-kernel/linux-headers/linux-headers-3.10.ebuild index cc102370dc9a..22f1be599049 100644 --- a/sys-kernel/linux-headers/linux-headers-3.10.ebuild +++ b/sys-kernel/linux-headers/linux-headers-3.10.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/sys-kernel/linux-headers/linux-headers-3.10.ebuild,v 1.2 2013/08/17 01:25:10 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.10.ebuild,v 1.3 2013/08/17 01:35:06 patrick Exp $ EAPI="4" @@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar DEPEND="app-arch/xz-utils dev-lang/perl - !media-sound/alsa-headers" + !!media-sound/alsa-headers" RDEPEND="" S=${WORKDIR}/gentoo-headers-base-${PV} |