Version bump.

Package-Manager: portage-2.1.4.4

6 files changed, 48 insertions, 41 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/Manifest b/net-dialup/hsfmodem/Manifest
index ecb9f07e4158..1e82baeddebe 100644
--- a/net-dialup/hsfmodem/Manifest
+++ b/net-dialup/hsfmodem/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX hsfmodem-7.68.00.04-sandbox-violation.patch 740 RMD160 c09db08e714699a5626d5e13d77ba9defbf3c1ac SHA1 4b799da480effe0c4e6ddeb36c20011bb28a64f2 SHA256 3747cf420ba2fd347965fb6ce2cea7976b12c2e73ba26853fe0c29bd1a752cf6
-AUX hsfmodem-7.68.00.04-udev-group.patch 878 RMD160 704fd934424605f3a5f95c4ab52a983d92ec1b37 SHA1 75413e2b8a59c3baf7cd4416b0d958c371e13c5e SHA256 35051a736d8dbd4d2b5019fed410b527708caa9431013e509f890737aeebe5a1
 AUX hsfmodem-7.68.00.09-gentoo.patch 1570 RMD160 e9e60ded13fea2fefd057fc97c9b24fb9e7e0bb2 SHA1 73428460ec1afc359971bf120966141061f39413 SHA256 16507783f89fcbe625b370adb13f552aa26b939b5c3ef10c3d893cf3649f4bda
+AUX hsfmodem-7.68.00.12-gentoo.patch 1616 RMD160 d0987ce7ac863601348b24bf1536d55e2050189a SHA1 12bd462932db87f9cab88b13f538f20bc17d512b SHA256 216813bbad6f52f4f1017c8dab8220491038f34662ad3e4931b04e4b246e4cb6
 DIST 100498D_RM_HxF_Released.pdf 718949 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a SHA1 519c9b064e734873d67cf9c17d8eb1389a6f4eef SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
-DIST hsfmodem-7.68.00.04full.tar.gz 1463702 RMD160 4dc5377998495b817a1677f09160a7ef701f7f1f SHA1 d2a9f72566ce9fa84df80e7f562b543c5f1e3194 SHA256 7b9a985020e1d2fe039d26ad1de97c7bfa64a62b51b5de296f4fff8254a26292
-DIST hsfmodem-7.68.00.04x86_64full.tar.gz 1595024 RMD160 f9c39e6820fc71c79dc73e316a14c7295e4fe17d SHA1 8113f5e066b3d61ef9f555ef4d5154f8f30d2559 SHA256 86592028760b7a334659c6fdca86a02edac54c30f03307b5717dad4b062bd527
 DIST hsfmodem-7.68.00.09full.tar.gz 1468087 RMD160 5a1ddf2cc3f5949e279819d3f5710ed63f81f832 SHA1 323e4270e969f1ee2763313cc9f0bd29444fbb2b SHA256 380a600676bfcf81967b321e95e870b238aaa7b39310d2b9a4f0d8bc9ac5d92c
 DIST hsfmodem-7.68.00.09x86_64full.tar.gz 1595414 RMD160 0e4ced44d0f9327ae8f6c2b3c4af0759e859bda6 SHA1 a3d0cc78a9974c659dfb9245a17ec9fcfe0bc6fd SHA256 d235f2ef546ed928cd6c96411081d4d6dfbdaa72592fe1b25f7c7c33da92b239
-EBUILD hsfmodem-7.68.00.04-r1.ebuild 2147 RMD160 00f751e3bdb542e1b2191ea9371d98c19157dd49 SHA1 b9aca76a5a1cbfbd989ebe9ca5f48ad88c59d91d SHA256 83338cacb9154082060ae05780a99c8bd0d2252d15cbc1c5444cd457e16fb9c2
+DIST hsfmodem-7.68.00.12full.tar.gz 1468875 RMD160 fb6a1cfb60478b858f9f2393f54de0d43eef812c SHA1 69bfde1db7d2d52877c99346d9462afb753724e0 SHA256 e3af53751c6eeed971f492a1739181901425ea4139ce4b599f57b46cb903660d
+DIST hsfmodem-7.68.00.12x86_64full.tar.gz 1596301 RMD160 8ed28c09410188649db5babf0ca768ed4ab5f01d SHA1 8a2f0ad14381c8f17ab38e63226c8dc2d253f6b6 SHA256 b02ec83047c1b8cd15274c41d2db198a4a8f46b5b233fdc75203e2db7270ac10
 EBUILD hsfmodem-7.68.00.09.ebuild 2089 RMD160 1dd99a36db9f126a27e2367b4609bd4124b1c524 SHA1 595e4846dc6c5330d41d46aa555682dd422f39aa SHA256 f913355bf18f63e6ee8da4d3e3a709d18d90116d24afac907f18ab7a13b122fb
-MISC ChangeLog 11322 RMD160 b38d44092d8e891356f75a638e295c9c68ca8171 SHA1 54d60a78c918e8239864bb17bd809d2288f96231 SHA256 19b1e476a296f1a56fe13222c5b6179d35fe9dc40ffc360c97ce02a606bd5d06
+EBUILD hsfmodem-7.68.00.12.ebuild 2091 RMD160 2ed76d56c21ec5dc4b81d103095d7781bb25497b SHA1 6fe69a35ec2c80931640b47654154a2ec2392edb SHA256 2bd7062eebc9eeec3f7b8f5b32639167e2fb32949e622ff11e95e4938ec02571
+MISC ChangeLog 11630 RMD160 a7ad63c9a76bfd981d907822322cf9334edeb691 SHA1 214727fbb104fd8148f366bab3cc4053fe7456a2 SHA256 406589cff00e28ff855d07575ea5baac569f0ecdd9a89d9968e16c4c2c4ed82b
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg3MKgACgkQkKaRLQcq0GKr/ACgnl1+JBBxxHAnOD75aaWqKmTg
-NBAAoKsCC/xSL1KTfAZILeo7k0jHrTbY
-=Xla9
+iEYEARECAAYFAkiQ1DQACgkQPrHvTlXvhtsDhACfeHwev/9KTS0ED5C5GTlvVSTl
+Hz0An2FQsW/fULYr1l6EBxSfjXZJ7ZUZ
+=hp+7
 -----END PGP SIGNATURE-----
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() {