Remove obsolete version. Cleanup ebuild's code.

Package-Manager: portage-2.0.54

diff --git a/net-dialup/intel-536ep/ChangeLog b/net-dialup/intel-536ep/ChangeLog
index 33fb6cab4cb90be95cf97c9fa20b6222c45d6b8c..b30d49eaa6db9da88e55e2e73fb8cd2f4f6944b7 100644 (file)
--- a/net-dialup/intel-536ep/ChangeLog
+++ b/net-dialup/intel-536ep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/intel-536ep
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/ChangeLog,v 1.6 2005/12/27 08:36:03 mrness Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/ChangeLog,v 1.7 2006/03/12 13:30:15 mrness Exp $
+
+  12 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  -files/intel-536ep-4.69-kernel-2.6.10-tty.patch,
+  -files/intel-536ep-4.69-kernel-2.6.11-pm.patch,
+  -intel-536ep-4.69-r1.ebuild, intel-536ep-4.71.ebuild:
+  Remove obsolete version. Cleanup ebuild's code.
 
   27 Dec 2005; Alin Nastac <mrness@gentoo.org> intel-536ep-4.71.ebuild:
   Stable on x86.

diff --git a/net-dialup/intel-536ep/Manifest b/net-dialup/intel-536ep/Manifest
index 75335bc6a650940a3cc2ed37f37c708eae4ebc8b..4d3d5a273ce01cf89b9db37bbdbadb5019e21a2a 100644 (file)
--- a/net-dialup/intel-536ep/Manifest
+++ b/net-dialup/intel-536ep/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5af1bc3e8528f183384eabb4274b95bd ChangeLog 1363
-MD5 ca1e9b07e5f36835a0332562ee1d3e64 files/digest-intel-536ep-4.69-r1 65
+MD5 90e8c709cf481b20bb0f82123db3d1cc ChangeLog 1618
 MD5 cc3df14471e1c046676fabe042ade24f files/digest-intel-536ep-4.71 65
-MD5 0c5635ce85601cb78cbf1a9671c23bb9 files/intel-536ep-4.69-kernel-2.6.10-tty.patch 1916
-MD5 1c2e92f30f7fe736154568f765250211 files/intel-536ep-4.69-kernel-2.6.11-pm.patch 772
 MD5 18ed5f89cb69ae749a0c4f41abb7b5b3 files/intel536ep.confd 111
 MD5 29c69d64bc64efc141963b2fc3af1e19 files/intel536ep.initd 920
-MD5 468650a3014a64d9b0b7fa9d9babb890 intel-536ep-4.69-r1.ebuild 1558
-MD5 e06a7e81cf3d0e0be0e723b55ffe4504 intel-536ep-4.71.ebuild 1082
+MD5 66ace74113357e348515793c92196b33 intel-536ep-4.71.ebuild 1050
 MD5 4a05a31c48e912c88a3677b9c597516c metadata.xml 227
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDsP0ANSP4Vda7IdsRAs+JAJ0Supiy5f+gjMvA1QJnTeDEX/P9rACfdNGB
-RNAdgfkvcESrhurgRaMgEHU=
-=0J+8
+iD8DBQFEFCJzjG8pv1lIUX4RAiitAKDtlIRQVFrzTCdPr+IJIkfYPFBehwCfX/4/
+qDCEDM23NPcF2Uq0UUmYwBU=
+=tWg8
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/intel-536ep/files/digest-intel-536ep-4.69-r1 b/net-dialup/intel-536ep/files/digest-intel-536ep-4.69-r1
deleted file mode 100644 (file)
index 6c5386a..0000000
--- a/net-dialup/intel-536ep/files/digest-intel-536ep-4.69-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20e690541d3b18bbc1b2c2f690bfbc6d intel-536ep-4.69.tgz 463347

