Pull in correct SLOT of libjpeg for headers.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 19 insertions, 11 deletions

diff --git a/media-libs/libv4l/ChangeLog b/media-libs/libv4l/ChangeLog
index b13a7ae202d0..8c013fb794a4 100644
--- a/media-libs/libv4l/ChangeLog
+++ b/media-libs/libv4l/ChangeLog
@@ -1,6 +1,10 @@
 # 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.94 2013/07/31 16:34:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.95 2013/08/05 09:46:43 ssuominen Exp $
+
+  05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5-r1.ebuild,
+  libv4l-0.9.5.ebuild:
+  Pull in correct SLOT of libjpeg for headers.
 
   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
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 3d4d5cef6e96..19563eb5a8fc 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -5,14 +5,18 @@ 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 1509 SHA256 5c5910a933c7ce05d6c2c19013a5d5600930011d1d8f47ab9156f8c47f52ecb7 SHA512 7cb6f550e44ff60edf634c0bb4a6527c01539e181d4f58ad4ce45355bc0b3b89ee68206d92b984b913c41d86046cad55fb9cee5ab5ff5c3c646daa6c31dc86bd WHIRLPOOL f7306877eb945cb33f6c72dba64c59d0f30b9715e98ae9320f43d8e7dd5e7124279c3b3d1cf097cf169ee3a99cf2324370a3272150b7ae2074b84daa9c663b20
-EBUILD libv4l-0.9.5.ebuild 1168 SHA256 af34a01ba7218f2f0198cf598a40038485b75827dca6e1b2cd7ef3fbe33facd6 SHA512 6e4b80511734c2891425540f2ff5c626bebb6259feb3f5961da43ae91ef44466e648969cf4389acb98db782f53acd6990ae303c1c5ecc5658a977ffc1203ea1f WHIRLPOOL f47a4909811ef55020ae6a8acb93d07c3dfce733a828483e3f4ac11cad2519246e2732119a87bc12ed1bb3e210d0481e813f2ff093287d074260435ef7f0037c
-MISC ChangeLog 11905 SHA256 511a8985b5f1a3c1eafb11cbca862c25dbbddfb39a84fbff45b6e472891982c9 SHA512 d9027619f06a17d202311ca40e3bf6fddef5b342f12bbea8c6d728d75d7da6ff189eb684d3c2988778b3d3ff865a7043e3a830d8b6b6071492b48a0b7c2e2f6f WHIRLPOOL dd1d8b138730eb37d875bd046e63c6ff082986573527382cc74383a6691cb55a27b9c08d88c755ecffa273cdc0fa14d6b5707a2a001c40e78a9b6ba9a39b4ab8
+EBUILD libv4l-0.9.5-r1.ebuild 1511 SHA256 d0a13f46895ed2162bbe570efd58c2a5cd3ee17a20baaa46c1c024c839986dea SHA512 c1075854eefaa06e6d132c0dc5b579d0bd8c19fbae548af7c96d01bc5adaa6da1fc8c5f50d8a6e1737a22ac6dc5d06455099616629273173d64b8ca15c576787 WHIRLPOOL 4c94eec1cf739783b4983a367aec37c01efae0ff59c69177de681f042c3093d41d0c398983a7c2de5303316900b824995cb18ea7a54d26e93e6155eab27a9832
+EBUILD libv4l-0.9.5.ebuild 1169 SHA256 9922024c3fd79502d15818ddf52095ac2e62e95adeb930743659a465260be12a SHA512 e91aec36967e2295ede2459118ad6f4f066211a3a6ced518ea741d33b5b73f7ba4ec6c36cc94a0f1f35dc70fc2f2951728b8f01a4e2d5bf8c741a1825723dff5 WHIRLPOOL 8445fbbef280645bb11c6216f2f4e9bd27abce1c3316b4c7c1822574807106e2c268418726053a8d5b7a06c93b3a3b290f5c278621ffd4a3f045dd9e2f0746a2
+MISC ChangeLog 12055 SHA256 cfda63307c68e4efd2048279e0cd01e14f5c06c9b8688fd01832710b51bd41f2 SHA512 a2723f54253fe5763016f22c7d1f9df1d1f08755ad54e4ef33618425b9cc6647db69ef81d79ed40e653c98f49a58e9a298f328236374bb52719b0a2b828f506c WHIRLPOOL 0bcef34dd56bf63d07a976219ecb8680928ae0df737a1a17212b31ad20f6575b81add4ab773e62c27d1f8bcfb0b9b639cd3e28d0c52654c1868829802baf97a5
 MISC metadata.xml 1135 SHA256 3aa2704309b6a8c6c1d407871f5765ae9a35875f83ea140f24d67639f1926c1e SHA512 e051f1b40363405e66d863331f965e643722474eb83250a998a4d920b86ab615d217e1aff251651b2b70aecf938708a5d7669fab21e8586b5c95472edf35042a WHIRLPOOL dd1ccf47f383388c51c6ac1e904a05e569dcec6473728c5464d6424aed5676c82d498126958254c14b70dbaf3ef7be1a23bc36d098dd7e50ff3a07c502455fa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH5PJgACgkQvFcC4BYPU0pcDgCfda9kDGYmWO8Rl99KiLJ7+sxC
-CFkAoIA8/kmEN+lOLVbgAXDZjxlyUapv
-=dQpK
+iQEcBAEBCAAGBQJR/3QdAAoJEEdUh39IaPFNv0YH/Asahcgb+0kHGl4IxDw6wsuu
+2wOR9bm6w9tEMJqULkanokSDUsBeBq/UIkYXkmVgy3RU9C0vX8CtvvyMIQxe3rn4
+SDUSZPJS1smfJvpMqiVoU9f+w1Viv9DAqwmwkFHtETsTH/eseA5eu4HRQ1FEJslF
+T6RgmnSty+T4j79BukHtD3Q6cgNQNI9zov4sHkHyRHCB2wDtlThlDPGH+EEYUNBk
+HG9N6wUF052ylk6GL74pdBOZT0GHpmNDUSWYpahZyHYpun7uzdK3fvOqeSgi/tif
+YdvX66MKz3GvToSPfBNnUZYQ8YQwJ4gVU9IBsawbL0klsEH/n3HjSlGLOGPkyPU=
+=oYWR
 -----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 373ff22b8d48..e274ef1c8beb 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.7 2013/07/31 16:34:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.8 2013/08/05 09:46:43 ssuominen Exp $
 
 EAPI=5
 inherit eutils linux-info udev multilib-minimal
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x
 IUSE=""
 
 # The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND=">=virtual/jpeg-0-r1:=[${MULTILIB_USEDEP}]
+RDEPEND=">=virtual/jpeg-0-r1:0=[${MULTILIB_USEDEP}]
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11:=
diff --git a/media-libs/libv4l/libv4l-0.9.5.ebuild b/media-libs/libv4l/libv4l-0.9.5.ebuild
index 1f06969f1d07..cfeed35e993e 100644
--- a/media-libs/libv4l/libv4l-0.9.5.ebuild
+++ b/media-libs/libv4l/libv4l-0.9.5.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.ebuild,v 1.3 2013/05/05 01:16:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5.ebuild,v 1.4 2013/08/05 09:46:43 ssuominen Exp $
 
 EAPI=5
 inherit eutils linux-info udev
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="virtual/jpeg:=
+RDEPEND="virtual/jpeg:0=
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11:=