Rename modprobe config file to em8300.conf

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 92 insertions, 11 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/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
+}