drop 'use_enable opengl glx' due to option --enable-glx made defunct, adresses Bug #539840

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 17 insertions, 24 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index b882e869822e..623900056f6f 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.948 2015/04/19 06:30:22 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.949 2015/04/20 05:28:35 idella4 Exp $
+
+  20 Apr 2015; Ian Delaney <idella4@gentoo.org> vlc-2.2.0.ebuild,
+  vlc-2.2.9999.ebuild:
+  drop 'use_enable opengl glx' due to option --enable-glx made defunct, adresses
+  Bug #539840
 
 *vlc-2.2.1 (19 Apr 2015)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index dd72f5595036..31910417f904 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -17,29 +17,17 @@ DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc3
 EBUILD vlc-2.1.2.ebuild 14601 SHA256 f93dfb4630cec9dc04885ee1818f9a81a0531a3c32931c8df1607b282181fd02 SHA512 f8dc44fa4d70b70c85bf1b4f5cad484deb62ead0612163b67ce5f7a74fbc8c24bddaebb98033032c0e67c18e0ea3edba1fd6f2760336453196bf47f765126a1d WHIRLPOOL d9b75b87254e9381c6ae19b60cc8bae60d587da5f4beff7d489124cdea3ac7d1fd2e2fb6d0446e90bb0e081ed75f1a751beda50285dea933c5d929fbfa0db638
 EBUILD vlc-2.1.5-r1.ebuild 15387 SHA256 97a50e19ac49cb4c9dcc6853fdceec04e4f00c1f856dbbcef1763852cd7c94ab SHA512 421f017215367523e62cac6ad89931449f76a78d439fb89b44e9a4088d6a199baddb4ffcef0726bcc94968540407ec993a9e560c53f38f1d547152cd17b4b3cf WHIRLPOOL cce9190e813c6b34fe8fde31061d98e526eeb61e06522978c3401b03b92095143e2d201c95e098dd03f61c7ac12d7fdc8e5a2d437e1861c9293a756fad427245
 EBUILD vlc-2.1.9999.ebuild 15308 SHA256 9ad081efa162ae762eaaef79510ce450ec12460fb11c864d25542828c387d925 SHA512 83864352df405eb3872a8fc3d546c91114e5fc7cbb74ed767d94ce4299787dde8fe8ee97c26fef1597809b524e7ce7a49dfd95774e3424e87ab64f122144de8b WHIRLPOOL c52b17f248cf34e86a4a469662d674ea8b223386a152488747b75a67bf8b0d1e0c6e4a8dfefab4aa7be5c804608a73be0eba539009d13ad31bc286efa0635620
-EBUILD vlc-2.2.0.ebuild 15582 SHA256 23e1bb3e2591b34a339773fea29a085122c36601c4b3c425456d10e526ceef4f SHA512 46db3ab721c3657a1d3aaa191fe79e173c39096b83e4181ea2c4e100039553f76d13a492d0579e70d215c25c12041ba19b4272b7c9a13d02ca717fa0aa4aed00 WHIRLPOOL d5bac1409c183bde19285db15fb38695a22bd2868ff660af79f26858ce5d75535e4a9d2f450e4b4cb11af5cf06cf6707546d1d355cdb360e35fc2d11d2214f4f
+EBUILD vlc-2.2.0.ebuild 15557 SHA256 3925dfdecf50c2b07063f634a68589313c72745c98c6496eba8607b52b116823 SHA512 de91c20b597770be325f472b064db2b6004b0bf856fd748d7486b4c4392c7056e6889e57a8662a3cdd7541793fb934fa711abef6c1ff8bd4de7f33ac687d79c3 WHIRLPOOL 997d3bfff7573a12630fa75c7a9ce22a97518cb2fd90848d685db1752d17fe98ca23fc7778da6e8ecf38112b053e661cb63e91085ef89a1b45231c7c2bca69eb
 EBUILD vlc-2.2.1.ebuild 15674 SHA256 a601577ddb1868aff3220b74fe5ac91a2c1975b136d12c54c3ba3b6ab1c5ffb7 SHA512 7b6e68cdaffad492435c28d64ede2468de97a195655f3cc42a924b5e2bab5ed05da5105a0f7e90d55bcd632bf27e704cb3fb62f201fb21e10082dd2490175471 WHIRLPOOL 46ad28be68c3f5d6e74b93fad42f5f27e3f4c951941ff3fcc6585b4f3df870ff6d7c958984b91d11a06d57a04c7116f674b65c8d8bea740008eeed2cd29cc759
