[gentoo-commits] gentoo-x86 commit in media-video/em8300-modules: em8300-modules-0.17.2-r1.ebuild ChangeLog em8300-modules-0.16.4-r1.ebuild

[Matthias Schwarzott (zzam)]

zzam        09/06/18 15:11:51

  Modified:             ChangeLog em8300-modules-0.16.4-r1.ebuild
  Added:                em8300-modules-0.17.2-r1.ebuild
  Log:
  Rename modprobe config file to em8300.conf
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.50                 media-video/em8300-modules/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/em8300-modules/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/em8300-modules/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/em8300-modules/ChangeLog?r1=1.49&r2=1.50

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	12 Jun 2009 19:26:56 -0000	1.49
+++ ChangeLog	18 Jun 2009 15:11:51 -0000	1.50
@@ -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@g.o>
+  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@g.o>
   em8300-modules-0.17.2.ebuild,



1.3                  media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild?r1=1.2&r2=1.3

Index: em8300-modules-0.16.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- em8300-modules-0.16.4-r1.ebuild	20 May 2008 00:00:30 -0000	1.2
+++ em8300-modules-0.16.4-r1.ebuild	18 Jun 2009 15:11:51 -0000	1.3
@@ -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 @@
 	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 @@
 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
 }



1.1                  media-video/em8300-modules/em8300-modules-0.17.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/em8300-modules/em8300-modules-0.17.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/em8300-modules/em8300-modules-0.17.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: em8300-modules-0.17.2-r1.ebuild
===================================================================
# 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
}