Apply suspend2 patch only if the active kernel is sys-kernel/suspend2-sources (#126140).

(Portage version: 2.0.54)

4 files changed, 17 insertions, 14 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index 28cb84bd3595..3cf65e99d855 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/hcfpcimodem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.22 2006/03/10 14:30:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.23 2006/03/15 00:12:37 mrness Exp $
+
+*hcfpcimodem-1.10-r2 (15 Mar 2006)
+
+  15 Mar 2006; Alin Nastac <mrness@gentoo.org> -hcfpcimodem-1.10-r1.ebuild,
+  +hcfpcimodem-1.10-r2.ebuild:
+  Apply suspend2 patch only if the active kernel is
+  sys-kernel/suspend2-sources (#126140).
 
 *hcfpcimodem-1.10-r1 (10 Mar 2006)
 
diff --git a/net-dialup/hcfpcimodem/Manifest b/net-dialup/hcfpcimodem/Manifest
index f1ac1de2c20d..60933aeec58d 100644
--- a/net-dialup/hcfpcimodem/Manifest
+++ b/net-dialup/hcfpcimodem/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 eb106696e4132e73617dbe29307cae13 ChangeLog 4037
 MD5 25fc41dea981da0f005db63a43768868 files/digest-hcfpcimodem-1.06-r1 144
 MD5 395bd74ffc3553d4ef151865b7601bb1 files/digest-hcfpcimodem-1.08 144
 MD5 a2b09ba68937c610b9c2f5156690c3a4 files/digest-hcfpcimodem-1.10-r1 144
+MD5 a2b09ba68937c610b9c2f5156690c3a4 files/digest-hcfpcimodem-1.10-r2 144
 MD5 790c0fbf3202d068fbb35b11296985c2 files/hcfpcimodem-1.06-simple_class.patch 5124
 MD5 9ec542df181d86f49f4d66377de83a59 files/hcfpcimodem-1.08-upstream-20051215.patch 2777
 MD5 d49ba111af3016191da29fc85232ae77 files/hcfpcimodem-1.10-suspend2.patch 800
 MD5 78b35559c72b662ac59d18d5c59ab93f hcfpcimodem-1.06-r1.ebuild 1904
 MD5 9180a9a60e4066ac19d6caaba94f527b hcfpcimodem-1.08.ebuild 1859
 MD5 91f632c23d36f21a6e17bc567c4cc219 hcfpcimodem-1.10-r1.ebuild 1889
+MD5 4c2f29b601ea3142b02f587cde7e2ff6 hcfpcimodem-1.10-r2.ebuild 1988
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEEY2ejG8pv1lIUX4RAkB9AJ9uSgbs7CitLsHKmay7hpZRzesRkQCfdiuG
-xvHHd6gvFZCxTnF2s3tUFIY=
-=xKTW
------END PGP SIGNATURE-----
diff --git a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10-r1 b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10-r2
index 3abd71036426..3abd71036426 100644
--- a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10-r1
+++ b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10-r2
diff --git a/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r1.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r2.ebuild
index 425e745d0afc..f0e2126d7f51 100644
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r1.ebuild
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r1.ebuild,v 1.1 2006/03/10 14:30:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r2.ebuild,v 1.1 2006/03/15 00:12:37 mrness Exp $
 
-inherit eutils
+inherit eutils linux-info
 
 #The document is the same as in hsfmodem, even if it has a different URL
 MY_DOC="100498D_RM_HxF_Released.pdf"
@@ -23,6 +23,8 @@ DEPEND="dev-lang/perl
 S="${WORKDIR}/${P}full"
 
 pkg_setup() {
+	linux-info_pkg_setup
+
 	MOD_N="hcfpci"
 	# Check to see if module is inserted into kernel, otherwise, build fails
 	if [ "`lsmod | sed '/^'$MOD_N'serial/!d'`" ]; then
@@ -47,7 +49,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}/${P}-suspend2.patch"
+	if [ "${KV_EXTRA}" = "-suspend2" ]; then
+		epatch "${FILESDIR}/${P}-suspend2.patch"
+	fi
 }
 
 src_compile() {