diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-08-17 01:25:10 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-08-17 01:25:10 +0000 |
| commit | 8a582d36a87e3136a3f093c3d35ae8ce177589fe (patch) | |
| tree | 19b521d23eca19a3deb790d0ee4c6cc12bee420e | |
| parent | QA: Punt version with broken deps (diff) | |
| download | gentoo-2-8a582d36a87e3136a3f093c3d35ae8ce177589fe.tar.gz gentoo-2-8a582d36a87e3136a3f093c3d35ae8ce177589fe.tar.bz2 gentoo-2-8a582d36a87e3136a3f093c3d35ae8ce177589fe.zip | |
Add blocker for alsa-headers to avoid file collisions
(Portage version: 2.2.0/cvs/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | sys-kernel/linux-headers/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-kernel/linux-headers/linux-headers-3.10.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index 597e174efedb..c1b1efb98c7f 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.386 2013/08/16 19:16:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.387 2013/08/17 01:25:10 patrick Exp $ + + 17 Aug 2013; Patrick Lauer <patrick@gentoo.org> linux-headers-3.10.ebuild: + Add blocker for alsa-headers to avoid file collisions *linux-headers-3.10 (16 Aug 2013) diff --git a/sys-kernel/linux-headers/linux-headers-3.10.ebuild b/sys-kernel/linux-headers/linux-headers-3.10.ebuild index 0eb328747429..cc102370dc9a 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.1 2013/08/16 19:16:03 vapier Exp $ +# $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 $ EAPI="4" @@ -16,7 +16,8 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" DEPEND="app-arch/xz-utils - dev-lang/perl" + dev-lang/perl + !media-sound/alsa-headers" RDEPEND="" S=${WORKDIR}/gentoo-headers-base-${PV} |