Make sure we are using the right KV throughout. This is _not_ elegantly done, and uses sed instead of a patch, feel free to fix it.

5 files changed, 107 insertions, 14 deletions

diff --git a/media-video/em8300-libraries/Manifest b/media-video/em8300-libraries/Manifest
index c749099fd5e2..3ff400d75f4b 100644
--- a/media-video/em8300-libraries/Manifest
+++ b/media-video/em8300-libraries/Manifest
@@ -1,8 +1,8 @@
-MD5 03a67498a85cb9b6938a27f8532da08a em8300-libraries-0.15.0_pre20040906.ebuild 2196
+MD5 075053a3e9a24d76f97c559ee409df9f em8300-libraries-0.15.0_pre20040906.ebuild 2209
 MD5 d0d0416fb578d3b1a107ac0f29d49a80 em8300-libraries-0.13.0.ebuild 1866
 MD5 91dee0a4a1e7a3e4d8bdf2f55cf7092f em8300-libraries-0.12.0-r1.ebuild 2032
 MD5 57131a38064b254b8326a4d2e1894be2 em8300-libraries-0.15.0_pre20040525.ebuild 2201
-MD5 4aac24050c7b856eeb4c28c5b1a2e4ad ChangeLog 2143
+MD5 bbb36b89a2e0e956919f19e1c11d82dc ChangeLog 2274
 MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
 MD5 9e1a5759d84f16edc7cc0d40abfb0780 em8300-libraries-0.14.0.ebuild 2131
 MD5 f44ec5185e2800bd9ed7c758693fefcf em8300-libraries-0.13.0-r1.ebuild 2138
diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index 749919deaf35..105bab37be42 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/em8300-modules
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.13 2004/10/04 03:43:25 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.14 2004/10/07 16:58:06 lostlogic Exp $
+
+*em8300-modules-0.15.0_pre20040906-r1 (07 Oct 2004)
+
+  07 Oct 2004; Brandon Low <lostlogic@gentoo.org>
+  +em8300-modules-0.15.0_pre20040906-r1.ebuild:
+  Make sure we are using the right KV throughout. This is _not_ elegantly
+  done, and uses sed instead of a patch, feel free to fix it.
 
   03 Oct 2004; <iggy@gentoo.org> em8300-modules-0.15.0_pre20040525.ebuild,
   em8300-modules-0.15.0_pre20040906.ebuild:
diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest
index 0f7a51582267..64e4702ee332 100644
--- a/media-video/em8300-modules/Manifest
+++ b/media-video/em8300-modules/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4ee920a8351c5d20d578bc7bf5b1a09c em8300-modules-0.15.0_pre20040906.ebuild 2187
 MD5 5828ff39d73ab92b6ec6262e6a1d8d58 em8300-modules-0.14.0.ebuild 1940
+MD5 bd53aaf820bcd42b874773f36ab04a04 em8300-modules-0.15.0_pre20040906-r1.ebuild 2380
 MD5 10f07db2bcca72c2d9fd2b13148f6894 em8300-modules-0.12.0.ebuild 2434
 MD5 e44873858edde7efdb9525a72bc2f48a em8300-modules-0.15.0_pre20040525.ebuild 2192
 MD5 9557b4f8c9c17637a04a126438963dad em8300-modules-0.13.0.ebuild 2433
-MD5 bc33f9a4fcabfc9f7cd9deb48a8622a1 ChangeLog 2201
+MD5 9d372a74061092444fe63df7d9b4c58a ChangeLog 2494
 MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
 MD5 bb9480fd315f95a144fae1a463983499 files/digest-em8300-modules-0.15.0_pre20040525 68
 MD5 0cd48035d3a64290c86b2d0d6a749a84 files/digest-em8300-modules-0.15.0_pre20040906 68