diff --git a/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.10-tty.patch b/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.10-tty.patch
deleted file mode 100644 (file)
index 24cc4ea..0000000
--- a/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.10-tty.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- coredrv/softserial.h.orig  2005-03-23 01:55:22.000000000 +0100
-+++ coredrv/softserial.h       2005-03-23 01:55:49.000000000 +0100
-@@ -86,7 +86,7 @@
- int  softserial_open           (struct tty_struct*, struct file*);\r
- void softserial_put_char       (struct tty_struct*, unsigned char);\r
- void softserial_set_termios    (struct tty_struct*, struct termios*);\r
--int  softserial_write          (struct tty_struct*, int, const unsigned char*, int);\r
-+int  softserial_write          (struct tty_struct*, const unsigned char*, int);\r
- int  softserial_ioctl          (struct tty_struct*, struct file*, unsigned int, unsigned long);\r
- \r
- \r
---- coredrv/softserial_io.c.orig       2005-03-23 01:56:46.000000000 +0100
-+++ coredrv/softserial_io.c    2005-03-23 01:58:59.000000000 +0100
-@@ -55,7 +55,7 @@
- //=============================================================================\r
- static DECLARE_MUTEX(softserial_write_sem);\r
- int softserial_write(struct tty_struct* ptty,\r
--                      int from_user_space,\r
-+                      //int from_user_space,\r
-                       const unsigned char* input_buffer,\r
-                       int write_count_asked)  //why is it a signed int?\r
- {\r
-@@ -73,7 +73,7 @@
-    //printk("softserial:softserial_write()\n");\r
-    //printk("write: fus%d, count%d\n",from_user_space, write_count_asked);\r
-    \r
--   if(from_user_space)\r
-+   /*if(from_user_space)\r
-    {\r
-       down(&softserial_write_sem); //this may not be enough\r
-       while(write_count_asked - written_count > 0)\r
-@@ -107,7 +107,7 @@
-       up(&softserial_write_sem);\r
-    }\r
-    else           //data is from kernel space\r
--   {\r
-+   {*/\r
-       while(write_count_asked - written_count > 0)\r
-       {\r
-          softcore_space = G.softcore.write_free();\r
-@@ -127,7 +127,7 @@
-          input_buffer_ptr += copy_size;\r
-          written_count += copy_size;\r
-       }\r
--   }\r
-+   /*}*/\r
- \r
-    return(written_count);\r
- }\r

