Depend on older xorg-server as suggested in bug #461534.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

4 files changed, 16 insertions, 6 deletions

diff --git a/x11-drivers/xf86-video-ivtv/ChangeLog b/x11-drivers/xf86-video-ivtv/ChangeLog
index cec9956c5c83..949d39034b0b 100644
--- a/x11-drivers/xf86-video-ivtv/ChangeLog
+++ b/x11-drivers/xf86-video-ivtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-ivtv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/ChangeLog,v 1.23 2013/07/12 08:54:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/ChangeLog,v 1.24 2013/08/27 12:22:47 chithanh Exp $
+
+  27 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xf86-video-ivtv-1.1.2-r1.ebuild, xf86-video-ivtv-1.1.2.ebuild:
+  Depend on older xorg-server as suggested in bug #461534.
 
 *xf86-video-ivtv-1.1.2-r2 (12 Jul 2013)
 
diff --git a/x11-drivers/xf86-video-ivtv/Manifest b/x11-drivers/xf86-video-ivtv/Manifest
index 4ccc87ba9677..309faf600166 100644
--- a/x11-drivers/xf86-video-ivtv/Manifest
+++ b/x11-drivers/xf86-video-ivtv/Manifest
@@ -1,8 +1,8 @@
 DIST xf86-video-ivtv-1.1.2-r1.patch.tar.bz2 9418 SHA256 2623f51cce4724cebffc0a38738a9fa360be114a4d22cc3fb926e240cd034b91 SHA512 751e52d47853bee79fa80396f2e8fecaa2c02bc4b0a45703c7b0ee2b70915a1a55dcf70a29441bad566bcbc389250a1692c1ba16b84fe14c3cd7056460d3251f WHIRLPOOL d66cf37c7e47fb806a7c9e81b6989bf7f5b20f82b1e7b2fcc5a65ba559c09cabc5e9977147c9b00f26cff0638b24164f29a764b58aa481df4885e09fabdb64dd
 DIST xf86-video-ivtv-1.1.2-r2.patch.tar.bz2 9565 SHA256 22a2a8d7e17eecc2d4549f6a73080b071d9075f20230da01b21804b247ccb67e SHA512 5b96375ea885dec713b5321f6f6554c0bd9b047b76abd4cf4baa1605466c7ab7612802c43674166a6397f0fa6a6c81d31805923cc342c710184a895a919f1270 WHIRLPOOL e591ba8d9c7bb6afe4ae8aea41bd7a95e9c883a2afc2f2ef503d3d171b92903d720cf23bb44648b627c0807858fe2ed8000f7f55cc961da1b0df16a326c29dbe
 DIST xf86-video-ivtv-1.1.2.tar.gz 303046 SHA256 863f449ec9dc9b2a2a15c8305660267a3365c72fa2e805d1e311dddf2791c938 SHA512 d5decad6cbd1d09372a8393373608b9f07a673e8d8c1de08dc0188330861f9da3e221c0147e2da97f26d8344472e9cdbe30fa5c6386d0bb21b18f3e2f37930d7 WHIRLPOOL 597cc7a2c59aba99a5ececc150839b55d0ef98790fcd77c608dda0d1330672e0c731359e25a03920c9d66a75eb61e8518d3020766537878f6cdabfe3f2e3450c
-EBUILD xf86-video-ivtv-1.1.2-r1.ebuild 604 SHA256 9d7c8c51ed5b334e8bef3560fdc9cd56044e91ba4ed3a698b8bb94b0389a55b7 SHA512 cc9e562e9a56e675ee8a8c81b4a12175ce392ee390687901ca796c267fa8692b8e8960bb61144ca043292ef1b19aa4abd57ffc810e8b5834ab5086eedbb73545 WHIRLPOOL ed2b9d3db42cc62ac31107a473f3806fc3df4741ce3d69f14bf7448fc24903d94118eb52da363d032fbff93d7b042bbccefa6d1c14d4c170a2cc9f948a75d195
+EBUILD xf86-video-ivtv-1.1.2-r1.ebuild 666 SHA256 5849f611821c08e54fc07b32791dbf7876ae0b06600cce730b26dcc23fd8073c SHA512 8b99742119aee35666674453e4a8eafdd273be5ad6756a41bc987e013a95612efd0709018bdb54769eb4d3bcdbff72c60499fd5b170e9784bb56a540eaea9e6f WHIRLPOOL 1b26607c8798da4fb1da815b2fabc3309f3c549d1ec127d936d2357f115b4568dcf6361d70b9a83950e321f37b3295bfa918614ca55a025c3643d0b2c641f5da
 EBUILD xf86-video-ivtv-1.1.2-r2.ebuild 606 SHA256 428972377f3ca01382989854089c8cc35fafdc9a77e3d57521923a39bf53225a SHA512 09ec76a48ec0fa11eec42da0d7a234db03381f21ac00a72ffb22f4364d0a4ec6100384b66af7bb3030e5baa613d4713f2134860da746c6613d95f8d42fa9b425 WHIRLPOOL 4c1d20258aee1710b9b59f6fb970a98cf4b3a5dc25adacf2bba58bf895905e49435fb68958cb780cb6b54b8d974b5362f64d26f9385c298ae3b568d9845d24f5
