summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-07-31 16:34:37 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-07-31 16:34:37 +0000
commit0c713e3fbfa1f5f830fe21c7ce8e83a12149906b (patch)
treef5ae00c3c39433c2455e92b12ea11e4a2d245228 /media-libs
parentBetter package description (bug#479112) (diff)
downloadhistorical-0c713e3fbfa1f5f830fe21c7ce8e83a12149906b.tar.gz
historical-0c713e3fbfa1f5f830fe21c7ce8e83a12149906b.tar.bz2
historical-0c713e3fbfa1f5f830fe21c7ce8e83a12149906b.zip
add emul blocker so that it is stacked for medialibs -r6
Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libv4l/ChangeLog5
-rw-r--r--media-libs/libv4l/Manifest14
-rw-r--r--media-libs/libv4l/libv4l-0.9.5-r1.ebuild9
3 files changed, 13 insertions, 15 deletions
diff --git a/media-libs/libv4l/ChangeLog b/media-libs/libv4l/ChangeLog
index 63ba39f29f39..b13a7ae202d0 100644
--- a/media-libs/libv4l/ChangeLog
+++ b/media-libs/libv4l/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libv4l
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.93 2013/07/31 10:39:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.94 2013/07/31 16:34:30 aballier Exp $
+
+ 31 Jul 2013; Alexis Ballier <aballier@gentoo.org> libv4l-0.9.5-r1.ebuild:
+ add emul blocker so that it is stacked for medialibs -r6
31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5-r1.ebuild:
Remove now unnecessary emul- baselibs USE="development" requirement now that
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 5119672a5366..3d4d5cef6e96 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -5,18 +5,14 @@ AUX libv4l-0.8.8-drop-Wp-flags.patch 727 SHA256 523b5da5faa4408c4699097bd387d256
DIST v4l-utils-0.8.9.tar.bz2 460681 SHA256 3e5511c252b3c320d0b03418f7ee19b42d00ed0871c6b525779007416e46d08e SHA512 3778dbd4d0bb44c6f4762a8551625c1f5bfcf7a10de33c71c2442483d496bc177aef979b747b327f4eca3229fc22eec484de7308588acf9fc48ae6d1d5edee40 WHIRLPOOL 346d2c23c5e8b8ac3128100cf660b1f4880ec5fffd3fa107accf7f536adeacc945cb9aadd61f2f99a6fd32bd7a44912680d2cf867f0a84f28c949707634c676f
DIST v4l-utils-0.9.5.tar.bz2 975311 SHA256 6c9f1be981d5763069e0969ebe426c39da5a7d738865367e390e3b486f1b502c SHA512 219a789907279ce4532d53989f1efe5cac7bbf0971a215c4e6e42228510c88f52ed2d7a4ce80d2f6673af9c0e5acd99160b6b3e6475f7a7a80534ce867a52a63 WHIRLPOOL 716e7a8ff82b899ea18772a36d5520c5242effbff819bf30e73c7b29d087f0ed055a013fb20c469660317acf1f2df826255ce564ed318468cb0f72af39ebf47a
EBUILD libv4l-0.8.9.ebuild 1086 SHA256 d383127c6f5b57c076e4a7c8b1502063e60643152ff1f6570e444dc7c635b3e8 SHA512 e1df5776a5e7145f319e9586d646b7b438a703f209ded21a122ad96aa4b9283020dca27831401f1be47480d24bc96e8c44c11593fe3fa0aef99af44b75bf0272 WHIRLPOOL 782b73bf58954fc28647b79c5165949a55a912e7c20e1ce75191957620b0f3a44c332bec6cd5f68b3d9086737dd2386583251f9c6e3d9daea7ea9901eae3fa9d
-EBUILD libv4l-0.9.5-r1.ebuild 1543 SHA256 1b2872de021977f451762dc51dda0508768329a9e1d7de380763faf6c32289da SHA512 572c954c094bd919b9473eddfbcf877b2149763501920db51e71043a415b62c1b7359b10d39f169477b2a7f1286cba0b10e13867456812ce464de8a2501940a2 WHIRLPOOL 7ce2cacced52367bb7b549b65d340ab1b811e25ead02a9e58a9e3cc83a2515e8a7f0656f1330344848f2ae23fd8cbd495d061fc4047f042a15a7b2bcafa6c012
+EBUILD libv4l-0.9.5-r1.ebuild 1509 SHA256 5c5910a933c7ce05d6c2c19013a5d5600930011d1d8f47ab9156f8c47f52ecb7 SHA512 7cb6f550e44ff60edf634c0bb4a6527c01539e181d4f58ad4ce45355bc0b3b89ee68206d92b984b913c41d86046cad55fb9cee5ab5ff5c3c646daa6c31dc86bd WHIRLPOOL f7306877eb945cb33f6c72dba64c59d0f30b9715e98ae9320f43d8e7dd5e7124279c3b3d1cf097cf169ee3a99cf2324370a3272150b7ae2074b84daa9c663b20
EBUILD libv4l-0.9.5.ebuild 1168 SHA256 af34a01ba7218f2f0198cf598a40038485b75827dca6e1b2cd7ef3fbe33facd6 SHA512 6e4b80511734c2891425540f2ff5c626bebb6259feb3f5961da43ae91ef44466e648969cf4389acb98db782f53acd6990ae303c1c5ecc5658a977ffc1203ea1f WHIRLPOOL f47a4909811ef55020ae6a8acb93d07c3dfce733a828483e3f4ac11cad2519246e2732119a87bc12ed1bb3e210d0481e813f2ff093287d074260435ef7f0037c
-MISC ChangeLog 11770 SHA256 0808079ecb82ccb21bb1b5b111387c0f922ddf0159ba3cc85116688e2af40cb2 SHA512 56b318c8e5caffd0272fd075e08b0923eba093986ca849594dcef3443557f0636e6ea100b3658883035ba3bac6742f5ba524dffc35af4fc6c4156e3ec95bea49 WHIRLPOOL d8ae2400c068b3d1cbdf0564bfa719c8c420682c96d3f7f39b1ddd85cbf6d60c48f17c47dc39e826d01872ece88e3d38cf8fc06bc9ee33706fb2b238fbdf475b
+MISC ChangeLog 11905 SHA256 511a8985b5f1a3c1eafb11cbca862c25dbbddfb39a84fbff45b6e472891982c9 SHA512 d9027619f06a17d202311ca40e3bf6fddef5b342f12bbea8c6d728d75d7da6ff189eb684d3c2988778b3d3ff865a7043e3a830d8b6b6071492b48a0b7c2e2f6f WHIRLPOOL dd1d8b138730eb37d875bd046e63c6ff082986573527382cc74383a6691cb55a27b9c08d88c755ecffa273cdc0fa14d6b5707a2a001c40e78a9b6ba9a39b4ab8
MISC metadata.xml 1135 SHA256 3aa2704309b6a8c6c1d407871f5765ae9a35875f83ea140f24d67639f1926c1e SHA512 e051f1b40363405e66d863331f965e643722474eb83250a998a4d920b86ab615d217e1aff251651b2b70aecf938708a5d7669fab21e8586b5c95472edf35042a WHIRLPOOL dd1ccf47f383388c51c6ac1e904a05e569dcec6473728c5464d6424aed5676c82d498126958254c14b70dbaf3ef7be1a23bc36d098dd7e50ff3a07c502455fa6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJR+OkcAAoJEEdUh39IaPFN60AH/jUFhfGzrD484i/br6HQN5Hj
-Dvb0qi83yHUPC0ZCr9CP7GBxP41dNqgNkewOkTmqnXPwy7IO4MgQDHUYFPBh/qe8
-U0DCnxD6JO2TziqxstwG/8jv7zkjlnlDf4tI4YYwypfrURETpuQGUWH1s0qNCKUU
-MqdKGC9tRnBVahXD6dTtryH8O6MW253TqAaq+XKqyU4FDeic+jEmv4Bikkh24yZj
-Ifd0FevuPdA37dcoLw9E+oJuaRue5GXmX7G5oO1JqN1nHGctdSABFDhRPU97tlH6
-yUaKaAhVz5mPdut6YUID3NYph+fwtayG2ghfR1uMiNg4sB/6XB6bHc8jwNWE0d4=
-=HSpI
+iEYEAREIAAYFAlH5PJgACgkQvFcC4BYPU0pcDgCfda9kDGYmWO8Rl99KiLJ7+sxC
+CFkAoIA8/kmEN+lOLVbgAXDZjxlyUapv
+=dQpK
-----END PGP SIGNATURE-----
diff --git a/media-libs/libv4l/libv4l-0.9.5-r1.ebuild b/media-libs/libv4l/libv4l-0.9.5-r1.ebuild
index 4ddb1468eaa8..373ff22b8d48 100644
--- a/media-libs/libv4l/libv4l-0.9.5-r1.ebuild
+++ b/media-libs/libv4l/libv4l-0.9.5-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/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.6 2013/07/31 10:39:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.7 2013/07/31 16:34:30 aballier Exp $
EAPI=5
inherit eutils linux-info udev multilib-minimal
@@ -22,10 +22,9 @@ RDEPEND=">=virtual/jpeg-0-r1:=[${MULTILIB_USEDEP}]
virtual/opengl
x11-libs/libX11:=
!media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2"
-# FIXME after emul- is bumped
-# abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2
-# !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+ !<media-tv/ivtv-utils-1.4.0-r2
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
sys-devel/gettext
virtual/os-headers