diff --git a/media-video/qpspmanager/Manifest b/media-video/qpspmanager/Manifest
index 6c4a0a2f43a21784faf59152c1b7eaf9079244f6..c4e125f541468db1e41fe4cb347cf26253e68033 100644
--- a/media-video/qpspmanager/Manifest
+++ b/media-video/qpspmanager/Manifest
@@ -1,2 +1,2 @@
-DIST qpspmanager-1.1.2.tar.gz 40217 RMD160 1c24ad11bec8db609c3b5db3df3ab6f8745674a1 SHA1 61a3bd8c29c30272e5f73699bd66492501d65286 SHA256 dcc4c1f0c1bbe67c38560998d9d5487ce34217fdc3a15c7b9fa9594e6cdf41da
-EBUILD qpspmanager-1.1.2-r1.ebuild 615 RMD160 55d73b17adeb9f2bbb5925b033ce3e5eb045e36c SHA1 1c628b5c6bdf1d159b551a1d9fdbe3f3db79065a SHA256 43f12c82aa6c5bfe5b79cae725c33440a66edbb7266fad7e4c0d31b7a4a17086
+DIST qpspmanager-2.0.2.tar.gz 630207 SHA256 49bf64a42f4b68b560c4b5b14f46472040b525ac36f75fecabf565700d877b61 SHA512 377ef473a26c51034361e7c2cbecaf1105265b79c710bd837f82f571b9c1f684471ba81c23de8166b3b840a37897cd7819a271b63d34b6634273a0a7b4045a63 WHIRLPOOL 0eb1a98fd8b47136adf69ea7b01a90c5ad05c91d449af788268b6e7644cd4be1cd3fdd688f16c64a402351495546310cbaf13da9cc8b307d090e06df9e14d5dd
+EBUILD qpspmanager-2.0.2.ebuild 629 SHA256 34ac6a34b594202466db14d64ffbce249d7381aee527f8d9faba452355d65aa1 SHA512 839696c85df6bf71c784820daa1096f4189abad723eff710f40c002b7f8a3f99ab844f466a4c7a783fc725da8f26646554928283367e1abb50b018889436fed1 WHIRLPOOL a8ef3dd3510ef970492dbf533f836719ca831d73c013ae58fec44f7fd273012f970ec014d615768c58e9a017fc1cea6bcba411688e279e3ca417c59a30c65979
diff --git a/media-video/qpspmanager/qpspmanager-1.1.2-r1.ebuild b/media-video/qpspmanager/qpspmanager-2.0.2.ebuild
similarity index 91%
rename from media-video/qpspmanager/qpspmanager-1.1.2-r1.ebuild
rename to media-video/qpspmanager/qpspmanager-2.0.2.ebuild
index 836139f1f8a3ffc27957d759bfa21bdf0d50a795..d7574cdd3c526b9aae7f0c103bbab5bc6a19a771 100644
--- a/media-video/qpspmanager/qpspmanager-1.1.2-r1.ebuild
+++ b/media-video/qpspmanager/qpspmanager-2.0.2.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI="4"
+
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~x86 ~amd64"
@@ -10,9 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
HOMEPAGE="http://qpspmanager.sourceforge.net/"
IUSE=""
-DEPEND=">=x11-libs/qt-3.3.4"
-
-inherit qt3
+DEPEND="x11-libs/qt-gui:4 x11-libs/qt-core:4"
src_unpack(){
unpack ${A}
diff --git a/media-video/r5u870/Manifest b/media-video/r5u870/Manifest
deleted file mode 100644
index 82e431f67df5b068aec7dd44578381d0f6d82d39..0000000000000000000000000000000000000000
--- a/media-video/r5u870/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 10-r5u870-webcam.fdi 747 RMD160 a1804b70b834fc0454f4ccce000502f2f3ab8dc1 SHA1 1d77fa4f1f95ceeae7d7a255a77eb9e908d5f43c SHA256 48009ff203a1628fa15583db33e17cab56ac0643f81fb9337d446035c19a0332
-AUX 30-r5u870.fdi 658 RMD160 1b84f8b59533e6589130beebfb4141205ccf1c9d SHA1 111bcbe18088031a4450473c4832bede1de19c40 SHA256 305147ae5068ba9eca5eefe722a63d50b69ea23198d7c0fe61556dd33e2ab670
-AUX r5u870-2.6.34_fix.patch 266 RMD160 efc9e85270d87cc3fa928e8ee9cf12cf50e1d71b SHA1 a0924852e09c623c7c7c3de93ba80e63c5e69409 SHA256 00a5cced9713690f4721437374cfeeb1178e59a39c1e1fe270217bae73cfb560
-AUX vivi-dmasg-config.patch 389 RMD160 4ea9b9a51dad8c4e82a92338d077605a1714a2b3 SHA1 0b37009486b50f35d1e682f3e64d761ba51b51a0 SHA256 fba678b768826f81dd9970ea4f78fd8a4b00bb1eee64a3149dc14cf353ae7dc7
-DIST r5u870_k2.6.30_amd64.tar.bz2 195029 RMD160 0e1623e2425579b2eee125a7538c903096ee438f SHA1 86a135c01031c52d70ffd8dee40ccb2d41b1c09f SHA256 bbda4e437736b83e7128b754565613726948c7f470d98610679b4c20cd0b38cf
-DIST r5u870_k2.6.30_i386.tar.bz2 195038 RMD160 149c7db629d9d9d03d99d2d4e752f2f8ea91b3f0 SHA1 6a732ca4cbb2ee29bc006761d651940679752abe SHA256 2a973f92ef0c5801b5a6dd0d8825d46100a6a657cb9d3579989f044cc9b70cf2
-EBUILD r5u870-2.6.30.ebuild 1355 RMD160 7981142050730b4e7e253e3b827f2eb8871e40ba SHA1 366362e2c72290ff3efaee0047532966bb313da1 SHA256 0f562e7a0afb2428330aa3e640abec75ef544f94142830b0a2339754fae44b07
-EBUILD r5u870-2.6.3x.ebuild 1404 RMD160 543e414659c3cc0e099d537c1fd7d9f7df83a40b SHA1 17e9cf67fa6d5d7388245bc27dbae80085ca0772 SHA256 fcc3166850ac2702d75febef07cf109a59966b8d940b6238da9f786d6f3f21b4
diff --git a/media-video/r5u870/files/10-r5u870-webcam.fdi b/media-video/r5u870/files/10-r5u870-webcam.fdi
deleted file mode 100644
index da3fbe8a5ec99bc3174afc3a6193be9d9cb6fb37..0000000000000000000000000000000000000000
--- a/media-video/r5u870/files/10-r5u870-webcam.fdi
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
- video4linux
- video4linux
- video4linux
- /dev/video0
- 2
-
-
-
-
-
-
diff --git a/media-video/r5u870/files/30-r5u870.fdi b/media-video/r5u870/files/30-r5u870.fdi
deleted file mode 100644
index 4bb0957705e33b2ee279e2ea0f491e549367d358..0000000000000000000000000000000000000000
--- a/media-video/r5u870/files/30-r5u870.fdi
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
- video4linux
- video4linux
- video4linux
- /dev/video1
- 2
-
-
-
diff --git a/media-video/r5u870/files/r5u870-2.6.34_fix.patch b/media-video/r5u870/files/r5u870-2.6.34_fix.patch
deleted file mode 100644
index 7028ccf0f06667f9be205033596d684b8dda4ba9..0000000000000000000000000000000000000000
--- a/media-video/r5u870/files/r5u870-2.6.34_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** r5u870m.c Wed Jul 7 15:27:33 2010
---- r5u870.c Wed Jul 7 15:23:19 2010
-***************
-*** 55,60 ****
---- 55,61 ----
- #include
- #include
- #include
-+ #include
-
- #include "usbcam/usbcam.h"
-
diff --git a/media-video/r5u870/files/vivi-dmasg-config.patch b/media-video/r5u870/files/vivi-dmasg-config.patch
deleted file mode 100644
index 1f4d7f8e27d15786d595676bbf3b63f69a170f75..0000000000000000000000000000000000000000
--- a/media-video/r5u870/files/vivi-dmasg-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/drivers/media/video/Kconfig 2008-01-20 05:09:40.060442881 +0100
-+++ mod/drivers/media/video/Kconfig 2008-01-20 05:11:24.769587993 +0100
-@@ -365,6 +365,7 @@
- tristate "Virtual Video Driver"
- depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
- select VIDEOBUF_VMALLOC
-+ select VIDEOBUF_DMA_SG
- default n
- ---help---
- Enables a virtual video driver. This device shows a color bar
diff --git a/media-video/r5u870/r5u870-2.6.30.ebuild b/media-video/r5u870/r5u870-2.6.30.ebuild
deleted file mode 100644
index 9cb92edaae3dda1665aba3abbdb7a4fc86599a2e..0000000000000000000000000000000000000000
--- a/media-video/r5u870/r5u870-2.6.30.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit linux-mod
-
-DESCRIPTION="Driver for webcams based on the Ricoh r5u870 chip"
-HOMEPAGE="http://www.palmix.org/r5u870-en.html"
-SRC_URI="amd64? ( http://www.palmix.org/download/${PN}_k${PV}_amd64.tar.bz2 )
- x86? ( http://www.palmix.org/download/${PN}_k${PV}_i386.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}/${PN}"
-
-MODULE_NAMES="r5u870(media/video:) usbcam/usbcam(media/video:)"
-CONFIG_CHECK="VIDEO_V4L2 VIDEO_V4L1_COMPAT FW_LOADER
- VIDEO_VIVI V4L_USB_DRIVERS"
-MODULESD_R5U870_DOCS="readme"
-BUILD_TARGETS="all"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-}
-
-
-src_install () {
- linux-mod_src_install
- insinto /$(get_libdir)/firmware
- doins *.fw
- insinto /usr/share/doc/${P}
- #doins "${FILESDIR}/vivi-dmasg-config.patch"
-}
-
-pkg_setup () {
-# ewarn "If you get warnings about missing symbols, you may need to apply"
-# ewarn "the supplied patch and rebuild your kernel, as follows:"
-# ewarn
-# ewarn " # cd /usr/src/linux"
-# ewarn " # < /usr/share/doc/${P}/vivi-dmasg-config.patch \| patch -p1"
-# ewarn
-# ewarn "Alternatively, you can edit the .config file and make sure that"
-# ewarn "VIDEOBUF_DMA_SG, VIDEOBUF_GEN and VIDEOBUF_VMALLOC are set"
-# ebeep 5 && epause
- linux-mod_pkg_setup
-}
diff --git a/media-video/r5u870/r5u870-2.6.3x.ebuild b/media-video/r5u870/r5u870-2.6.3x.ebuild
deleted file mode 100644
index 60ed68c7be9991ff641fad04d0ded6b43cb81fe1..0000000000000000000000000000000000000000
--- a/media-video/r5u870/r5u870-2.6.3x.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit linux-mod
-
-DESCRIPTION="Driver for webcams based on the Ricoh r5u870 chip"
-HOMEPAGE="http://www.palmix.org/r5u870-en.html"
-SRC_URI="amd64? ( http://www.palmix.org/download/${PN}_k2.6.30_amd64.tar.bz2 )
- x86? ( http://www.palmix.org/download/${PN}_k2.6.30_i386.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}/${PN}"
-
-MODULE_NAMES="r5u870(media/video:) usbcam/usbcam(media/video:)"
-CONFIG_CHECK="VIDEO_V4L2 VIDEO_V4L1_COMPAT FW_LOADER
- VIDEO_VIVI V4L_USB_DRIVERS"
-MODULESD_R5U870_DOCS="readme"
-BUILD_TARGETS="all"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- kernel_is ge 2 6 34 && epatch "${FILESDIR}/${PN}-2.6.34_fix.patch"
-}
-
-src_install () {
- linux-mod_src_install
- insinto /$(get_libdir)/firmware
- doins *.fw
- insinto /usr/share/doc/${P}
- doins "${FILESDIR}/vivi-dmasg-config.patch"
-}
-
-pkg_setup () {
- ewarn "If you get warnings about missing symbols, you may need to apply"
- ewarn "the supplied patch and rebuild your kernel, as follows:"
- ewarn
- ewarn " # cd /usr/src/linux"
- ewarn " # < /usr/share/doc/${P}/vivi-dmasg-config.patch \| patch -p1"
- ewarn
- ewarn "Alternatively, you can edit the .config file and make sure that"
- ewarn "VIDEOBUF_DMA_SG, VIDEOBUF_GEN and VIDEOBUF_VMALLOC are set"
- ebeep 5 && epause
- linux-mod_pkg_setup
-}