old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4868F14D

5 files changed, 21 insertions, 168 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/Manifest b/media-video/em8300-modules/Manifest
index 0d87d31966f4..51c4c97709ef 100644
--- a/media-video/em8300-modules/Manifest
+++ b/media-video/em8300-modules/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX em8300-modules-0.18.0-2.6.35.patch 465 RMD160 9f5bb907fb0006c99da5ae7f3cb87463e4f4b1e5 SHA1 18589732523d0595881b16fac175b2fd70531f77 SHA256 96c4a470778215fb287dd16c94746385893bf65fa16179f4a5d5afa8bb23aa10
-AUX modules.em8300 28 RMD160 e97b956f9a1579cbba5923f8949f937621334dc1 SHA1 76661fadd926194f7658391536901fdefdeaf409 SHA256 9ff4d147004d6df8b063b27da32f27eda4f83450046337a9cbf99206828ab038
-DIST em8300-0.17.4.tar.gz 394137 RMD160 7f24dd9b3458811aadfb3d4dea4e14f55fb416f4 SHA1 94bf0e783c57d5c661e84c3a4a5b4f8850de735a SHA256 1dda9ed6ae350a22087df4ebafb495e4cff2f54b7b744ef062ec5f52a1ef0631
-DIST em8300-0.18.0.tar.gz 395500 RMD160 0c9189f54a472c8378254ddcc30aec4dcfe1ce7e SHA1 f779cc74faa9dd97d37248ee379741b481b36d2a SHA256 c598d6dfceb6180c13f7575e493405c9a576322e09e06857d322a9b30f4cc960
-DIST em8300-0.18.0_p20120124.tar.gz 1842088 RMD160 17df820961d602987bb8276a6f82476f3ee679b7 SHA1 0f552b3a6686a56279862a3733c765952144aabe SHA256 227342e073873ccea48f72941e0ff1c83103f2e9889a95f772f938a141c4bf0c
-EBUILD em8300-modules-0.17.4.ebuild 1661 RMD160 b9dfe1a9b7bf70052edc7587c16fdc8940edc015 SHA1 816a4e9a9748fe42d3205e0b3b4e0c36efa181ca SHA256 b3758fa0441e4fe3ad3905f600eaaf8f29e69d5c171f5198a9aa9b4e8907d148
-EBUILD em8300-modules-0.18.0.ebuild 1608 RMD160 fb2076d0d7c1106d6953eee5cada21ad23cde9a6 SHA1 723fd54fff3b1e54a5deac944e26c00d9e2a7671 SHA256 f55d4f66928edbede8100ce9d8f20ebc0dd5bf554f954e070826d412198cfdc5
-EBUILD em8300-modules-0.18.0_p20120124.ebuild 1799 RMD160 ffffc4b8403b47fc90bad12c42fa394840edc1cd SHA1 38c3dddf5a4a3179ea0763ee827b2f011c171ca3 SHA256 6c12340cf127a6f1f0eb4e52c094eded517fe7306111d04c9017ee0f8e39ee72
-MISC ChangeLog 10594 RMD160 890b004ff12dc2995cfaf9087377a6a64e70a01c SHA1 c0a4bdeb85c9d37a551946015efd85e3bae780a0 SHA256 616be34d9b348a1f5f027e9a678a779b6bfc25f43146fc7b8a843156202980ad
-MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+AUX modules.em8300 28 SHA256 9ff4d147004d6df8b063b27da32f27eda4f83450046337a9cbf99206828ab038 SHA512 32bd27bc386eb6620b397be9249ca27d51562a0353981817cc4b09838bb356eba6b1ff635de4665f4aaaa848e189c81b428afdd40f7a4f259a16a51b97ae4c08 WHIRLPOOL 75ecd57a57f133a4d4b0e3b4c2a8a418a266b9c1b85152ee76796d5e8417a2f5a5755f0f84cde72c2670c06240d11a7f574f7346db21cac1aaf82af4a4a4ab80
+DIST em8300-0.18.0_p20120124.tar.gz 1842088 SHA256 227342e073873ccea48f72941e0ff1c83103f2e9889a95f772f938a141c4bf0c
+EBUILD em8300-modules-0.18.0_p20120124.ebuild 1799 SHA256 6c12340cf127a6f1f0eb4e52c094eded517fe7306111d04c9017ee0f8e39ee72 SHA512 63cd90eeb5e3590cc294a5222c542b209a84685d2267e51790dc3dccf64e80b1421df3945765c286bf7af5ebf333f0b7b5520ddd7176ac4da84fc701be37cee5 WHIRLPOOL ce2dd6c95313094641d3c093bbcfb0682beb577e44b106bbb7157b96005cf268e413367aed32cdda544f70f26ff15afe381738701906efc0245dd6f59891884d
+MISC ChangeLog 10763 SHA256 4c0f28bca3d1e7303919aff3f87f6b36050b0a6edee54a8f9993d1f4136b9754 SHA512 b98966fa86262d595820a8027bddf9656df3891fe7d4388342309ea1c2a206e4a90671265ebc527709d61190f63fcdd75d9424c4924328ff6e1fc214af64bf5d WHIRLPOOL 79027d7c44bb42beb484e1e496471693a98da9505c219dfd85dd4fd294d5809343bf5f197af277fde9fbc73bb85bbddf00a72c3cf61855058836ec36b7589cf4
+MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREKAAYFAk+6D+MACgkQuUQtlDBCeQJXqwCZAfvixXuSKVIsP2F8bWhfcD1l
-YBMAn12QhBDw5wgWDIrHQqpC5LOeQlqN
-=aRzk
+iQEcBAEBCAAGBQJT06ZzAAoJEEdUh39IaPFN27gH/RNp8Ve8ppHLkm2RcBjT/+I+
+dHLdaGk+RtP5oJMT21bMlOsvCuNK/EESxW4el3zj6xHkZ2FQwy8RWuGDggt/GVam
+4/wsP06m9Au20UlThSWXNn+/qJzWnB1XTnnAM7sR2LkMYdFkEfSOwmFjIDyr2Rpn
+ARZ059WNHM2fdB6efilmRLgpkS6DXn5BdYuk0/q7wJw4otzyAE7HoYWQajAgUN1j
+w3c/MZidKeCctJc/X+ummueh/1oEHWqywHI/WOysM+0mG+RRApRMsywRjegcXAiu
+QS+EG4jTTyRcss3IMRk+BBXBU7JIL6kYgdl+vUHnEb5qXQQ5/JbMmYG+kdr3t3U=
+=zVG0
 -----END PGP SIGNATURE-----
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