Remove unnecessary revisions. dodir and insinto prepend ROOT

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

6 files changed, 28 insertions, 327 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/Manifest b/media-tv/wis-go7007/Manifest
index 763ae6c42d13..a8108ff7fc30 100644
--- a/media-tv/wis-go7007/Manifest
+++ b/media-tv/wis-go7007/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX snd.patch 4014 RMD160 d8a07e4dd95d8b6ee744a96e17160f291fb6ba45 SHA1 92372edf1035476ebf1b3bba1fe684838ff02780 SHA256 caca819fb8b2f495150bcd3ae6765c4cb1320cec5c0d7dce74e15f1368f8cd28
 AUX wis-go7007-0.9.8-fix-udev.diff 1467 RMD160 5e9790c33a64c8cb6dd3233e2d6f4544cfe3c690 SHA1 d8c9e26b61ae1a82f0f3fe6aa3f31fab4bd8ddab SHA256 81836ab84f092e60004ed69cf1094e8b016cda1f64814a87d3bfc07716a305a5
 AUX wis-go7007-0.9.8-kernel-2.6.17.diff 7039 RMD160 c8497f43dc2345959dc25dead0f08a486f7779f9 SHA1 351a1446f4e214de967d4ee1040c6205582c8564 SHA256 cf1785c4525d9764a5a022b6e61b54ac0ba03031bdcdbba15f853627d05b3f32
@@ -6,9 +9,13 @@ AUX wis-go7007-2.6.24-no_algo_control.diff 1615 RMD160 4ea97e31b95a99a1011feb0ff
 AUX wis-go7007-2.6.26-nopage.diff 871 RMD160 fa892341d5d028a5f9c81c3255561f0923097148 SHA1 cc89f0ba5e57b6c04e00465b754aaa5ce89969e1 SHA256 a37afef9684d2d2d39d2d7af811e871b89c2a12dbd3f66d352915a9b6a337aa2
 AUX wis-go7007-updates.diff 8188 RMD160 4e80c6879a48c5aa5fbf207f0c2cff7d540ed25e SHA1 481acb9b93b9699437e4d9a979cbbc7e74fe7516 SHA256 acf2d47c03c03178fb75c59bd67222816803ddb46c337b1e3f8e518f95e0ca11
 DIST wis-go7007-linux-0.9.8.tar.bz2 136517 RMD160 d3336efeac890848851506d6079df10d2ffd34a4 SHA1 6732d890f964a086ea5c3116a921a9eafce40c26 SHA256 efd7600d881fc57e0484ddd7f0820c18a3bd98dce8060418dfba1626c8a79b1a
-EBUILD wis-go7007-0.9.8-r1.ebuild 2906 RMD160 e6caac034c54d2f83257fae41d83241ebbaa44dc SHA1 16fe71b098058c27eb3cb18cc5c7a0f62fe39de1 SHA256 f116d93c960736b4899992dc7c731b7b0de8ecd4060fe84bd32e8ae4ca7684b0
-EBUILD wis-go7007-0.9.8-r2.ebuild 2974 RMD160 cc2f45953cd8f2612bb6c7d8ad956ef3db5671f6 SHA1 826f2b155304e91b1381a23c926a27f223ab6e1f SHA256 90d41bef3d61b1a7bbd77425be8ab8dceb4fa20c7e4766595a7636a876534978
-EBUILD wis-go7007-0.9.8-r3.ebuild 3113 RMD160 d929dd76afc320a97071b8c4d041f873ab796c4a SHA1 2407ca86db0e5199885d0529147572b8e8d1efe9 SHA256 3074e749e08aab34c25fd35a2bd10e9a1656beba8dbb9a87fb5e53d7c9fdc38a
-EBUILD wis-go7007-0.9.8.ebuild 2731 RMD160 13ddd0a5f98139b66a6ec71ee891820208ccf8bc SHA1 cee8f0e50e1bdc38220b64e339e7df2b1b99b486 SHA256 7c8edc13ea5b1f5e37a6102b80e55fe6896f8c53358c52c4ef46f70b864b6fe3
-MISC ChangeLog 1637 RMD160 9d40335c1d9a8503affa0d083faf08aceb25ee10 SHA1 b53293c37e4d2662341b3a02be6ba75c902ce50e SHA256 4f72b1b7c32e82ed02ee74e890dc88a51b3626c0960a02cd7d03e03a6763fd9a
+EBUILD wis-go7007-0.9.8-r3.ebuild 3090 RMD160 8acba90bddf29f9ad42879ea52a429c4f5885a99 SHA1 0e06779d98a84aad5a92a31dd6e6072ac629b3a2 SHA256 a13c62ea49b9ab75f39635dbdb2678fb2b84dcaf5689519e9ad44f158077babe
+MISC ChangeLog 1865 RMD160 36c327da00fdbba4c67cc6936de1dd4fb008ddab SHA1 1ed1996034fa774f035205b84b88fe02fbcbf1b2 SHA256 339ed1f10ff664f5d9b52c3029af34f8ce8c490ef5e4527dc859ed142ec686b8
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk28kj4ACgkQCRZPokWLroQLbQCfbv5I6yrx1byArEYm2D9JDJEk
+iWUAn3qnhbWwpjleRNMu+EfU5Mzq3Mft
+=Pgh2
+-----END PGP SIGNATURE-----
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"
-}