-EBUILD vlc-2.2.9999.ebuild 15500 SHA256 5742f7434783bdadd32c62363cd4254cc15baf850c5b3941ad7ceea4f92a94ee SHA512 75ab0c7ca577d2f9e02ceba1a8aba7c7a70baf3e79ddf4ca30122ba42498af86c13592d274a741125278f39ce4d9a6a1202653f3cc8adfec53151172f87c2565 WHIRLPOOL da1c15a418b11f63261d4108990494a1d4cbf40c3777962470fc754ad5d55fc478e2ef3d4c4e42692939d7cbfab18623f5afded4d3f133dad9bae78a22cf984d
+EBUILD vlc-2.2.9999.ebuild 15475 SHA256 cd69aa3138becd63af1d640c13b6637be62e88e7ee5290a23f2d1803207e0b35 SHA512 270791ef03a552badb233f75dac42b96053b05c03801321c1ec6db28176a27bf63330505a5b0e5ffeb7d6a861798cafd15dd6947f5ef8073bdf1236445062a6e WHIRLPOOL fe230a2909c50e103bc05034904ba37a8bf86467267737cc0eed1e04b0b06348f0130835afd21b398286152b7571fc007a49e8f1f025337a1e15edb9493be1eb
 EBUILD vlc-9999.ebuild 15491 SHA256 4bad4f9a24d0b96ff50c3f5d5264bccda22f985a999571f55088d1bff5f344e7 SHA512 d89daa6515edd01aae9e66bd4cfc3939f0d15b4329074d5bb846878b81c801ed520e51f3bb8a4f0e43e7b34a6b8d64bc695bec03fa6ca4e17a4e0eeeaf8eb91c WHIRLPOOL a24f4a8395e0fc87538e247d076fc6cefe01101ad2ffc471ee90c176efa4d5d6dbf656d771d08be64703e50d9953ec98569bc9ff1c78092122cacb58f9730dbd
