Fixed installation. Removed some deprecated devfs file installations which aren't there anymore. Also, removed check_KV which is deprecated. And added installation of em8300-devices.sh for cases in which udev fails.

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 30 insertions, 27 deletions

diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index 23d8e43b46a0..998b7f2dd564 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/em8300-modules
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.29 2006/11/21 12:21:18 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.30 2006/11/23 17:30:26 zzam Exp $
+
+  23 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  em8300-modules-0.16.0_rc2.ebuild:
+  Fixed installation. Removed some deprecated devfs file installations which
+  aren't there anymore. Also, removed check_KV which is deprecated. And added
+  installation of em8300-devices.sh for cases in which udev fails.
 
   21 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Took over proxying maintainership from Flameeyes.
diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest
index d0a745bfb91c..af67db73daca 100644
--- a/media-video/em8300-modules/Manifest
+++ b/media-video/em8300-modules/Manifest
@@ -29,14 +29,14 @@ EBUILD em8300-modules-0.15.3.ebuild 2328 RMD160 37450b293d89ce21fa165fa0323cf055
 MD5 1c947d80d331dc34245776b1c3b1400c em8300-modules-0.15.3.ebuild 2328
 RMD160 37450b293d89ce21fa165fa0323cf0556260ba45 em8300-modules-0.15.3.ebuild 2328
 SHA256 e99134cfa3994611e12f25321d8d8fd1da3b4c64c3f4ed20dc8692acecede48e em8300-modules-0.15.3.ebuild 2328
-EBUILD em8300-modules-0.16.0_rc2.ebuild 2280 RMD160 cab445b41eb43705b147f34180c69b2bbb1c2cde SHA1 5e8cbccb52e8fcf4d4fd54bcf9035f6264bd082b SHA256 af0560b4bb80b57566ffced4468f3fa9c15ee8a7b451c2bfdd8bbb2a5e548b84
-MD5 63d34d1e06eb01eb30c618cb54050052 em8300-modules-0.16.0_rc2.ebuild 2280
-RMD160 cab445b41eb43705b147f34180c69b2bbb1c2cde em8300-modules-0.16.0_rc2.ebuild 2280
-SHA256 af0560b4bb80b57566ffced4468f3fa9c15ee8a7b451c2bfdd8bbb2a5e548b84 em8300-modules-0.16.0_rc2.ebuild 2280
-MISC ChangeLog 5238 RMD160 7192553e7a73ce7fa77088f3d62aacb0621c6a70 SHA1 e1642f36da8ac80358e492b8a9c29be722a0dd0b SHA256 7072a9a4816ec45a17c162b2305983707e527cec88e4230ebc480573f3c58587
-MD5 f8145b8f6e8c4a9d880dd3a5355d64ad ChangeLog 5238
-RMD160 7192553e7a73ce7fa77088f3d62aacb0621c6a70 ChangeLog 5238
-SHA256 7072a9a4816ec45a17c162b2305983707e527cec88e4230ebc480573f3c58587 ChangeLog 5238
+EBUILD em8300-modules-0.16.0_rc2.ebuild 1977 RMD160 5b5254dff0792004fb4bd0c17b8e07d25a419213 SHA1 22d63aad1832825549af2c5bf161c6af9547e732 SHA256 956c40b65ded521263a11403c09d7322b859a4313fa9dcc7822ff3af1e05de85
+MD5 7483ae9a061ceedf41e342c94ae92b5e em8300-modules-0.16.0_rc2.ebuild 1977
+RMD160 5b5254dff0792004fb4bd0c17b8e07d25a419213 em8300-modules-0.16.0_rc2.ebuild 1977
+SHA256 956c40b65ded521263a11403c09d7322b859a4313fa9dcc7822ff3af1e05de85 em8300-modules-0.16.0_rc2.ebuild 1977
+MISC ChangeLog 5550 RMD160 fd8745e8fe4192a11419c6793f917ecf1f9dd547 SHA1 57548ff73cd0cb3daa69eb5aca7ff301d8ee35e3 SHA256 b752302b642215474c170663e2947af568a6600b1615dd8a7ed45fde0184842a
+MD5 9f95e42b758b090dc1fbe33bd5ab4137 ChangeLog 5550
+RMD160 fd8745e8fe4192a11419c6793f917ecf1f9dd547 ChangeLog 5550
+SHA256 b752302b642215474c170663e2947af568a6600b1615dd8a7ed45fde0184842a ChangeLog 5550
 MISC metadata.xml 452 RMD160 c2512806b03a630259a60ac28a7391e8d6ae3286 SHA1 8a9168a8da35df17569522ac83836697663c75c9 SHA256 29195b0377bf3106dc41f0166f2cfcd65a4dec025093f11a518484ab27909f7e
 MD5 48d3d85699da9980ac3672ef0b14252f metadata.xml 452
 RMD160 c2512806b03a630259a60ac28a7391e8d6ae3286 metadata.xml 452
