old

(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)

4 files changed, 7 insertions, 153 deletions

diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index e3c713deb8e6..746576394696 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/em8300-modules
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.60 2012/05/21 09:50:29 phajdan.jr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.61 2014/07/26 13:00:40 ssuominen Exp $
+
+  26 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -em8300-modules-0.17.4.ebuild, -em8300-modules-0.18.0.ebuild,
+  -files/em8300-modules-0.18.0-2.6.35.patch:
+  old
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   em8300-modules-0.18.0_p20120124.ebuild:
diff --git a/media-video/em8300-modules/em8300-modules-0.17.4.ebuild b/media-video/em8300-modules/em8300-modules-0.17.4.ebuild
deleted file mode 100644
index 0ac706b5457a..000000000000
--- a/media-video/em8300-modules/em8300-modules-0.17.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 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.4.ebuild,v 1.4 2010/04/12 19:01:10 maekke 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
-}
diff --git a/media-video/em8300-modules/em8300-modules-0.18.0.ebuild b/media-video/em8300-modules/em8300-modules-0.18.0.ebuild
deleted file mode 100644
index 07e26992284d..000000000000
--- a/media-video/em8300-modules/em8300-modules-0.18.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 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.18.0.ebuild,v 1.2 2010/10/20 13:31:46 ssuominen Exp $
-
-EAPI=2
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/linux-sources"
-
-CONFIG_CHECK="I2C_ALGOBIT"
-MODULE_NAMES="em8300(video:) bt865(video:) adv717x(video:)"
-
-S=${WORKDIR}/${MY_P}/modules
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-2.6.35.patch
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake KERNEL_LOCATION="${KERNEL_DIR}" || die
-}
-
-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
-}
diff --git a/media-video/em8300-modules/files/em8300-modules-0.18.0-2.6.35.patch b/media-video/em8300-modules/files/em8300-modules-0.18.0-2.6.35.patch
deleted file mode 100644
index 8e482d899a2a..000000000000
--- a/media-video/em8300-modules/files/em8300-modules-0.18.0-2.6.35.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/330919
-
---- ../include/linux/em8300.h
-+++ ../include/linux/em8300.h
-@@ -234,6 +234,10 @@
- #include <linux/wait.h> /* wait_queue_head_t */
- #include <linux/list.h> /* struct list_head */
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
-+#include <linux/semaphore.h> /* struct semaphore */
-+#endif
-+
- #if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- #define snd_card_t struct snd_card