-MISC ChangeLog 36742 SHA256 d6f4ef765c2c47a52413fd71dfa7512a34b7033714c163d128599373acea96b2 SHA512 4208d1beff2e02ad3e4c720a17de1ee469bf7da99dfe264755a2ac08f781925f17dc60815dcff48c0ebc622e1f6b2bdef04c10c1f03e6d865ee415f24e1e3be7 WHIRLPOOL 4e1292b77931620a2d871f566de6794cab4ea0c83bb44b7bc7de3727045a3b11c044f0a1c644b2caba9432cbf669e0a3380ac0a3e737ceebe09ca5ee80bd4014
+MISC ChangeLog 36928 SHA256 7e96cb6f4170be2cb4b705fb564bc3a4bb521147a0a79a09ba535bc791e983f7 SHA512 175104b810050cfd6b2993e083a03794887a3fb6c9c36538e48d0e7f4f835f093390487db4ec9862d9e182da2ebcdd57944ad645be7f93181fca2d0c27699797 WHIRLPOOL 1328d19695bcfd1adcc919993d84ab0e5153a07a2a4c8e0de0445a218180648d3016315341ba764871de2960074c678ee8b1e3877c068562e99db500b5099d66
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6538 SHA256 cee37b9633b574305f8c07a19d7eee2d4362bd6de51822f98b7f150367ee5fe1 SHA512 29e8b36e5e4c89fdeb7cd3a9e9014a03855540d5b8246172febd4a5465cb50030187366c4d2c982115b08e0cd71e72e9dca7d49fd6ab8f263ad5b718df392345 WHIRLPOOL f15ca39b118e250412484a3be271f3eb2f476430e4957c77596cb11ca51752b80410e820adb559409dfd43fc631fc3262c87ac3f3ba2e4e8c53eb75c5a3baa8e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVM0uFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOj7wQALVbpctGAsWKe+YXmCfA5uLE
-majsnKEGDQiSa4KZJhYzdqXjbw4BpMNpMYG6cEXLVMdqNZgLpbr+4k6EughUiO3j
-Up+tu2O9CKNhSLDgwicFNMxsjuznuy1HZT7l2uDL4a/e/I7RHOwaXs95IHq57qE0
-TlnORtkRJ+HpQtG7e5vUvwYy61WCsQgpFU0NmDXKCCfTHCpMtlgyJMT5a0b2sSRY
-ye5JMT0zT5Rqg5tGS8koGQUC8nrIOdAiKpWdreumMOcsBSqotBx0ZWSXRYz0udew
-9UmDFczB5QlwFqB15BEhqDHPeEwVdGCB/plAK+csQdox595m1kqN5xeE6Wzp/tlY
-ugd85eEXHR1tbMbwUwKV1YfwwFgX4mpZ1ikpCNEpbKu5BTjKm3CaqizWjMuCR84x
-Q+Eyh6+x3LeIl5UlVBruabRegQL/g8UL1fBMv7FZYP7eCzCRVOl8SdXaselWdEMW
-KHbUxdRQ7VgYgnKkOPfABJ2jwoxXwtzzqnIiQ0Y2A7+dhEnNyeYh3aDsr6bnGBML
-fOA9pbdb+yDUcrVwkT4e/4jjwgQ/SPHOh2XuVuZ1GdC26mpRN9nUF7JuX2GdIw4C
-IzsWvFi4dwKAUzfNShcrf+zg3ZmqEOp7EIdSDVTuC1yy4srtk50soGzIlcsBHQRt
-IKI2dFq5W9frldqRx4LX
-=Ugcu
+iEYEAREIAAYFAlU0jpAACgkQso7CE7gHKw0FEACgtJWbCR94+z3RkRdUFW4oszdE
+uKkAn1dBjjpNi59FAeyiJSz0xPscJTFw
+=Dg/T
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild
index 513e8bcf9e04..309ea99532fb 100644
--- a/media-video/vlc/vlc-2.2.0.ebuild
+++ b/media-video/vlc/vlc-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.7 2015/04/18 07:05:35 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.8 2015/04/20 05:28:35 idella4 Exp $
 
 EAPI="5"
 
@@ -383,7 +383,7 @@ src_configure() {
 		$(use_enable omxil) \
 		$(use_enable omxil omxil-vout) \
 		$(use_enable opencv) \
-		$(use_enable opengl glx) $(use_enable opengl glspectrum) \
+		$(use_enable opengl glspectrum) \
 		$(use_enable opus) \
 		$(use_enable optimisememory optimize-memory) \
 		$(use_enable png) \
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 6a93c10c8f2a..2c1d8b1db4e7 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.13 2015/04/18 06:27:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.14 2015/04/20 05:28:35 idella4 Exp $
 
 EAPI="5"
 
@@ -379,7 +379,7 @@ src_configure() {
 		$(use_enable omxil) \
 		$(use_enable omxil omxil-vout) \
 		$(use_enable opencv) \
-		$(use_enable opengl glx) $(use_enable opengl glspectrum) \
+		$(use_enable opengl glspectrum) \
 		$(use_enable opus) \
 		$(use_enable optimisememory optimize-memory) \
 		$(use_enable png) \