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

Package-Manager: portage-2.1.4.4

5 files changed, 25 insertions, 17 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/Manifest b/net-dialup/rp-pppoe/Manifest
index 689c63bbd730..d740a7ca4fd8 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -17,15 +17,15 @@ DIST ppp-2.4.3.tar.gz 688092 RMD160 845821496bacb07d93bb7572a171854853ef722b SHA
 DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
 DIST rp-pppoe-3.10.tar.gz 215288 RMD160 97a07e49a0bd62cc7ea92985da3b9409f5f86207 SHA1 183372b84c1bb8e22d1bd8be05a280d948ae41f9 SHA256 709ca7402594acc1d80b99c20219112b5c00e6ac48ae6049fc626fbaf4ce49f6
 DIST rp-pppoe-3.8.tar.gz 212931 RMD160 039798154acae9e7a066172f23904d766ba68a9a SHA1 d9a4346701e580b4a6049a940557b38533f9e8f7 SHA256 d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479
-EBUILD rp-pppoe-3.10.ebuild 2369 RMD160 0e2879a79bb17327314976b4fe32788fce7a9c14 SHA1 fbd4a69411391e3e820f7dcc3b30466179d24ab7 SHA256 a6f55ccfff361078c10e93ba82b07a51b218ec7bf8b7f662c30fd927e7e5effc
-EBUILD rp-pppoe-3.8-r1.ebuild 2397 RMD160 5f140f9f37f425d56b1d7cbd2ae7fcaabffe4d70 SHA1 384790e3402470966fa7b3865608ecc03af2994d SHA256 1186eca50e80fa3e650dd5d77624b00f9f582a1d2c7d5e8227a29468ff9262cc
-EBUILD rp-pppoe-3.8-r2.ebuild 2377 RMD160 fbecbcd287ca023e15473d24a244c653a889fe5a SHA1 a4d45ee239fb0a1fe28f92d409862a16e01e8e9e SHA256 fa5c49c062d606a766726fb154d68cbeaeaa4d5c749e8b22089bda826e6617fb
-MISC ChangeLog 14721 RMD160 eb483d70b174c66e308f3ada9fb4758addf03b0b SHA1 d0572c97a0d4fbd99231d491b6899a1c0a70c3ae SHA256 d17e70f34a3ab0040681f40144d7d4528c203e2ff7c7f3c0b7719951f95229ad
+EBUILD rp-pppoe-3.10.ebuild 2449 RMD160 9229549934363ff9054ab80cdac9285bc844d37c SHA1 72a583a4c13f0a0b7fc7201c6b813b53ddc0a41e SHA256 37f71ee2b978b6ab1558affb2ee2058b2c48a392d150aa6c199df2c17a0dc19b
+EBUILD rp-pppoe-3.8-r1.ebuild 2398 RMD160 d26b515b82925c30324e2551724bafc5352269af SHA1 5bf0e82a94cea527f71ea5b7cbda920d2623668f SHA256 63a799995ac841926ea2cab94fe359ca08e8c9b46e38dcca6de0e8a67cffc5c6
+EBUILD rp-pppoe-3.8-r2.ebuild 2457 RMD160 41c2aebe7fda8a2643c4a88578da47e699d23511 SHA1 685f9c2c49946aa57afdfd8ad0379f698593bf19 SHA256 8474e80e261b20fba3482387ccf8c2d1fe701d2a05c17a7e37916fb13e488640
+MISC ChangeLog 14912 RMD160 ef88e6d7849636d1d1825d38dcbf209fa760146b SHA1 be5088320ad22d810ef1b77e5a098d247a21ebcf SHA256 b8bb2bcbcdc0a3da64c3b31ba363d834239c575751bff53dd3addc3bc96d87e5
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhpUtkACgkQPrHvTlXvhtuSBgCdFHL6vVBCbOyfkshvJI9x1UbU
-zkgAoJrLAQrp8XFHdre3XYD60LIzlHTA
-=qtiZ
+iEYEARECAAYFAkhuY6wACgkQPrHvTlXvhtsAYwCgiwBj5w3F9LHJ+ioooqrvccDx
+adUAnjjzdDBARzCoUkgv6xc2gM1lOY7c
+=Rzvk
 -----END PGP SIGNATURE-----
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"