diff --git a/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.11-pm.patch b/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.11-pm.patch
deleted file mode 100644 (file)
index 45007ac..0000000
--- a/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.11-pm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur intel-536EP-2.56.76.0.orig/coredrv/coredrv.c intel-536EP-2.56.76.0/coredrv/coredrv.c
---- intel-536EP-2.56.76.0.orig/coredrv/coredrv.c       2004-07-09 17:34:29.000000000 +0300
-+++ intel-536EP-2.56.76.0/coredrv/coredrv.c    2005-03-15 18:58:22.804796760 +0200
-@@ -292,9 +292,6 @@
-         case PM_RESUME:\r
-                       open();\r
-             break;\r
--        case PM_SAVE_STATE:\r
--            printk(KERN_WARNING"Saving power state is not implemented\n");\r
--            break;\r
-         default:\r
-             printk(KERN_WARNING"Unknown power mode request to 537 modem driver\n");\r
-     }\r
-@@ -859,9 +856,6 @@
- \r
- asmlinkage void kScheduleDPC(void)\r
- {\r
--#ifdef CONFIG_PM\r
--    pm_access(power_dev);\r
--#endif\r
-    #if defined(TARGET_CATAWBA)\r
-       dpc_function( 0 );\r
-    #else\r

diff --git a/net-dialup/intel-536ep/intel-536ep-4.69-r1.ebuild b/net-dialup/intel-536ep/intel-536ep-4.69-r1.ebuild
deleted file mode 100644 (file)
index c6eeb7c..0000000
--- a/net-dialup/intel-536ep/intel-536ep-4.69-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/intel-536ep-4.69-r1.ebuild,v 1.2 2005/09/19 21:19:38 mrness Exp $
-
-inherit eutils flag-o-matic linux-mod
-
-DESCRIPTION="Driver for Intel 536EP modem"
-HOMEPAGE="http://developer.intel.com/design/modems/products/536ep.htm"
-SRC_URI="ftp://aiedownload.intel.com/df-support/6497/eng/${P}.tgz"
-
-LICENSE="Intel"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-S=${WORKDIR}/intel-536EP-2.56.76.0
-MODULE_NAMES="Intel536(:${S}/coredrv)"
-
-pkg_setup() {
-       if kernel_is 2 4; then
-               BUILD_TARGETS="536core"
-               BUILD_PARAMS="KERNEL_SOURCE_PATH=${KV_DIR} TARGET=TARGET_SELAH"
-       else
-               BUILD_TARGETS="536core_26"
-               BUILD_PARAMS="KERNEL_SOURCE_PATH=${KV_DIR}"
-       fi
-
-       linux-mod_pkg_setup
-}
-
-src_unpack(){
-       unpack ${A}
-
-       cd ${S}
-       if kernel_is 2 4; then
-               #there is no way of passing this as make parameter
-               sed -i -e 's/\$(PSTN_DEF)/-DTARGET_SELAH -DTARGET_LINUX -DLINUX/' coredrv/Makefile
-       elif kernel_is ge 2 6 10; then
-               #see bug #86331
-               epatch ${FILESDIR}/${P}-kernel-2.6.10-tty.patch
-
-               if kernel_is ge 2 6 11; then
-                       #addapt to power management changes occured in kernel
-                       epatch ${FILESDIR}/${P}-kernel-2.6.11-pm.patch
-               fi
-       fi
-}
-
-src_install() {
-       linux-mod_src_install
-
-       #install hamregistry executable
-       exeinto /usr/sbin
-       doexe ${S}/hamregistry
-
-       #install boot script and config
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/intel536ep.initd intel536ep
-       insinto /etc/conf.d
-       newins ${FILESDIR}/intel536ep.confd intel536ep
-}

diff --git a/net-dialup/intel-536ep/intel-536ep-4.71.ebuild b/net-dialup/intel-536ep/intel-536ep-4.71.ebuild
index 21f8a686e783c3cee733e4f78b4cfb0324ac927b..0d300ab5444dc4479397a137d3aa978126500cb3 100644 (file)
--- a/net-dialup/intel-536ep/intel-536ep-4.71.ebuild
+++ b/net-dialup/intel-536ep/intel-536ep-4.71.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/intel-536ep/intel-536ep-4.71.ebuild,v 1.2 2005/12/27 08:36:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/intel-536ep-4.71.ebuild,v 1.3 2006/03/12 13:30:15 mrness Exp $
 
 inherit linux-mod
 
@@ -12,18 +12,17 @@ LICENSE="Intel"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-DEPEND=""
 
-S=${WORKDIR}/Intel-536
+S="${WORKDIR}/Intel-536"
 MODULE_NAMES="Intel536(:${S}/coredrv)"
 
 pkg_setup() {
        if kernel_is 2 4; then
                BUILD_TARGETS="536core"
-               BUILD_PARAMS="KERNEL_SOURCE_PATH=${KV_DIR} TARGET=TARGET_SELAH"
+               BUILD_PARAMS="KERNEL_SOURCE_PATH='${KV_DIR}' TARGET=TARGET_SELAH"
        else
                BUILD_TARGETS="536core_26"
-               BUILD_PARAMS="KERNEL_SOURCE_PATH=${KV_DIR}"
+               BUILD_PARAMS="KERNEL_SOURCE_PATH='${KV_DIR}'"
        fi
 
        linux-mod_pkg_setup
@@ -34,11 +33,9 @@ src_install() {
 
        #install hamregistry executable
        exeinto /usr/sbin
-       doexe ${S}/hamregistry
+       doexe "${S}/hamregistry"
 
-       #install boot script and config
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/intel536ep.initd intel536ep
-       insinto /etc/conf.d
-       newins ${FILESDIR}/intel536ep.confd intel536ep
+       #install boot script and its config
+       newinitd "${FILESDIR}/intel536ep.initd" intel536ep
+       newconfd "${FILESDIR}/intel536ep.confd" intel536ep
 }