Remove dead version and move imake to DEPEND, fixing bug #221431

Package-Manager: portage-2.1.5_rc7

5 files changed, 13 insertions, 62 deletions

diff --git a/x11-drivers/xf86-video-ivtv/ChangeLog b/x11-drivers/xf86-video-ivtv/ChangeLog
index cfb1355bc842..b082cc6196f4 100644
--- a/x11-drivers/xf86-video-ivtv/ChangeLog
+++ b/x11-drivers/xf86-video-ivtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-ivtv
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/ChangeLog,v 1.5 2008/04/27 12:32:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/ChangeLog,v 1.6 2008/05/11 23:36:01 je_fro Exp $
+
+  11 May 2008; Jeff Gardner <je_fro@gentoo.org>
+  -xf86-video-ivtv-0.10.6.ebuild, xf86-video-ivtv-1.0.0.ebuild,
+  xf86-video-ivtv-1.0.1.ebuild:
+  Move imake to DEPEND, fix bug #221431
 
   27 Apr 2008; Markus Meier <maekke@gentoo.org>
   xf86-video-ivtv-1.0.0.ebuild:
diff --git a/x11-drivers/xf86-video-ivtv/Manifest b/x11-drivers/xf86-video-ivtv/Manifest
index 1f8ea09cd3e1..02dd3a185245 100644
--- a/x11-drivers/xf86-video-ivtv/Manifest
+++ b/x11-drivers/xf86-video-ivtv/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST ivtv_xdriver_src_0.10.6.tgz 18822 RMD160 16d75d78fb786170dd092c4a26cbe6b8420daebb SHA1 c8349662caac42b5b04cd6dd2ba80705c49f3b97 SHA256 0dea841bcb88fe1aef6ecbd9ca2d2331b3dad6e27a2a40d85604d2890b31d269
-DIST xf86-video-ivtv-0.10.6.patch.tar.bz2 7692 RMD160 f6e6ab7080afebc66f32709b1bbd86cb93ced384 SHA1 94618dcf691ae0f3553bc300461eb1115cb0cd0f SHA256 116ad0596c5ed17ddf9da91ad406a7816caf8c65af0a4c7bf7b5c97bd39c9d54
 DIST xf86-video-ivtv-1.0.0.tar.gz 338516 RMD160 0d8dab2d9ce0e0bddcdc83fc62c8bed39ea9b907 SHA1 b6346a40f287455e1a7fb294227ce76f1082bb6a SHA256 e98a2ed67fea25ab7f94eecb5a53a2d3a3c42de93557d77d774fa18d311c807a
 DIST xf86-video-ivtv-1.0.1.tar.gz 338635 RMD160 dbb0ee83a58d02b7e60b09d2981d93d8b26e4505 SHA1 398d8aa6696e850d78711a343af46a61f8c7e51c SHA256 a3e1502240510b61d3a8c78faa8a750e040380917ee0833ebbd478f8c042d916
-EBUILD xf86-video-ivtv-0.10.6.ebuild 1061 RMD160 fdfd7583fdb7363dc1aaf5682ad3f5897b1bfea9 SHA1 df8d57c1df066c4828e9d4b804245230d30e1586 SHA256 4d35ec5ad8feb7b87931ba428022ccaffb3e06df36e3a171ca1697a0377f2db1
-EBUILD xf86-video-ivtv-1.0.0.ebuild 828 RMD160 323373882b2995b0612e8e3d9da94917f394b078 SHA1 fddbddc69868f5647ebd52a09ae37e69ceded795 SHA256 d5f6bd2263e92a0010803113c0c0cf404c69b584fab9df7653312590e04e5e0e
-EBUILD xf86-video-ivtv-1.0.1.ebuild 830 RMD160 1c52a30a9d2545aec61f70ade42f473597d9ac2f SHA1 8a8220e81b480acb43b50e5b16bfedf67a84352d SHA256 13c2f5b0ba45d8283a7e740ddf9a18d29879a0f778abca0ea0de06f1b58f144d
-MISC ChangeLog 1634 RMD160 76044c8675011236ecac2bf7d3819fa792cd8536 SHA1 4cea80939fffcf0e1e3184f89b1ae9fd71d26a94 SHA256 a9a4c39bd4b93126edae50d7d8c8fd4012e6a9344147b803a167bba5c2c97909
+EBUILD xf86-video-ivtv-1.0.0.ebuild 828 RMD160 7f6cf0d1b6bea100eaee30acc7c3625131d1e9d3 SHA1 50fe40a311ed38fda5d5ee42954f21659dc7bbd1 SHA256 de71e093f62438ba6a1c0a9d1c62ea59e6b1f4cd40176bd2981afcc7d0548d31
+EBUILD xf86-video-ivtv-1.0.1.ebuild 830 RMD160 0d693064b143e7633bfe74abf0af4fdc88dfc9bc SHA1 a85d50088e655415584f27480b3448b714188ad8 SHA256 d126a9ce5b9b9ddb050450b4f02f9802958f126a2ef280403b5884ec573319e2
+MISC ChangeLog 1819 RMD160 73ecae8cf0d889992ee9fdd0b1f8f7d8279c6a65 SHA1 18b89c17243e344cc3d8490c8c6942d4637b3dfd SHA256 6f73dffea1de57622d83843395fbf99ad4597620b429c9c817bc7a28cc05959e
 MISC metadata.xml 304 RMD160 dd8f44beb660d049dc89b2e820ce4d78ecb728d9 SHA1 1051710172e5a0841f5ac6f415ae7de277b4c682 SHA256 5d1948256efe3036c87ae2431c81e91d369a4c1cc32c02e8fb50f76c5dd372dd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgUcnIACgkQkKaRLQcq0GLx8ACfVLY1UT45V2v+Pz3nRP7yqu5g