-EBUILD xf86-video-ivtv-1.1.2.ebuild 443 SHA256 b63e7075b27ff5486e78d410f349d85afa8ef6e8093121aae3c158869cc48f45 SHA512 713cb03f0d887978f50b125078e95aa3b51efffc8471191db9bbd7c930848de40392a2605914b76c59e64cf0641e82bc9938faeedebc573ec2e59b2965f4eb92 WHIRLPOOL 9169ca70790c32bf3448614ee477c661e15c95ccfd048d5ee74e56fcc00387738765995c0ab19163f8d377368dfc26d172a9631bfbc702598c877cf836f321ac
-MISC ChangeLog 4162 SHA256 bb97fd1a109aa48237b081f59daecd4d098c0409572f49d9a0ae0a233be0aca1 SHA512 007eae4e9af435a8cfa3c8e99e0af97e05ab13d6f694eda3f699ff7891d3378279d97f2937ec512904d6d98f068ad1afcafd498ec1677217a7b65387bb0e1e5b WHIRLPOOL 27625380f02b51748416f19f6de6327575ad2fcddf2a35e350138704324384dea368d8a12cd44a14a7c887cea8f059180d2e2fb51963c1c4ab62ef2818078955
+EBUILD xf86-video-ivtv-1.1.2.ebuild 505 SHA256 6b0853f4ac4174e2f5c433f2bdf77866cb167eb58f2c4f054a489169b66cf376 SHA512 25edd91e4ae963655d5aa566f1a017b110788bb26e3a3086f01613d861708179acfc1e72a2a4187a5c8fec7e0677523c210e25f740da1e2f6e7f2b49ab9fe33a WHIRLPOOL efa33dd582bf53f44f779578fdb762de28ec9581f2b054dc0f515bda3c41548daf843d3a0b55fec457094dd36b9a80dfffc01d92b80224bb6dd1dbcbb2280d29
+MISC ChangeLog 4356 SHA256 fc7b0fa0ce0f08ea4cf491133697f1fe3a322dcbe6b86d2b1d81b1036ab094a9 SHA512 d74d9f482ed29ff1d6ed25d5b78f98246d15964cdf531e5b30dee81259cad4ea57b8e025cb417da78950e808a741a148fb1bef467dd4f0984b75f8c3f6d2c15b WHIRLPOOL 3bebfd98da5cc78890a104f564a08b7a4a258479dc3ada57d50de6c99c7c26b19b35e018b819149a31f8fd117314e078598464e268e07dcc408fc8e8b161ed88
 MISC metadata.xml 304 SHA256 5d1948256efe3036c87ae2431c81e91d369a4c1cc32c02e8fb50f76c5dd372dd SHA512 6c6bb3d946f41b3fc45b9d97585a0ebc4cd53889ff7ccbce6f6fcb6f6be627d743d839103d35c9881548bfa01b4bae3b2fff9faef6c9572e67ea0cbaf09face0 WHIRLPOOL 45b2703d01c0ff7467453ac83d8ff021b6d187af92710a39ba44ce670c6b15dc70b5fbea35c324a0487333190a846737dca5511046ef183a5851df02d5d45229
diff --git a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2-r1.ebuild b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2-r1.ebuild
index 159f0de42118..a488ef2bd6e1 100644
--- a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2-r1.ebuild
+++ b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.1.2-r1.ebuild,v 1.3 2013/02/27 19:44:27 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2-r1.ebuild,v 1.4 2013/08/27 12:22:47 chithanh Exp $
 
 EAPI=4
 inherit xorg-2
@@ -14,6 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND="<x11-base/xorg-server-1.12.49"
+RDEPEND="${DEPEND}"
+
 src_prepare() {
 
 	EPATCH_SOURCE="${WORKDIR}" \
diff --git a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild
index 62721ce89bb2..6fd494ad7ef6 100644
--- a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild
+++ b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.1.2.ebuild,v 1.4 2013/01/31 02:06:40 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild,v 1.5 2013/08/27 12:22:47 chithanh Exp $
 
 EAPI=4
 inherit xorg-2
@@ -12,3 +12,6 @@ SRC_URI="http://dl.ivtvdriver.org/${PN}/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
+
+DEPEND="<x11-base/xorg-server-1.12.49"
+RDEPEND="${DEPEND}"