Rename modprobe config file to em8300.conf

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 98 insertions, 16 deletions

diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index d5d38d91dd6e..687b98a2c7cf 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/em8300-modules
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.49 2009/06/12 19:26:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.50 2009/06/18 15:11:51 zzam Exp $
+
+*em8300-modules-0.17.2-r1 (18 Jun 2009)
+
+  18 Jun 2009; Matthias Schwarzott <zzam@gentoo.org>
+  em8300-modules-0.16.4-r1.ebuild, +em8300-modules-0.17.2-r1.ebuild:
+  Rename modprobe config file to em8300.conf
 
   12 Jun 2009; Matthias Schwarzott <zzam@gentoo.org>
   em8300-modules-0.17.2.ebuild,
diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest
index 176605e232a8..6e24ca91956f 100644
--- a/media-video/em8300-modules/Manifest
+++ b/media-video/em8300-modules/Manifest
@@ -12,15 +12,16 @@ DIST em8300-0.16.4.tar.gz 345908 RMD160 77251d225594d303e0080f302907b822a673f2ec
 DIST em8300-0.17.2.tar.gz 388334 RMD160 bab01517c0728f05851252ff4aca9e2524ffb1b4 SHA1 47949e966b3975c117c20680dd8e6f05c3553363 SHA256 b3f1e4b7cd4c262fa23fab2a0c371f3fd721d4a9522d1aade1a7aa8cba67ca75
 EBUILD em8300-modules-0.16.0-r1.ebuild 1144 RMD160 06508465cc5b02187e4a55d4da5fc108841ca251 SHA1 9268ba746c392a2a3ebd4f5204586722a8fe1236 SHA256 befe369a26844fdaff7c54cb52e4697ddf3a510f8bd58de02543ac70b0f23cc1
 EBUILD em8300-modules-0.16.2.ebuild 1200 RMD160 179b0eae2494db4f7e131e66350bca3eaf7f2dce SHA1 05f3685f3d4bf16fffad6742650b4bf3e3f34678 SHA256 d4bc5edf14499942da65c7070945473767db0cb71357b35c0b15a72794d2ee5b
-EBUILD em8300-modules-0.16.4-r1.ebuild 1413 RMD160 95e5acd88c945e0a034569c40c7ffa4363810ff4 SHA1 ae9061401689ff8c8beaf76f9754fa853a5753d5 SHA256 f72591ed16c293d111f61412f987281f992bf4873c8be6f3a17463682b393c77
+EBUILD em8300-modules-0.16.4-r1.ebuild 1606 RMD160 253c958891c520d0f83dd16a91c3c394f5ce93eb SHA1 fe3b0f1368b78f09bd3abeec41a4aa769494a559 SHA256 dd839024e475153d01da3579e351d8c1fd2dc88912482ecc16ae3a260f942dcc
 EBUILD em8300-modules-0.16.4.ebuild 1104 RMD160 b5dc1428ed9d604d31c7abc99f27e83d5f99f90b SHA1 6081dce2fb06004574ea37f9c30372098b6acd5e SHA256 7967c946b701bb3c5e225e95a71fb82a548fdd91afa88719f3276c5ae944fddc
+EBUILD em8300-modules-0.17.2-r1.ebuild 1664 RMD160 5f9036c14f8b7aa0a84084fb323529df527d177e SHA1 d36e4cb1ebf173ecc81d826fec1b799ca8b27637 SHA256 3f99c87391058550cc25efc9b0459ff016c7e1a94e8f102bd77368c442b79050
 EBUILD em8300-modules-0.17.2.ebuild 1463 RMD160 a5a7ba179055c50e08418905bdd592441580f8f4 SHA1 f933e54a50fe9264382490bd507854633267f2d9 SHA256 99d6a0959176f12f058dc6693163b5d952557db051d00af34f4ca94e07fbcd41
-MISC ChangeLog 8909 RMD160 e76941e0bd305e81ae3412841ebc29158ca68bc7 SHA1 140b7b968e75b6c7416db356b294d0d772057ae0 SHA256 45739efc9e2285f23747bd17734e72167ba8ad72fb742fa4cb235d16c32862f4
+MISC ChangeLog 9118 RMD160 c1522002c6e6a7a86c6f8c0782b3870d564ac9cf SHA1 fddd9f15b1165412bfe179943c92c9d711f00df1 SHA256 95ef4dc5204811273a8f77f87d059ab8798e204aff3d0f3b056ef3b1fc73fdba
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoyrAcACgkQt2vP6XvVdOetVwCeP2rJaWaasSgyWoBxwkUwz31I
-REMAoLkVEPofUbsI9b0O0lyRHenrYSoG
-=JiML
+iEYEARECAAYFAko6WT4ACgkQt2vP6XvVdOfhiQCffpJKErEH0T3R9ozz1FsUVLEs
+QRoAoItIrqO8WJKrUJolfufrjlUx6Ol1
+=G/Q4
 -----END PGP SIGNATURE-----