-fDUAn3MBVCgyI6ORaML7/FWFuoKoTuJy
-=HUh1
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-0.10.6.ebuild b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-0.10.6.ebuild
deleted file mode 100644
index cfe10ad824d3..000000000000
--- a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-0.10.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-0.10.6.ebuild,v 1.2 2008/01/31 06:35:44 je_fro Exp $
-
-inherit eutils x-modular
-
-DESCRIPTION="X.Org driver for TV-out on ivtvdev cards"
-MY_P="ivtv_xdriver_${PV}"
-MY_PN="ivtv_xdriver_src_${PV}"
-S=${WORKDIR}/${MY_P}/ivtvdrv/xc/programs/Xserver/hw/xfree86/drivers/ivtv/
-
-SRC_URI="http://dl.ivtvdriver.org/xdriver/${PV}/${MY_PN}.tgz
-		mirror://gentoo/${PF}.patch.tar.bz2"
-HOMEPAGE="http://ivtvdriver.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="X11"
-IUSE=""
-
-RDEPEND="x11-base/xorg-server
-			media-tv/ivtv"
-
-DEPEND="x11-proto/xextproto
-	x11-proto/videoproto
-	x11-proto/xproto
-	x11-misc/imake
-	>=x11-base/xorg-server-1.1.1-r4"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${DISTDIR}/${PF}.patch.tar.bz2
-	cd "${S}"
-	sed -i -e "/DependTarget/a USRLIBDIR=\/usr\/$(get_libdir)\/xorg" Imakefile
-
-}
-
-src_compile() {
-
-	xmkmf || die "Running xmkmf failed!"
-	x-modular_src_compile || die "make failed"
-
-}
diff --git a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild
index 7f617b4601ad..e247222630e8 100644
--- a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild
+++ b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild,v 1.3 2008/04/27 12:32:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.0.ebuild,v 1.4 2008/05/11 23:36:01 je_fro Exp $
 
 inherit flag-o-matic x-modular
 DESCRIPTION="X.Org driver for TV-out on ivtvdev cards"
@@ -13,11 +13,11 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="x11-base/xorg-server
+		x11-misc/imake
 		media-tv/ivtv"
 RDEPEND="x11-proto/xextproto
 		x11-proto/videoproto
 		x11-proto/xproto
-		x11-misc/imake
 		>=x11-base/xorg-server-1.1.1-r4"
 XDPVER="-1"
 src_compile() {
diff --git a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.1.ebuild b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.1.ebuild
index 196b5d229904..01fcfb5d48e8 100644
--- a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.1.ebuild
+++ b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.1.ebuild,v 1.1 2008/04/21 04:04:59 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.0.1.ebuild,v 1.2 2008/05/11 23:36:01 je_fro Exp $
 
 inherit flag-o-matic x-modular
 DESCRIPTION="X.Org driver for TV-out on ivtvdev cards"
@@ -13,11 +13,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-base/xorg-server
+		x11-misc/imake
 		media-tv/ivtv"
 RDEPEND="x11-proto/xextproto
 		x11-proto/videoproto
 		x11-proto/xproto
-		x11-misc/imake
 		>=x11-base/xorg-server-1.1.1-r4"
 XDPVER="-1"
 src_compile() {