From a3b66554027d3d2d52da13de9b14f175aa5c517a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Wed, 15 Mar 2006 00:20:31 +0000 Subject: [PATCH] Apply suspend2 patch only if the active kernel is sys-kernel/suspend2-sources (#126140). Package-Manager: portage-2.0.54 --- net-dialup/hsfmodem/ChangeLog | 9 ++++++++- net-dialup/hsfmodem/Manifest | 14 +++++++------- ...7.43.00.01-r1 => digest-hsfmodem-7.43.00.01-r2} | 0 ....01-r1.ebuild => hsfmodem-7.43.00.01-r2.ebuild} | 11 +++++++---- 4 files changed, 22 insertions(+), 12 deletions(-) rename net-dialup/hsfmodem/files/{digest-hsfmodem-7.43.00.01-r1 => digest-hsfmodem-7.43.00.01-r2} (100%) rename net-dialup/hsfmodem/{hsfmodem-7.43.00.01-r1.ebuild => hsfmodem-7.43.00.01-r2.ebuild} (88%) diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog index 1ae1d578e4b7..73cbb2b34ee9 100644 --- a/net-dialup/hsfmodem/ChangeLog +++ b/net-dialup/hsfmodem/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dialup/hsfmodem # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.24 2006/03/10 12:28:22 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.25 2006/03/15 00:20:31 mrness Exp $ + +*hsfmodem-7.43.00.01-r2 (15 Mar 2006) + + 15 Mar 2006; Alin Nastac + -hsfmodem-7.43.00.01-r1.ebuild, +hsfmodem-7.43.00.01-r2.ebuild: + Apply suspend2 patch only if the active kernel is + sys-kernel/suspend2-sources (#126140). *hsfmodem-7.43.00.01-r1 (10 Mar 2006) diff --git a/net-dialup/hsfmodem/Manifest b/net-dialup/hsfmodem/Manifest index cb320014f550..a1eea8602cf3 100644 --- a/net-dialup/hsfmodem/Manifest +++ b/net-dialup/hsfmodem/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0820e43e47183f242d0641d417d03edf ChangeLog 6304 +MD5 cf0cb1acb7c9152bc703cb4116421e5a ChangeLog 6550 MD5 83ef8c3c538249abc93745ecf124151b files/digest-hsfmodem-7.18.00.07-r1 230 MD5 83ef8c3c538249abc93745ecf124151b files/digest-hsfmodem-7.18.00.07-r2 230 -MD5 fb610b9a599d3b2ede68a872f52e95b3 files/digest-hsfmodem-7.43.00.01-r1 230 +MD5 fb610b9a599d3b2ede68a872f52e95b3 files/digest-hsfmodem-7.43.00.01-r2 230 MD5 1c3cdb408c8580a03b30e2ec00f63aa8 files/hsfmodem-7.18.00.07-udev-group.patch 603 MD5 55b57b492577870de5cb58229f0426d7 files/hsfmodem-7.18.00.07-upstream-20060107.patch 2809 MD5 020777761d71bdcee2b4e57cce60af11 files/hsfmodem-7.43.00.01-suspend2.patch 812 @@ -12,12 +12,12 @@ MD5 d4d8d616c23eb37833008e2a76bc9a47 files/hsfmodem-7.43.00.01-try_to_freeze-2.p MD5 72c3d70f94e3712b160f7b41b2978f1d files/hsfmodem-7.43.00.01-udev-group.patch 603 MD5 6f3c975173976a825b545ae010d9047c hsfmodem-7.18.00.07-r1.ebuild 1592 MD5 7806adb04b92a668c65c709b70959929 hsfmodem-7.18.00.07-r2.ebuild 1635 -MD5 d5db1925e95d99f938d901983a29550f hsfmodem-7.43.00.01-r1.ebuild 1677 +MD5 55bf101f8265a87f589c33ba1738ff50 hsfmodem-7.43.00.01-r2.ebuild 1757 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEEXD5jG8pv1lIUX4RAkLnAKCWBixrwBNqG+IDXhPFwyREVF4QSwCgq4fk -FFDyrbIp25os14GqrgY8xeo= -=3V9c +iD8DBQFEF13fjG8pv1lIUX4RAqmFAJ0ac/0zOKPmF3RHK4NQiKdAi8o8nQCeN25Z +WQogQ+FRORc/16ZJeG8yopI= +=S3mL -----END PGP SIGNATURE----- diff --git a/net-dialup/hsfmodem/files/digest-hsfmodem-7.43.00.01-r1 b/net-dialup/hsfmodem/files/digest-hsfmodem-7.43.00.01-r2 similarity index 100% rename from net-dialup/hsfmodem/files/digest-hsfmodem-7.43.00.01-r1 rename to net-dialup/hsfmodem/files/digest-hsfmodem-7.43.00.01-r2 diff --git a/net-dialup/hsfmodem/hsfmodem-7.43.00.01-r1.ebuild b/net-dialup/hsfmodem/hsfmodem-7.43.00.01-r2.ebuild similarity index 88% rename from net-dialup/hsfmodem/hsfmodem-7.43.00.01-r1.ebuild rename to net-dialup/hsfmodem/hsfmodem-7.43.00.01-r2.ebuild index 6e4a629d1cc5..cc4d144f2c14 100644 --- a/net-dialup/hsfmodem/hsfmodem-7.43.00.01-r1.ebuild +++ b/net-dialup/hsfmodem/hsfmodem-7.43.00.01-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/hsfmodem/hsfmodem-7.43.00.01-r1.ebuild,v 1.1 2006/03/10 12:28:22 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.43.00.01-r2.ebuild,v 1.1 2006/03/15 00:20:31 mrness Exp $ -inherit eutils +inherit eutils linux-info #The document is the same as in hcfpcimodem, even if it has a different URL MY_DOC="100498D_RM_HxF_Released.pdf" @@ -24,6 +24,7 @@ DEPEND="dev-lang/perl S="${WORKDIR}" pkg_setup() { + linux-info_pkg_setup if useq x86; then MY_ARCH_S="${S}/${P}full" elif useq amd64; then @@ -34,9 +35,11 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${MY_ARCH_S}" - epatch ${FILESDIR}/${P}-suspend2.patch - epatch ${FILESDIR}/${P}-try_to_freeze-2.patch epatch ${FILESDIR}/${P}-udev-group.patch + epatch ${FILESDIR}/${P}-try_to_freeze-2.patch + if [ "${KV_EXTRA}" = "-suspend2" ]; then + epatch ${FILESDIR}/${P}-suspend2.patch + fi } src_compile() { -- 2.26.2