Version bump.

(Portage version: 2.1.4.4)

5 files changed, 40 insertions, 32 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index 837ff030c36a..8945f17ebb2f 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.46 2008/05/23 21:00:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.47 2008/07/30 20:50:48 mrness Exp $
+
+*hsfmodem-7.68.00.12 (30 Jul 2008)
+
+  30 Jul 2008; Alin Năstac <mrness@gentoo.org>
+  -files/hsfmodem-7.68.00.04-sandbox-violation.patch,
+  -files/hsfmodem-7.68.00.04-udev-group.patch,
+  +files/hsfmodem-7.68.00.12-gentoo.patch, -hsfmodem-7.68.00.04-r1.ebuild,
+  +hsfmodem-7.68.00.12.ebuild:
+  Version bump.
 
   23 May 2008; Markus Meier <maekke@gentoo.org> hsfmodem-7.68.00.09.ebuild:
   amd64/x86 stable, bug #208569
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.04-sandbox-violation.patch b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.04-sandbox-violation.patch
deleted file mode 100644
index ef7addcf071c..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.04-sandbox-violation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru hsfmodem-7.68.00.04x86_64full.orig/modules/Makefile hsfmodem-7.68.00.04x86_64full/modules/Makefile
---- hsfmodem-7.68.00.04x86_64full.orig/modules/Makefile	2007-10-19 20:25:54.000000000 +0300
-+++ hsfmodem-7.68.00.04x86_64full/modules/Makefile	2007-11-09 06:47:56.000000000 +0200
-@@ -137,7 +137,7 @@
- ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
- # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
- # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
--CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
-+# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
- endif
- 
- else
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.04-udev-group.patch b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.04-udev-group.patch
deleted file mode 100644
index 5e0a9f0f2530..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.04-udev-group.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru hsfmodem-7.68.00.04x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.68.00.04x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.68.00.04x86_64full.orig/scripts/cnxtconfig.in	2007-10-19 22:14:36.000000000 +0300
-+++ hsfmodem-7.68.00.04x86_64full/scripts/cnxtconfig.in	2007-11-06 01:04:01.000000000 +0200
-@@ -1945,9 +1945,9 @@
- 	if [ -d /etc/udev/rules.d ]; then
- 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		if [ "@CNXTDRIVER@" = "dgc" ]; then
--			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		else
--		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 	fi
- 	fi
- 
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.12-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.12-gentoo.patch
new file mode 100644
index 000000000000..340e18bfa0b0
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.12-gentoo.patch
@@ -0,0 +1,27 @@
+diff -ur hsfmodem-7.68.00.12x86_64full.orig/modules/Makefile hsfmodem-7.68.00.12x86_64full/modules/Makefile
+--- hsfmodem-7.68.00.12x86_64full.orig/modules/Makefile	2008-07-16 15:24:00.000000000 +0000
++++ hsfmodem-7.68.00.12x86_64full/modules/Makefile	2008-07-30 20:48:03.000000000 +0000
+@@ -145,7 +145,7 @@
+ ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
+ # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
+ # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
+-CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
++# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
+ endif
+ 
+ else
+diff -ur hsfmodem-7.68.00.12x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.68.00.12x86_64full/scripts/cnxtconfig.in
+--- hsfmodem-7.68.00.12x86_64full.orig/scripts/cnxtconfig.in	2008-03-27 19:43:38.000000000 +0000
++++ hsfmodem-7.68.00.12x86_64full/scripts/cnxtconfig.in	2008-07-30 20:48:03.000000000 +0000
+@@ -1973,9 +1973,9 @@
+ 	if [ -d /etc/udev/rules.d ]; then
+ 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
+ 		if [ "@CNXTDRIVER@" = "dgc" ]; then
+-			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
++			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
+ 		else
+-		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
++		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
+ 	fi
+ 	fi
+ 
diff --git a/net-dialup/hsfmodem/hsfmodem-7.68.00.04-r1.ebuild b/net-dialup/hsfmodem/hsfmodem-7.68.00.12.ebuild
index 2b9b15288aea..d8170e4a24db 100644
--- a/net-dialup/hsfmodem/hsfmodem-7.68.00.04-r1.ebuild
+++ b/net-dialup/hsfmodem/hsfmodem-7.68.00.12.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/hsfmodem/hsfmodem-7.68.00.04-r1.ebuild,v 1.2 2008/03/24 13:46:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.68.00.12.ebuild,v 1.1 2008/07/30 20:50:48 mrness Exp $
 
 inherit eutils linux-info
 
@@ -14,7 +14,7 @@ SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}fu
 	doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )"
 
 LICENSE="Conexant"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="doc"
 SLOT="0"
 
@@ -41,8 +41,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${MY_ARCH_S}"
-	epatch "${FILESDIR}/${P}-udev-group.patch"
-	epatch "${FILESDIR}/${P}-sandbox-violation.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_compile() {