Remove unnecessary revisions. dodir and insinto prepend ROOT

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

5 files changed, 16 insertions, 322 deletions

diff --git a/media-tv/wis-go7007/ChangeLog b/media-tv/wis-go7007/ChangeLog
index dab4292b48ac..4736c466ca65 100644
--- a/media-tv/wis-go7007/ChangeLog
+++ b/media-tv/wis-go7007/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/wis-go7007
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/wis-go7007/ChangeLog,v 1.6 2008/08/20 04:57:01 beandog Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/wis-go7007/ChangeLog,v 1.7 2011/04/30 22:50:32 halcy0n Exp $
+
+  30 Apr 2011; Mark Loeser <halcy0n@gentoo.org> -wis-go7007-0.9.8.ebuild,
+  -wis-go7007-0.9.8-r1.ebuild, -wis-go7007-0.9.8-r2.ebuild,
+  wis-go7007-0.9.8-r3.ebuild:
+  Remove unnecessary revisions. dodir and insinto prepend ROOT
 
 *wis-go7007-0.9.8-r3 (20 Aug 2008)
 
diff --git a/media-tv/wis-go7007/wis-go7007-0.9.8-r1.ebuild b/media-tv/wis-go7007/wis-go7007-0.9.8-r1.ebuild
deleted file mode 100644
index f1de580295e4..000000000000
--- a/media-tv/wis-go7007/wis-go7007-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/wis-go7007/wis-go7007-0.9.8-r1.ebuild,v 1.3 2007/05/01 00:34:16 genone Exp $
-
-inherit eutils linux-mod
-
-MY_PN=${PN}-linux
-DESCRIPTION="Linux drivers for go7007 chipsets (Plextor ConvertX PVR)"
-HOMEPAGE="http://oss.wischip.com/"
-SRC_URI="http://oss.wischip.com/${MY_PN}-${PV}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa"
-DEPEND="|| ( >=sys-fs/udev-103 sys-apps/hotplug )
-		sys-apps/hotplug-base
-	sys-apps/fxload"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-pkg_setup() {
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="KERNELSRC=${KERNEL_DIR}"
-	CONFIG_CHECK="HOTPLUG MODULES KMOD FW_LOADER I2C VIDEO_DEV SOUND SND USB
-		USB_DEVICEFS USB_EHCI_HCD"
-
-	if use alsa; then
-		CONFIG_CHECK="${CONFIG_CHECK} SND_MIXER_OSS SND_PCM_OSS"
-	fi
-
-	#if ! kernel_is 2 6 16; then
-	#	eerror "These drivers will only work with a 2.6.16 kernel"
-	#	#die "Needs a different kernel"
-	#fi
-
-	linux-mod_pkg_setup
-	MODULE_NAMES="go7007(extra:${S}:${S}/kernel)
-		go7007-usb(extra:${S}:${S}/kernel)
-		snd-go7007(extra:${S}:${S}/kernel)
-		wis-ov7640(extra:${S}:${S}/kernel)
-		wis-sony-tuner(extra:${S}:${S}/kernel)
-		wis-tw9903(extra:${S}:${S}/kernel)
-		wis-uda1342(extra:${S}:${S}/kernel)
-		wis-saa7113(extra:${S}:${S}/kernel)
-		wis-saa7115(extra:${S}:${S}/kernel)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${P}-fix-udev.diff"
-	if kernel_is ge 2 6 17; then
-		epatch "${FILESDIR}/${P}-kernel-2.6.17.diff"
-	fi
-}
-
-src_compile() {
-	cd ${S}
-	linux-mod_src_compile || die "failed to build driver "
-}
-
-src_install() {
-	cd ${S}/apps
-	make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} PREFIX=/usr install || die "failed to install"
-	cd ${S}
-	dodir ${ROOT}/lib/modules
-	insinto ${ROOT}/lib/modules
-	dodoc README README.saa7134 RELEASE-NOTES
-	cd ${S}/kernel
-	linux-mod_src_install || die "failed to install modules"
-
-	insinto ${KERNEL_DIR}/include/linux
-	doins ${S}/include/*.h
-	insinto ${ROOT}/lib/firmware
-	doins ${S}/firmware/*.bin
-	insinto ${ROOT}/lib/firmware/ezusb
-	doins ${S}/firmware/ezusb/*.hex
-	insinto ${ROOT}/etc/udev/rules.d
-	doins ${S}/udev/wis-ezusb.rules
-
-	exeinto ${ROOT}/usr/bin
-	use alsa && doexe ${S}/apps/gorecord
-	doexe ${S}/apps/modet
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	elog ""
-	elog "For more information on how to use the Plextor devices with Gentoo"
-	elog "you can follow this thread for tips and tricks:"
-	elog "http://forums.gentoo.org/viewtopic-t-306559-highlight-.html"
-	elog ""
-	elog "Also, the unofficial Gentoo wiki has a HOWTO page:"
-	elog "http://gentoo-wiki.com/HARDWARE_go7007"
-	elog ""
-	ewarn "Don't forget to add your modules to /etc/modules.autoload.d/kernel.2.6"
-	ewarn "so they will load on startup:"
-	ewarn ""
-	ewarn "snd_go7007"
-	ewarn "go7007"
-	ewarn "go7007_usb"
-	ewarn "wis_saa7115"
-	ewarn "wis_uda1342"
-	ewarn "wis_sony_tuner"
-}
diff --git a/media-tv/wis-go7007/wis-go7007-0.9.8-r2.ebuild b/media-tv/wis-go7007/wis-go7007-0.9.8-r2.ebuild
deleted file mode 100644
index 3ba5b2752d7e..000000000000
--- a/media-tv/wis-go7007/wis-go7007-0.9.8-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/wis-go7007/wis-go7007-0.9.8-r2.ebuild,v 1.1 2007/07/17 01:11:12 beandog Exp $
-
-inherit eutils linux-mod
-
-MY_PN=${PN}-linux
-DESCRIPTION="Linux drivers for go7007 chipsets (Plextor ConvertX PVR)"
-HOMEPAGE="http://oss.wischip.com/"
-SRC_URI="http://oss.wischip.com/${MY_PN}-${PV}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa"
-DEPEND="|| ( >=sys-fs/udev-103 sys-apps/hotplug )
-		sys-apps/hotplug-base
-	sys-apps/fxload"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-pkg_setup() {
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="KERNELSRC=${KERNEL_DIR}"
-	CONFIG_CHECK="HOTPLUG MODULES KMOD FW_LOADER I2C VIDEO_DEV SOUND SND USB
-		USB_DEVICEFS USB_EHCI_HCD"
-
-	if use alsa; then
-		CONFIG_CHECK="${CONFIG_CHECK} SND_MIXER_OSS SND_PCM_OSS"
-	fi
-
-	#if ! kernel_is 2 6 16; then
-	#	eerror "These drivers will only work with a 2.6.16 kernel"
-	#	#die "Needs a different kernel"
-	#fi
-
-	linux-mod_pkg_setup
-	MODULE_NAMES="go7007(extra:${S}:${S}/kernel)
-		go7007-usb(extra:${S}:${S}/kernel)
-		snd-go7007(extra:${S}:${S}/kernel)
-		wis-ov7640(extra:${S}:${S}/kernel)
-		wis-sony-tuner(extra:${S}:${S}/kernel)
-		wis-tw9903(extra:${S}:${S}/kernel)
-		wis-uda1342(extra:${S}:${S}/kernel)
-		wis-saa7113(extra:${S}:${S}/kernel)
-		wis-saa7115(extra:${S}:${S}/kernel)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${P}-fix-udev.diff"
-	if kernel_is ge 2 6 17; then
-		epatch "${FILESDIR}/${P}-kernel-2.6.17.diff"
-	fi
-	if kernel_is ge 2 6 21; then
-		epatch "${FILESDIR}/snd.patch"
-	fi
-}
-
-src_compile() {
-	cd ${S}
-	linux-mod_src_compile || die "failed to build driver "
-}
-
-src_install() {
-	cd ${S}/apps
-	make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} PREFIX=/usr install || die "failed to install"
-	cd ${S}
-	dodir ${ROOT}/lib/modules
-	insinto ${ROOT}/lib/modules
-	dodoc README README.saa7134 RELEASE-NOTES
-	cd ${S}/kernel
-	linux-mod_src_install || die "failed to install modules"
-
-	insinto ${KERNEL_DIR}/include/linux
-	doins ${S}/include/*.h
-	insinto ${ROOT}/lib/firmware
-	doins ${S}/firmware/*.bin
-	insinto ${ROOT}/lib/firmware/ezusb
-	doins ${S}/firmware/ezusb/*.hex
-	insinto ${ROOT}/etc/udev/rules.d
-	doins ${S}/udev/wis-ezusb.rules
-
-	exeinto ${ROOT}/usr/bin
-	use alsa && doexe ${S}/apps/gorecord
-	doexe ${S}/apps/modet
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	elog ""
-	elog "For more information on how to use the Plextor devices with Gentoo"
-	elog "you can follow this thread for tips and tricks:"
-	elog "http://forums.gentoo.org/viewtopic-t-306559-highlight-.html"
-	elog ""
-	elog "Also, the unofficial Gentoo wiki has a HOWTO page:"
-	elog "http://gentoo-wiki.com/HARDWARE_go7007"
-	elog ""
-	ewarn "Don't forget to add your modules to /etc/modules.autoload.d/kernel.2.6"
-	ewarn "so they will load on startup:"
-	ewarn ""
-	ewarn "snd_go7007"
-	ewarn "go7007"
-	ewarn "go7007_usb"
-	ewarn "wis_saa7115"
-	ewarn "wis_uda1342"
-	ewarn "wis_sony_tuner"
-}
diff --git a/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild b/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild
index 150280009d0d..5a3be3e92bf8 100644
--- a/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild
+++ b/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild,v 1.1 2008/08/20 04:57:01 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/wis-go7007/wis-go7007-0.9.8-r3.ebuild,v 1.2 2011/04/30 22:50:32 halcy0n Exp $
 
 inherit eutils linux-mod
 
@@ -15,6 +15,7 @@ IUSE="alsa"
 DEPEND="|| ( >=sys-fs/udev-103 sys-apps/hotplug )
 		sys-apps/hotplug-base
 	sys-apps/fxload"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
@@ -64,22 +65,22 @@ src_install() {
 	cd "${S}/apps"
 	make KERNELDIR="${KERNEL_DIR}" DESTDIR="${D}" PREFIX=/usr install || die "failed to install"
 	cd "${S}"
-	dodir "${ROOT}/lib/modules"
-	insinto "${ROOT}/lib/modules"
+	dodir "/lib/modules"
+	insinto "/lib/modules"
 	dodoc README README.saa7134 RELEASE-NOTES
 	cd "${S}/kernel"
 	linux-mod_src_install || die "failed to install modules"
 
 	insinto "${KERNEL_DIR}/include/linux"
 	doins "${S}/include/*.h"
-	insinto "${ROOT}/lib/firmware"
+	insinto "/lib/firmware"
 	doins "${S}/firmware/*.bin"
-	insinto "${ROOT}/lib/firmware/ezusb"
+	insinto "/lib/firmware/ezusb"
 	doins "${S}/firmware/ezusb/*.hex"
-	insinto" ${ROOT}/etc/udev/rules.d"
+	insinto"/etc/udev/rules.d"
 	doins "${S}/udev/wis-ezusb.rules"
 
-	exeinto "${ROOT}/usr/bin"
+	exeinto "/usr/bin"
 	use alsa && doexe "${S}/apps/gorecord"
 	doexe "${S}/apps/modet"
 }
diff --git a/media-tv/wis-go7007/wis-go7007-0.9.8.ebuild b/media-tv/wis-go7007/wis-go7007-0.9.8.ebuild
deleted file mode 100644
index 586b95afe754..000000000000
--- a/media-tv/wis-go7007/wis-go7007-0.9.8.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/wis-go7007/wis-go7007-0.9.8.ebuild,v 1.2 2007/05/01 00:34:16 genone Exp $
-
-inherit eutils linux-mod
-
-MY_PN=${PN}-linux
-DESCRIPTION="Linux drivers for go7007 chipsets (Plextor ConvertX PVR)"
-HOMEPAGE="http://oss.wischip.com/"
-SRC_URI="http://oss.wischip.com/${MY_PN}-${PV}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa"
-DEPEND="|| ( >=sys-fs/udev-103 sys-apps/hotplug )
-		sys-apps/hotplug-base
-	sys-apps/fxload"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-pkg_setup() {
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-	CONFIG_CHECK="HOTPLUG MODULES KMOD FW_LOADER I2C VIDEO_DEV SOUND SND USB
-		USB_DEVICEFS USB_EHCI_HCD"
-
-	if use alsa; then
-		CONFIG_CHECK="${CONFIG_CHECK} SND_MIXER_OSS SND_PCM_OSS"
-	fi
-
-	if ! kernel_is 2 6 16; then
-		eerror "These drivers will only work with a 2.6.16 kernel"
-		die "Needs a different kernel"
-	fi
-
-	linux-mod_pkg_setup
-	MODULE_NAMES="go7007(extra:${S}:${S}/kernel)
-		go7007-usb(extra:${S}:${S}/kernel)
-		snd-go7007(extra:${S}:${S}/kernel)
-		wis-ov7640(extra:${S}:${S}/kernel)
-		wis-sony-tuner(extra:${S}:${S}/kernel)
-		wis-tw9903(extra:${S}:${S}/kernel)
-		wis-uda1342(extra:${S}:${S}/kernel)
-		wis-saa7113(extra:${S}:${S}/kernel)
-		wis-saa7115(extra:${S}:${S}/kernel)"
-}
-
-src_compile() {
-	cd ${S}
-	linux-mod_src_compile || die "failed to build driver "
-}
-
-src_install() {
-	cd ${S}/apps
-	make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} PREFIX=/usr install || die "failed to install"
-	cd ${S}
-	dodir ${ROOT}/lib/modules
-	insinto ${ROOT}/lib/modules
-	dodoc README README.saa7134 RELEASE-NOTES
-	cd ${S}/kernel
-	linux-mod_src_install || die "failed to install modules"
-
-	insinto ${KERNEL_DIR}/include/linux
-	doins ${S}/include/*.h
-	insinto ${ROOT}/lib/firmware
-	doins ${S}/firmware/*.bin
-	insinto ${ROOT}/lib/firmware/ezusb
-	doins ${S}/firmware/ezusb/*.hex
-	insinto ${ROOT}/etc/udev/rules.d
-	doins ${S}/udev/wis-ezusb.rules
-
-	exeinto ${ROOT}/usr/bin
-	use alsa && doexe ${S}/apps/gorecord
-	doexe ${S}/apps/modet
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	elog ""
-	elog "For more information on how to use the Plextor devices with Gentoo"
-	elog "you can follow this thread for tips and tricks:"
-	elog "http://forums.gentoo.org/viewtopic-t-306559-highlight-.html"
-	elog ""
-	elog "Also, the unofficial Gentoo wiki has a HOWTO page:"
-	elog "http://gentoo-wiki.com/HARDWARE_go7007"
-	elog ""
-	ewarn "Don't forget to add your modules to /etc/modules.autoload.d/kernel.2.6"
-	ewarn "so they will load on startup:"
-	ewarn ""
-	ewarn "snd_go7007"
-	ewarn "go7007"
-	ewarn "go7007_usb"
-	ewarn "wis_saa7115"
-	ewarn "wis_uda1342"
-	ewarn "wis_sony_tuner"
-}