summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-07-13 22:15:36 +0000
committerMichał Górny <mgorny@gentoo.org>2013-07-13 22:15:36 +0000
commit1943c9b753dcbc00a91209040d2849577bff4431 (patch)
tree025c9b54130cc1d06a650466e2360b49ed282b39 /media-libs/libv4l
parentinitial import (diff)
downloadhistorical-1943c9b753dcbc00a91209040d2849577bff4431.tar.gz
historical-1943c9b753dcbc00a91209040d2849577bff4431.tar.bz2
historical-1943c9b753dcbc00a91209040d2849577bff4431.zip
Add abi_x86_32 blockers for emul-linux.
Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64 Manifest-Sign-Key: 0x9627F456F9DA7643!
Diffstat (limited to 'media-libs/libv4l')
-rw-r--r--media-libs/libv4l/ChangeLog5
-rw-r--r--media-libs/libv4l/Manifest28
-rw-r--r--media-libs/libv4l/libv4l-0.9.5-r1.ebuild6
3 files changed, 26 insertions, 13 deletions
diff --git a/media-libs/libv4l/ChangeLog b/media-libs/libv4l/ChangeLog
index 7f14a250342c..6309ecff2fea 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.90 2013/05/05 01:16:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.91 2013/07/13 22:15:31 mgorny Exp $
+
+ 13 Jul 2013; Michał Górny <mgorny@gentoo.org> libv4l-0.9.5-r1.ebuild:
+ Add abi_x86_32 blockers for emul-linux.
05 May 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5.ebuild,
libv4l-0.9.5-r1.ebuild:
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index f0fcac010d88..b7a1c9f4852f 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -5,18 +5,26 @@ 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 1455 SHA256 2bec70a98ab9f12854c1405b37888cbf4a831987def9e02d7afc6d073c0b2cda SHA512 4eb0344a681e251fefd086bde6f793fc5b4b2df439d7fd86961b6e42654daef1e822d035e67205dc6d3cf972a283c10b0e7c9d570423099fc63cc064f88d4af5 WHIRLPOOL 2750a9b555c0dfe2130a092e667eb459776683611df6195caa160f5b3d824611154f7fa659cb32d005a87af5d355aae339df85f7db1689bfee76bf09d6c11c93
+EBUILD libv4l-0.9.5-r1.ebuild 1581 SHA256 508ab000eda9bcc92192d7fb965567e774c91d20618c72fc0a3f6b29fa19eaf7 SHA512 2141f3e4fd4d5a5bf3efd51da645a4dbddbddd04845b34a1ed31e7dfba037bbf2e3433c843d34f9789dedd3957aa30257568687061c6dea40e50cdbb0916b5d7 WHIRLPOOL f298a16fb7b29a64fc8fb90a521cca49e96f9f21e4362a2e11eda40427e8650ac79004d92e854e94945d06a1c849df0e0e7f86a78c870134004ce1314ef15a21
EBUILD libv4l-0.9.5.ebuild 1168 SHA256 af34a01ba7218f2f0198cf598a40038485b75827dca6e1b2cd7ef3fbe33facd6 SHA512 6e4b80511734c2891425540f2ff5c626bebb6259feb3f5961da43ae91ef44466e648969cf4389acb98db782f53acd6990ae303c1c5ecc5658a977ffc1203ea1f WHIRLPOOL f47a4909811ef55020ae6a8acb93d07c3dfce733a828483e3f4ac11cad2519246e2732119a87bc12ed1bb3e210d0481e813f2ff093287d074260435ef7f0037c
-MISC ChangeLog 11339 SHA256 91d3d5a5394003f80a8353276a99099b3ebf20f409fd6e6c9c4fb418bbf6e8ff SHA512 93ce6ce7b1ac64a519ab1a6b90de5f60faf3330816d185e1be58e10cfc27fe937efa6aa822ef53b454d8fd2fa411c52f23797f826eee2edb243da25508a3ebe5 WHIRLPOOL 154a2565c35cc44b81fc97441ba426a512e0a42e8919d461a8542736544669f5621c240119daa52dce2dc7038b02e86c663aca485516fadf36b4f6785732a59d
+MISC ChangeLog 11453 SHA256 6cf9606e911fa78d478fc3a327228ebba10c382f6b8c2d6b9ea24eadff597c5c SHA512 2353ef2c103542d93907a135891dfe8d9ca1ed2d8b32a600d43c3b52125919db254832203e588f2fe1a6416691b5bf4e8e65745b6341ab946bbd94ecc0184e4e WHIRLPOOL 4cb837899393bfb2b374991562d2d3e26274f1c8c264cf58e665f931b1f19e981697176933528dec8c54d2637333dbff7a3176f3a021e08af96fab522be37134
MISC metadata.xml 1135 SHA256 3aa2704309b6a8c6c1d407871f5765ae9a35875f83ea140f24d67639f1926c1e SHA512 e051f1b40363405e66d863331f965e643722474eb83250a998a4d920b86ab615d217e1aff251651b2b70aecf938708a5d7669fab21e8586b5c95472edf35042a WHIRLPOOL dd1ccf47f383388c51c6ac1e904a05e569dcec6473728c5464d6424aed5676c82d498126958254c14b70dbaf3ef7be1a23bc36d098dd7e50ff3a07c502455fa6
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iQEcBAEBCAAGBQJRhbL2AAoJEEdUh39IaPFNjK4H/iYe62BPReQdTlGIFwSFo/cw
-NWLUkFXoRGVKjn4Nt8ZszLGULqU+EOkJxGHvvRUx+BIR6RkM4JHVnvLwKsrVyfdS
-CTXsBE+WC3ps2Sp8Nq0FoiQajKQy+NVfc8GG1hPpgYlgk/MrnaDrQPDmfLPonQT8
-caHDLqL7jKjXmdjtEeSorPeAQMHGN20tGt0vg1JQobdkmFpLdJQMYmc6FZFYMv2k
-LeoJ5xZFFaZXa72DKTcx9adsKnafSofD4XNqtNU1rjJfIRf3CXqvddXwMAXlh87R
-ifdmdNWgo40cR+/b7vEW+RtlmqbxQkbPVxOLfqre0wj7vmemk5OZ+EarWjYscM4=
-=VXPR
+iQJ8BAEBCABmBQJR4dGPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDJfMP/AqmRzp8olS8GAo8hpM1ah2X
+AalLEKg++AY8CTn+aDbVPSx7ulxAJYAopA3d/hazOWfzuduKxFxCyWjBG1mR6Kdr
+ZjnqQyRjfdBgGX68BcSxp596d5YTFI8MIoI1+osp238h/llMyn6yoz83IRbHpDXR
+EowXsQzhBKOjVOnhJmRVY+3NSuPfx2a4Lod9BgxaOH8DAprURxsn9uowBwzbqrd8
+NdF9ZXS4qsSoZa9HZreDLmJv7M4A9Pnzcb2q7JGksCtP/h3m4HX7SbldsT9SVQf9
+e96z5DHuHqBO/bXDw5qWahRvNn+qDkUqtCr739mPQAVKaHho5MOKHE0uuoszmNaI
+rQApU5epT/WY0Dubws1KngMDgEcrapwNaufPbDWUvyTm3mHL5IrTfsbdkBRjnSkr
+xJZdiP6JtU3L3V4JD3yRWQPItjZjjJcPsZpsfj6pqTMI6RJOT2F7pO4aMZz4OWfz
+lAcS3S/tEyn3Vl4XWRM1qArmOPnblQlf16XVEyVIe0JQH6nei2qfB58JOQ7FXLB1
+ejkWhB7O3r6r7nBiIcwQoTnv40BPM+JwoFMnnwni42xBP2RVyGcBCB+wQYEzsT7t
+Z8q5U/kwReX2qH4fHXnv4YyHZC4ubWpzwmLgD7dt9OPH6k+K7AukQTezDT9QIGOg
+K49oYu31DI67m/o4j10/
+=RCdy
-----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 8929e6604481..d72ad13d6014 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.3 2013/05/05 01:16:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.4 2013/07/13 22:15:31 mgorny Exp $
EAPI=5
inherit eutils linux-info udev multilib-minimal
@@ -23,7 +23,9 @@ RDEPEND="virtual/jpeg:=
x11-libs/libX11:=
!media-tv/v4l2-ctl
!<media-tv/ivtv-utils-1.4.0-r2
- amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) )"
+ amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
sys-devel/gettext
virtual/os-headers