Remove old version. Version bump.

(Portage version: 2.0.54)

7 files changed, 18 insertions, 189 deletions

diff --git a/net-dialup/hcfusbmodem/ChangeLog b/net-dialup/hcfusbmodem/ChangeLog
index 856299e5c917..8d0f6ae7685e 100644
--- a/net-dialup/hcfusbmodem/ChangeLog
+++ b/net-dialup/hcfusbmodem/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/hcfusbmodem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.16 2006/01/22 20:33:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.17 2006/02/21 23:19:21 mrness Exp $
+
+*hcfusbmodem-1.10 (21 Feb 2006)
+
+  21 Feb 2006; Alin Nastac <mrness@gentoo.org>
+  -files/hcfusbmodem-1.06-USB_byteorder.patch,
+  -files/hcfusbmodem-1.06-simple_class.patch, -hcfusbmodem-1.06-r1.ebuild,
+  +hcfusbmodem-1.10.ebuild:
+  Remove old version. Version bump.
 
 *hcfusbmodem-1.07 (22 Jan 2006)
 
diff --git a/net-dialup/hcfusbmodem/Manifest b/net-dialup/hcfusbmodem/Manifest
index 0ce9b979266d..bf2bab3b74c2 100644
--- a/net-dialup/hcfusbmodem/Manifest
+++ b/net-dialup/hcfusbmodem/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 801039bb9e876b63b07a9b1a98fb91a7 ChangeLog 2348
-MD5 2ea75e584ddedfbb0c19b75beadad4d7 files/digest-hcfusbmodem-1.06-r1 79
 MD5 2a403db75a54fc1d6a5919dd04eceb67 files/digest-hcfusbmodem-1.07 79
-MD5 c1d8ec1dd9eeb532a9fcda19dc2f4191 files/hcfusbmodem-1.06-USB_byteorder.patch 1983
-MD5 3e9febdb259b7acf520e55bdba23ee3f files/hcfusbmodem-1.06-simple_class.patch 5208
+MD5 44b816e7b9c1bfb6a4c4e46f7a19ef31 files/digest-hcfusbmodem-1.10 79
 MD5 85acf4a37786a8a5ccba994c209a1f23 files/hcfusbmodem-1.07-upstream-20060122.patch 2665
-MD5 c09ae1bd5eee588acb316f2e99ffc5d9 hcfusbmodem-1.06-r1.ebuild 989
 MD5 ceb91ce191d6ca4be217a748cdfb852e hcfusbmodem-1.07.ebuild 871
