Extend linux-headers dependency atom (#230491). Demote r1 to ~mips.

(Portage version: 2.1.4.4)

4 files changed, 18 insertions, 10 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 54ae99746654..4914e37ee6b6 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/rp-pppoe
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.96 2008/06/30 21:40:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.97 2008/07/04 17:53:37 mrness Exp $
+
+  04 Jul 2008; Alin Năstac <mrness@gentoo.org> rp-pppoe-3.8-r1.ebuild,
+  rp-pppoe-3.8-r2.ebuild, rp-pppoe-3.10.ebuild:
+  Extend linux-headers dependency atom (#230491). Demote r1 to ~mips.
 
 *rp-pppoe-3.10 (30 Jun 2008)
 
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.10.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.10.ebuild
index 616773dae1b0..b3f06d980263 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.10.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.10.ebuild,v 1.1 2008/06/30 21:40:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.10.ebuild,v 1.2 2008/07/04 17:53:37 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,9 +17,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="X"
 
-DEPEND="<sys-kernel/linux-headers-2.6.24
-	net-dialup/ppp
+RDEPEND="net-dialup/ppp
 	X? ( dev-lang/tk )"
+# see bug #230491
+DEPEND="|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 )
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A} || die "failed to unpack"
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.8-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.8-r1.ebuild
index 453073422008..1b5c36fa412f 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.8-r1.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.8-r1.ebuild,v 1.2 2007/05/06 08:11:04 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.8-r1.ebuild,v 1.3 2008/07/04 17:53:37 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -14,7 +14,7 @@ SRC_URI="http://www.roaringpenguin.com/penguin/pppoe/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sh sparc x86"
 IUSE="X"
 
 DEPEND="net-dialup/ppp
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild
index bc2362d30209..b86d57fe90ea 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild,v 1.8 2008/06/30 21:40:25 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild,v 1.9 2008/07/04 17:53:37 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,9 +17,11 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ~arm hppa ~mips ~ppc ppc64 ~sh sparc x86"
 IUSE="X"
 
-DEPEND="<sys-kernel/linux-headers-2.6.24
-	net-dialup/ppp
+RDEPEND="net-dialup/ppp
 	X? ( dev-lang/tk )"
+# see bug #230491
+DEPEND="|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 )
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A} || die "failed to unpack"