@@ -59,7 +59,7 @@ SHA256 a06d173952702b4a842f5514d29381e79a34c6d1474c02489eae805ec0930906 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYu9Et2vP6XvVdOcRAq9sAKCAgOu5P/fGknwXvKKl0BSq46DA0gCeP0Qp
-t41XKE6B3t0byaDDA9sMKRI=
-=YsS7
+iD8DBQFFZdq9t2vP6XvVdOcRAqPqAKDHpjAdW52mfRK4d+zEciMVkWaI6QCeI6Gw
+O/Dhbge5GnVk/uej8U/QKSc=
+=518E
 -----END PGP SIGNATURE-----
diff --git a/media-video/em8300-modules/em8300-modules-0.16.0_rc2.ebuild b/media-video/em8300-modules/em8300-modules-0.16.0_rc2.ebuild
index 0e9505c17ac2..14641331876e 100644
--- a/media-video/em8300-modules/em8300-modules-0.16.0_rc2.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.16.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.16.0_rc2.ebuild,v 1.1 2006/11/17 16:30:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.16.0_rc2.ebuild,v 1.2 2006/11/23 17:30:26 zzam Exp $
 
 inherit eutils linux-info
 
@@ -32,21 +32,22 @@ src_compile ()  {
 
 src_install () {
 	insinto "/usr/include/linux"
-	doins ../include/linux/em8300.h
+	doins include/linux/em8300.h
 
-	check_KV
+	cd modules
 
-	# The driver goes into the standard modules location
-	insinto "/lib/modules/${KV}/kernel/drivers/video"
+	insinto "/lib/modules/${KV_FULL}/kernel/drivers/video"
 
-	if [ "${KV:0:3}" == "2.6" ]
-	then
-		doins em8300.ko bt865.ko adv717x.ko
+	if kernel_is 2 6; then
+		doins *.ko
 	else
-		doins em8300.o bt865.o adv717x.o
+		die "Unsupported kernel."
 	fi
 
-	dodoc README-modoptions README-modules.conf devfs_symlinks
+	dodoc README-modoptions README-modules.conf
+
+	insinto /usr/sbin
+	newins devices.sh em8300-devices.sh
 
 	insinto /etc/modules.d
 	newins ${FILESDIR}/modules.em8300 em8300
@@ -65,11 +66,7 @@ pkg_postinst () {
 	elog "directory of your currently running kernel.  They haven't been"
 	elog "loaded.  Please read the documentation, and if you would like"
 	elog "to have the modules load at startup, add em8300, bt865, adv717x"
-	elog "to your /etc/modules.autoload they may need module options to "
-	elog "work correctly on your system.  You will also need to add"
-	elog "the contents of /usr/share/doc/${P}/devfs_symlinks.gz"
-	elog "to your devfsd.conf so that the em8300 devices will be linked"
-	elog "correctly."
+	elog "to your /etc/modules.autoload.d."
 	elog
 	elog "You will also need to have the i2c kernel modules compiled for"
 	elog "this to be happy, no need to patch any kernel though just turn"