summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2013-09-02 20:56:08 +0000
committerRick Farina <zerochaos@gentoo.org>2013-09-02 20:56:08 +0000
commit992187c1c39b286539f0b5fb52f2e4cab71052c2 (patch)
treef5ed8ba1c2ec5a76f36e551062752d5094cf0a65 /sys-kernel/linux-headers
parentfix build with newer glibc, fix typo (diff)
downloadgentoo-2-992187c1c39b286539f0b5fb52f2e4cab71052c2.tar.gz
gentoo-2-992187c1c39b286539f0b5fb52f2e4cab71052c2.tar.bz2
gentoo-2-992187c1c39b286539f0b5fb52f2e4cab71052c2.zip
added a blocker to ease transition from alsa-headers to linux-headers
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'sys-kernel/linux-headers')
-rw-r--r--sys-kernel/linux-headers/ChangeLog5
-rw-r--r--sys-kernel/linux-headers/linux-headers-3.9.ebuild9
2 files changed, 11 insertions, 3 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 39271a9129bb..246f05825e48 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.392 2013/09/01 17:11:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.393 2013/09/02 20:56:08 zerochaos Exp $
+
+ 02 Sep 2013; Rick Farina <zerochaos@gentoo.org> linux-headers-3.9.ebuild:
+ added a blocker to ease transition from alsa-headers to linux-headers
01 Sep 2013; Agostino Sarubbo <ago@gentoo.org> linux-headers-3.9.ebuild:
Stable for alpha, wrt bug #470648
diff --git a/sys-kernel/linux-headers/linux-headers-3.9.ebuild b/sys-kernel/linux-headers/linux-headers-3.9.ebuild
index 8d77bc86cfca..db5bea09880b 100644
--- a/sys-kernel/linux-headers/linux-headers-3.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.9.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.9.ebuild,v 1.6 2013/09/01 17:11:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.9.ebuild,v 1.7 2013/09/02 20:56:08 zerochaos Exp $
EAPI="3"
@@ -16,7 +16,12 @@ 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"
+ #blocker was added to help transition from alsa-headers
+ #providing the files to linux-headers providing the same
+ #files. portage isn't smart enough to remove alsa-headers
+ #if it is already on systems
RDEPEND=""
S=${WORKDIR}/gentoo-headers-base-${PV}