+MD5 0cd48035d3a64290c86b2d0d6a749a84 files/digest-em8300-modules-0.15.0_pre20040906-r1 68
 MD5 40448834cd5bc1bdc07ab84d8a3727cc files/modules.em8300 28
 MD5 8acb1fa133b6be82b4ec6a12350690c0 files/digest-em8300-modules-0.12.0 65
 MD5 29a6f23e30a4e4d57e5a0daf1d61f8c5 files/digest-em8300-modules-0.13.0 65
 MD5 c6636e3bede214480f9eb0d32d916dd1 files/digest-em8300-modules-0.14.0 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBYMuSMSkoRwEucGERArnmAJ9PA5cBrzuXcscs068GMgiZa72JPgCfSO6O
-BcLpngfzY/wbWqQ3ZE1lrQ4=
-=jwrA
------END PGP SIGNATURE-----
diff --git a/media-video/em8300-modules/em8300-modules-0.15.0_pre20040906-r1.ebuild b/media-video/em8300-modules/em8300-modules-0.15.0_pre20040906-r1.ebuild
new file mode 100644
index 000000000000..a7f7fb144c30
--- /dev/null
+++ b/media-video/em8300-modules/em8300-modules-0.15.0_pre20040906-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2004 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.15.0_pre20040906-r1.ebuild,v 1.1 2004/10/07 16:58:06 lostlogic Exp $
+
+inherit eutils
+
+DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules"
+HOMEPAGE="http://dxr3.sourceforge.net"
+PDATE="20040906"
+SRC_URI="mirror://gentoo/em8300-${PDATE}.tar.bz2
+	http://dev.gentoo.org/~arj/files/em8300-${PDATE}.tar.bz2"
+
+DEPEND="virtual/linux-sources"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+S="${WORKDIR}/em8300-${PDATE}/modules"
+
+src_unpack () {
+
+	unpack ${A}
+	cd ${S}
+}
+
+src_compile ()  {
+
+	check_KV
+	set_arch_to_kernel
+	cd ..
+	for file in autotools/config.guess configure em8300.sysv.in modules/ldm modules/Makefile modules/INSTALL; do
+		sed -i -e 's/uname[[:space:]]*-r/echo ${KV}/' $file
+	done
+	cd modules
+	make || die
+	set_arch_to_portage
+}
+
+src_install () {
+
+	insinto "/usr/include/linux"
+	doins ../include/linux/em8300.h
+
+	check_KV
+	
+
+	# The driver goes into the standard modules location
+	insinto "/lib/modules/${KV}/kernel/drivers/video"
+
+	if [ "${KV:0:3}" == "2.6" ]
+	then
+		doins em8300.ko bt865.ko adv717x.ko
+	else
+		doins em8300.o bt865.o adv717x.o
+	fi
+
+	# Docs
+	dodoc README-modoptions \
+	      README-modules.conf \
+	      devfs_symlinks
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/modules.em8300 em8300
+
+}
+
+pkg_postinst () {
+
+	if [ "${ROOT}" = "/" ]
+	then
+		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+	fi
+
+	einfo
+	einfo "The em8300 kernel modules have been installed into the modules"
+	einfo "directory of your currently running kernel.  They haven't been"
+	einfo "loaded.  Please read the documentation, and if you would like"
+	einfo "to have the modules load at startup, add em8300, bt865, adv717x"
+	einfo "to your /etc/modules.autoload they may need module options to "
+	einfo "work correctly on your system.  You will also need to add"
+	einfo "the contents of /usr/share/doc/${P}/devfs_symlinks.gz"
+	einfo "to your devfsd.conf so that the em8300 devices will be linked"
+	einfo "correctly."
+	einfo
+	einfo "You will also need to have the i2c kernel modules compiled for"
+	einfo "this to be happy, no need to patch any kernel though just turn"
+	einfo "all the i2c stuff in kernel config to M and you'll be fine."
+	einfo
+
+}
+
diff --git a/media-video/em8300-modules/files/digest-em8300-modules-0.15.0_pre20040906-r1 b/media-video/em8300-modules/files/digest-em8300-modules-0.15.0_pre20040906-r1
new file mode 100644
index 000000000000..296fef5aa2b8
--- /dev/null
+++ b/media-video/em8300-modules/files/digest-em8300-modules-0.15.0_pre20040906-r1
@@ -0,0 +1 @@
+MD5 b71e9dcdfd67132d49de46cfd9b6a921 em8300-20040906.tar.bz2 453961