diff --git a/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild b/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild
index deaa1a536fb1..e54929bee3c5 100644
--- a/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.4-r1.ebuild,v 1.2 2008/05/20 00:00:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild,v 1.3 2009/06/18 15:11:51 zzam Exp $
 
 inherit eutils linux-mod
 
@@ -41,7 +41,7 @@ src_install() {
 	newsbin devices.sh em8300-devices.sh
 
 	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/modules.em8300 em8300
+	newins "${FILESDIR}"/modules.em8300 em8300.conf
 
 	insinto /etc/udev/rules.d
 	newins em8300-udev.rules 15-em8300.rules
@@ -50,12 +50,18 @@ src_install() {
 pkg_preinst() {
 	linux-mod_pkg_preinst
 
-	local old="${ROOT}/etc/modules.d/em8300"
-	local new="${ROOT}/etc/modprobe.d/em8300"
-
-	if [[ -a ${old} && ! -a ${new} ]]; then
-		elog "Moving old em8300 configuration in /etc/modules.d to new"
-		elog "location in /etc/modprobe.d"
-		mv "${old}" "${new}"
+	local old1="${ROOT}/etc/modprobe.d/em8300"
+	local old2="${ROOT}/etc/modules.d/em8300"
+	local new="${ROOT}/etc/modprobe.d/em8300.conf"
+
+	if [[ ! -a ${new} ]]; then
+		if [[ -a ${old1} ]]; then
+			elog "Renaming em8300-modprobe configuration to em8300.conf"
+			mv "${old1}" "${new}"
+		elif [[ -a ${old2} ]]; then
+			elog "Moving old em8300 configuration in /etc/modules.d to new"
+			elog "location in /etc/modprobe.d"
+			mv "${old2}" "${new}"
+		fi
 	fi
 }
diff --git a/media-video/em8300-modules/em8300-modules-0.17.2-r1.ebuild b/media-video/em8300-modules/em8300-modules-0.17.2-r1.ebuild
new file mode 100644
index 000000000000..1f32da4d8158
--- /dev/null
+++ b/media-video/em8300-modules/em8300-modules-0.17.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 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.17.2-r1.ebuild,v 1.1 2009/06/18 15:11:51 zzam Exp $
+
+inherit eutils linux-mod
+
+MY_P="${P/-modules/}"
+
+DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules"
+HOMEPAGE="http://dxr3.sourceforge.net"
+SRC_URI="mirror://sourceforge/dxr3/${MY_P}.tar.gz"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CONFIG_CHECK="I2C_ALGOBIT"
+MODULE_NAMES="em8300(video:) bt865(video:) adv717x(video:)"
+
+S="${WORKDIR}/${MY_P}/modules"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/.."
+	epatch "${FILESDIR}/${P}-kernel-2.6.30.patch"
+}
+
+src_compile() {
+	set_arch_to_kernel
+	cd "${S}"
+	emake KERNEL_LOCATION="${KERNEL_DIR}" || die "emake failed."
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README-modoptions README-modules.conf
+
+	newsbin devices.sh em8300-devices.sh
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/modules.em8300 em8300.conf
+
+	insinto /etc/udev/rules.d
+	newins em8300-udev.rules 15-em8300.rules
+}
+
+pkg_preinst() {
+	linux-mod_pkg_preinst
+
+	local old1="${ROOT}/etc/modprobe.d/em8300"
+	local old2="${ROOT}/etc/modules.d/em8300"
+	local new="${ROOT}/etc/modprobe.d/em8300.conf"
+
+	if [[ ! -a ${new} ]]; then
+		if [[ -a ${old1} ]]; then
+			elog "Renaming em8300-modprobe configuration to em8300.conf"
+			mv "${old1}" "${new}"
+		elif [[ -a ${old2} ]]; then
+			elog "Moving old em8300 configuration in /etc/modules.d to new"
+			elog "location in /etc/modprobe.d"
+			mv "${old2}" "${new}"
+		fi
+	fi
+}