+MD5 f22777c37798501af39f364052d1b3a8 hcfusbmodem-1.10.ebuild 794
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0+wcjG8pv1lIUX4RAjvvAKDpwVWuuqSWdlqJrwOdhFKS2uZOKQCghJCw
-E0uCDa/l1CkAmti9lTF0cww=
-=6ZxG
------END PGP SIGNATURE-----
diff --git a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.06-r1 b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.06-r1
deleted file mode 100644
index 645a5609ddd6..000000000000
--- a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.06-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 77a03fe1ca3f137ed403bb3d9f7ba212 hcfusbmodem-1.06powerpcfull.tar.gz 600498
diff --git a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.10 b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.10
new file mode 100644
index 000000000000..aa6ccf6b3d0e
--- /dev/null
+++ b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.10
@@ -0,0 +1 @@
+MD5 dd835f491dc428211498dbf123c1274b hcfusbmodem-1.10powerpcfull.tar.gz 610430
diff --git a/net-dialup/hcfusbmodem/files/hcfusbmodem-1.06-USB_byteorder.patch b/net-dialup/hcfusbmodem/files/hcfusbmodem-1.06-USB_byteorder.patch
deleted file mode 100644
index d5e1587e2441..000000000000
--- a/net-dialup/hcfusbmodem/files/hcfusbmodem-1.06-USB_byteorder.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN hcfusbmodem-1.06powerpcfull/modules/GPL/oscompat.h hcfusbmodem-1.06powerpcfull-USB_byteorder/modules/GPL/oscompat.h
---- hcfusbmodem-1.06powerpcfull/modules/GPL/oscompat.h	2005-06-20 15:18:46.000000000 -0400
-+++ hcfusbmodem-1.06powerpcfull-USB_byteorder/modules/GPL/oscompat.h	2005-08-16 13:09:36.000000000 -0400
-@@ -89,6 +89,7 @@
- #include <linux/kernel.h>
- #include <linux/string.h>
- #include <linux/kdev_t.h>
-+#include <linux/byteorder/swab.h>
- 
- #if LINUX_VERSION_CODE == KERNEL_VERSION(2,4,9)
- /* get rid of non-standard min/max macros */
-@@ -543,4 +544,10 @@
- #define PCI_SLOT_NAME(x)  (x)->dev.bus_id
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
-+#define USB_BYTEORDER16(x) (__cpu_to_le16(x))
-+#else
-+#define USB_BYTEORDER16(x) (x)
-+#endif
-+
- #endif /* __OSCOMPAT_H */
-diff -urN hcfusbmodem-1.06powerpcfull/modules/cnxthwusb_common.c hcfusbmodem-1.06powerpcfull-USB_byteorder/modules/cnxthwusb_common.c
---- hcfusbmodem-1.06powerpcfull/modules/cnxthwusb_common.c	2004-12-14 02:50:07.000000000 -0500
-+++ hcfusbmodem-1.06powerpcfull-USB_byteorder/modules/cnxthwusb_common.c	2005-08-16 11:59:22.000000000 -0400
-@@ -79,10 +79,10 @@
- 
-     dbg("%s: pUsbDevice=%p ifnum=%d id=%p bConfigurationValue=%d", __FUNCTION__, pUsbDevice, ifnum, id, pUsbDevice->config[0].bConfigurationValue);
- 
--    if (((pUsbDevice->descriptor.idVendor != USB_AAPL_VENDOR_ID) &&
--		(pUsbDevice->descriptor.idVendor != USB_CNXT_VENDOR_ID)) ||
--	    ((pUsbDevice->descriptor.idProduct != USB_AAPL_PRODUCT_ID) &&
--	     (pUsbDevice->descriptor.idProduct != USB_CNXT_PRODUCT_ID))) {
-+    if (((pUsbDevice->descriptor.idVendor != USB_BYTEORDER16(USB_AAPL_VENDOR_ID)) &&
-+		(pUsbDevice->descriptor.idVendor != USB_BYTEORDER16(USB_CNXT_VENDOR_ID))) ||
-+	    ((pUsbDevice->descriptor.idProduct != USB_BYTEORDER16(USB_AAPL_PRODUCT_ID)) &&
-+	     (pUsbDevice->descriptor.idProduct != USB_BYTEORDER16(USB_CNXT_PRODUCT_ID)))) {
- 	err("Not the one we are interested about");
- 	goto exit;
-     }
diff --git a/net-dialup/hcfusbmodem/files/hcfusbmodem-1.06-simple_class.patch b/net-dialup/hcfusbmodem/files/hcfusbmodem-1.06-simple_class.patch
deleted file mode 100644
index 490b0ad26271..000000000000
--- a/net-dialup/hcfusbmodem/files/hcfusbmodem-1.06-simple_class.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -urN hcfusbmodem-1.06powerpcfull/modules/GPL/oscompat.h hcfusbmodem-1.06powerpcfull-simple_class/modules/GPL/oscompat.h
---- hcfusbmodem-1.06powerpcfull/modules/GPL/oscompat.h	2005-06-20 15:18:46.000000000 -0400
-+++ hcfusbmodem-1.06powerpcfull-simple_class/modules/GPL/oscompat.h	2005-09-07 18:26:39.000000000 -0400
-@@ -543,4 +543,16 @@
- #define PCI_SLOT_NAME(x)  (x)->dev.bus_id
- #endif
- 
-+#ifdef FOUND_CLASS_SIMPLE
-+#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_simple_device_add(class, dev, device, fmt, rest)
-+#define CLASS_DESTROY(class) class_simple_destroy(class)
-+#define CLASS_DEVICE_DESTROY(class, dev) class_simple_device_remove(dev)
-+#define CLASS_CREATE(owner, name) class_simple_create(owner, name)
-+#else
-+#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, dev, device, fmt, rest)
-+#define CLASS_DESTROY(class) class_destroy(class)
-+#define CLASS_DEVICE_DESTROY(class, dev) class_device_destroy(class, dev)
-+#define CLASS_CREATE(owner, name) class_create(owner, name)
-+#endif
-+
- #endif /* __OSCOMPAT_H */
-diff -urN hcfusbmodem-1.06powerpcfull/modules/Makefile hcfusbmodem-1.06powerpcfull-simple_class/modules/Makefile
---- hcfusbmodem-1.06powerpcfull/modules/Makefile	2005-06-20 15:25:00.000000000 -0400
-+++ hcfusbmodem-1.06powerpcfull-simple_class/modules/Makefile	2005-09-07 18:26:39.000000000 -0400
-@@ -48,6 +48,16 @@
- KMODS_DIR := /lib/modules/$(KERNELVER)
- CNXT_MODS_DIR := $(KMODS_DIR)/extra
- 
-+# On SuSE 9.0 and up, CNXT_KERNELSRC points to an incomplete kernel source
-+# directory and some include files are not available in this tree
-+SUSE_OBJ_TREE := $(shell if grep -q '^KERNELSRC ' "${CNXT_KERNELSRC}/Makefile" && [ -d "${CNXT_KERNELSRC}" ]; then echo "yes"; else echo "no"; fi)
-+
-+ifeq ($(SUSE_OBJ_TREE),yes)
-+REAL_KERNELSRC := $(shell grep '^KERNELSRC ' "${CNXT_KERNELSRC}/Makefile" | awk '{print $3}')
-+else
-+REAL_KERNELSRC := $(CNXT_KERNELSRC)
-+endif
-+
- FOUND_PCI_DEV_SLOT_NAME := $(shell grep -q 'slot_name' ${CNXT_KERNELSRC}/include/linux/pci.h 2> /dev/null && echo -DFOUND_PCI_DEV_SLOT_NAME)
- CFLAGS+= $(FOUND_PCI_DEV_SLOT_NAME)
- 
-@@ -57,6 +67,9 @@
- KO= ko
- KBUILD_EXTMOD_SUPPORTED := $(shell egrep -q 'KBUILD_EXTMOD|KERNEL_SOURCE|KERNELSRC' ${CNXT_KERNELSRC}/Makefile 2>/dev/null && echo yes || echo no)
- 
-+FOUND_CLASS_SIMPLE := $(shell grep -q 'class_simple_device_add' ${REAL_KERNELSRC}/include/linux/device.h 2> /dev/null && echo -DFOUND_CLASS_SIMPLE)
-+CFLAGS+= $(FOUND_CLASS_SIMPLE)
-+
- else
- KO= o
- # Configure compiler (on some systems, kgcc must be used to compile kernel code)
-diff -urN hcfusbmodem-1.06powerpcfull/modules/osdiag.c hcfusbmodem-1.06powerpcfull-simple_class/modules/osdiag.c
---- hcfusbmodem-1.06powerpcfull/modules/osdiag.c	2004-12-14 02:50:07.000000000 -0500
-+++ hcfusbmodem-1.06powerpcfull-simple_class/modules/osdiag.c	2005-09-07 18:26:44.000000000 -0400
-@@ -30,7 +30,11 @@
- static struct list_head diag_instance_list = LIST_HEAD_INIT(diag_instance_list);
- static spinlock_t diag_lock = SPIN_LOCK_UNLOCKED;
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
-+#ifdef FOUND_CLASS_SIMPLE
- static struct class_simple *diag_class;
-+#else
-+static struct class *diag_class;
-+#endif
- #endif
- 
- #define common_instance_header \
-@@ -659,7 +663,7 @@
- #else
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
- 	if (!IS_ERR(diag_class)) {
--	    class_simple_device_add(diag_class, MKDEV(diagmajor, pDiag->hwInstNum), hwDevLink, CNXTTARGET"diag%d", pDiag->hwInstNum);
-+	    CLASS_DEVICE_CREATE(diag_class, MKDEV(diagmajor, pDiag->hwInstNum), hwDevLink, CNXTTARGET"diag%d", pDiag->hwInstNum);
- 	}
- #endif
- 
-@@ -764,7 +768,7 @@
-     }
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
-     if (!IS_ERR(diag_class))
--	class_simple_device_remove(MKDEV(diagmajor, pDiag->hwInstNum));
-+	CLASS_DEVICE_DESTROY(diag_class, MKDEV(diagmajor, pDiag->hwInstNum));
- #endif
- #endif
- 
-@@ -834,14 +838,14 @@
-     devfs_remove(CNXTTARGET"diagdmp");
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
-     if (!IS_ERR(diag_class))
--	class_simple_device_remove(MKDEV(diagmajor, CNXTDIAGDMPMINOR));
-+	CLASS_DEVICE_DESTROY(diag_class, MKDEV(diagmajor, CNXTDIAGDMPMINOR));
- #endif
- #endif
- #endif /* DMP || DMP_RETAIL */
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
-     if (!IS_ERR(diag_class))
--	class_simple_destroy(diag_class);
-+	CLASS_DESTROY(diag_class);
- #endif
-     if(diagmajor > 0)
- 	unregister_chrdev(diagmajor, CNXTTARGET"diag");
-@@ -865,7 +869,7 @@
-     }
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
--    diag_class = class_simple_create(THIS_MODULE, CNXTTARGET"diag");
-+    diag_class = CLASS_CREATE(THIS_MODULE, CNXTTARGET"diag");
-     if (IS_ERR(diag_class)) {
- 	printk(KERN_ERR "%s: cannot create simple class (%ld)\n", __FUNCTION__, PTR_ERR(diag_class));
- 	if(diagmajor > 0)
-@@ -884,7 +888,7 @@
- #else
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
-     if (!IS_ERR(diag_class)) {
--	class_simple_device_add(diag_class, MKDEV(diagmajor, CNXTDIAGDMPMINOR), NULL, CNXTTARGET"diagdmp");
-+	CLASS_DEVICE_CREATE(diag_class, MKDEV(diagmajor, CNXTDIAGDMPMINOR), NULL, CNXTTARGET"diagdmp");
-     }
- #endif
-     devfs_mk_cdev(MKDEV(diagmajor, CNXTDIAGDMPMINOR), S_IFCHR | S_IRUSR | S_IWUSR, CNXTTARGET"diagdmp");
diff --git a/net-dialup/hcfusbmodem/hcfusbmodem-1.06-r1.ebuild b/net-dialup/hcfusbmodem/hcfusbmodem-1.10.ebuild
index babc708695ea..11035f0f5d04 100644
--- a/net-dialup/hcfusbmodem/hcfusbmodem-1.06-r1.ebuild
+++ b/net-dialup/hcfusbmodem/hcfusbmodem-1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/hcfusbmodem-1.06-r1.ebuild,v 1.1 2005/09/17 09:20:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/hcfusbmodem-1.10.ebuild,v 1.1 2006/02/21 23:19:21 mrness Exp $
 
 inherit linux-info eutils
 
@@ -12,27 +12,18 @@ IUSE=""
 SLOT="0"
 LICENSE="Conexant"
 KEYWORDS="~ppc"
-DEPEND="virtual/libc"
 
-S="${WORKDIR}/${P}powerpcfull"
-
-src_unpack() {
-	unpack ${A}
+DEPEND="dev-lang/perl
+	app-arch/cpio"
 
-	if kernel_is ge 2 6 11 ; then
-		epatch ${FILESDIR}/${P}-USB_byteorder.patch
-		if kernel_is ge 2 6 13 ; then
-			epatch ${FILESDIR}/${P}-simple_class.patch
-		fi
-	fi
-}
+S="${WORKDIR}/${P}powerpcfull"
 
 src_compile() {
 	emake all || die
 }
 
 src_install () {
-	make PREFIX=${D}/usr/ ROOT=${D} install || die
+	make PREFIX="${D}/usr/" ROOT="${D}" install || die
 }
 
 pkg_postinst() {