From ff2a48f3861dd2afd96f920be783349f41ce971e Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 25 Jun 2010 09:13:28 +0000 Subject: [PATCH] force gcrypt with gnutls, bug #325207 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-video/vlc/ChangeLog | 6 +++++- media-video/vlc/Manifest | 14 +++++++------- media-video/vlc/vlc-1.1.0.ebuild | 6 ++++-- media-video/vlc/vlc-1.1.9999.ebuild | 6 ++++-- media-video/vlc/vlc-9999.ebuild | 6 ++++-- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 1652fca512f4..8ea714f559e0 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.596 2010/06/22 12:26:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.597 2010/06/25 09:13:28 aballier Exp $ + + 25 Jun 2010; Alexis Ballier vlc-1.1.0.ebuild, + vlc-1.1.9999.ebuild, vlc-9999.ebuild: + force gcrypt with gnutls, bug #325207 22 Jun 2010; Alexis Ballier vlc-1.1.0.ebuild, vlc-1.1.9999.ebuild, vlc-9999.ebuild: diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 6b1012c1e1bd..ef72a1b85399 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -7,15 +7,15 @@ DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8 EBUILD vlc-1.0.6.ebuild 12316 RMD160 f9e95b57ca80417f744808f47d92f92c4a1f8027 SHA1 ad8ba73ec351c0623a91b28bd27aad44893a5d99 SHA256 a5c00bd42a93d39eb356b43f6e9ba660db0138690bd19b302041514507b8c62c -EBUILD vlc-1.1.0.ebuild 11907 RMD160 1a4428292986da464dc8d4fd96201421f6bc4d61 SHA1 294cdd867d55aafd9e5e9bd00a4d52caacef84d5 SHA256 dde7d18e29576ab4ee8373e4bd79a061d6fe8fd68d2f88072650b6a41b84cd56 -EBUILD vlc-1.1.9999.ebuild 11889 RMD160 3b9be735c1d1be99a86f08a125aa620306212f9e SHA1 7b4db33059e2e0ec85e92ca2dd4fc71cc56bf127 SHA256 40362d9216a0ca54e09cb62f1b2586550951be2d7f8b373ed552dc890c9e8254 -EBUILD vlc-9999.ebuild 11886 RMD160 49bdb56d294096397af3e90addbd8cfb84f06071 SHA1 bef795b7fc355469a8b0f011e9e2cf6b75f33262 SHA256 f3743be9edefdf39681c6222dff7d48e240acfd32e2e8966aa22516d8b0daf62 -MISC ChangeLog 92355 RMD160 c1838811831116c1186e4dab82439550d95585dd SHA1 652be03b7482f8ebd29cb47f44f3e0ae56cffd6a SHA256 d042fd97dac84e82a60e3b0e269ef0353b4b47d9ecaa1a3897cf3c822fc1ecd5 +EBUILD vlc-1.1.0.ebuild 12008 RMD160 0a1f6a60269cb2d5b725341fe12378f9e10db6f9 SHA1 5f02acbb7578ac1e2390668279a01f0b1ce14b9d SHA256 862d309d737ba8ddf6ebd46c991f325bf21f3e4da927628496b88f9d48bc05c5 +EBUILD vlc-1.1.9999.ebuild 11991 RMD160 833d0b7c2acff2b90748fb6dfc31f178d58918e8 SHA1 47fed308c544ea8edccb7d118a0d507807a7a531 SHA256 6eac81e3ca76c2f45c1d31e4c2f4fe35bc9f8ff838f115942d921d57eda51bea +EBUILD vlc-9999.ebuild 11987 RMD160 507e5a59bd947b60798ed3cfb203ad6e01e04ab9 SHA1 9f7d195e89b6f4ba796ad7bda06fe51dd97934d3 SHA256 62f247b3eb35908976cebc051325074cd3ae82a162863a0149426a9573e842ce +MISC ChangeLog 92506 RMD160 896728e93d2fea0cc2ac247afc94c1d73eeef20e SHA1 4d41c03b1c7c96ce053765c3592e2da8effa63eb SHA256 87dd6e431e3465fa37922ed7edc6ddaafe6f225c2ee1e3aed25f71f86d89c60e MISC metadata.xml 4410 RMD160 a45aa6995938c863a9f9c351471392fd91d88119 SHA1 36bb27e88806dea7926b3965fb14afcdbfe5653c SHA256 7e240147c0cffdb48ac2736144e6064396c765d1627ff22c1d4fac6f2b6473a4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwgq+IACgkQvFcC4BYPU0pjawCgnrb6+AWWXC7/W05IWV/ciWzZ -ekgAoK3g1ZnWXvqfmuLSZS25S+cNXLm9 -=bHUf +iEYEARECAAYFAkwkcz8ACgkQvFcC4BYPU0q2egCfZiqxviAJwISZMTnldxOUbQG5 +120An1U4Dk4tkUHAQ2THdOXPQw1Mqdem +=ZkuC -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-1.1.0.ebuild b/media-video/vlc/vlc-1.1.0.ebuild index 36bc600e4fd6..4af91b4f56e5 100644 --- a/media-video/vlc/vlc-1.1.0.ebuild +++ b/media-video/vlc/vlc-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.3 2010/06/22 12:26:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.4 2010/06/25 09:13:28 aballier Exp $ EAPI="2" @@ -82,7 +82,7 @@ RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) ggi? ( media-libs/libggi ) gnome? ( gnome-base/gnome-vfs ) - gnutls? ( >=net-libs/gnutls-1.7.4 ) + gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 ) id3tag? ( media-libs/libid3tag sys-libs/zlib ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) @@ -185,6 +185,7 @@ pkg_setup() { # Useflags we need to forcefuly enable vlc_use_force remoteosd gcrypt + vlc_use_force gnutls gcrypt vlc_use_force skins truetype vlc_use_force skins qt4 vlc_use_force vlm stream @@ -340,6 +341,7 @@ src_configure() { $(vlc_use_enable_force skins qt4) \ $(vlc_use_enable_force skins freetype) \ $(vlc_use_enable_force remoteosd libgcrypt) \ + $(vlc_use_enable_force gnutls libgcrypt) \ $(vlc_use_enable_force vaapi avcodec) } diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild index 813a22c54704..59f66a974215 100644 --- a/media-video/vlc/vlc-1.1.9999.ebuild +++ b/media-video/vlc/vlc-1.1.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.9 2010/06/22 12:26:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.10 2010/06/25 09:13:28 aballier Exp $ EAPI="2" @@ -82,7 +82,7 @@ RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) ggi? ( media-libs/libggi ) gnome? ( gnome-base/gnome-vfs ) - gnutls? ( >=net-libs/gnutls-1.7.4 ) + gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 ) id3tag? ( media-libs/libid3tag sys-libs/zlib ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) @@ -185,6 +185,7 @@ pkg_setup() { # Useflags we need to forcefuly enable vlc_use_force remoteosd gcrypt + vlc_use_force gnutls gcrypt vlc_use_force skins truetype vlc_use_force skins qt4 vlc_use_force vlm stream @@ -340,6 +341,7 @@ src_configure() { $(vlc_use_enable_force skins qt4) \ $(vlc_use_enable_force skins freetype) \ $(vlc_use_enable_force remoteosd libgcrypt) \ + $(vlc_use_enable_force gnutls libgcrypt) \ $(vlc_use_enable_force vaapi avcodec) } diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index ca8b5c26d7e4..671efb37f8bf 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.76 2010/06/22 12:26:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.77 2010/06/25 09:13:28 aballier Exp $ EAPI="2" @@ -82,7 +82,7 @@ RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) ggi? ( media-libs/libggi ) gnome? ( gnome-base/gnome-vfs ) - gnutls? ( >=net-libs/gnutls-1.7.4 ) + gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 ) id3tag? ( media-libs/libid3tag sys-libs/zlib ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) @@ -185,6 +185,7 @@ pkg_setup() { # Useflags we need to forcefuly enable vlc_use_force remoteosd gcrypt + vlc_use_force gnutls gcrypt vlc_use_force skins truetype vlc_use_force skins qt4 vlc_use_force vlm stream @@ -340,6 +341,7 @@ src_configure() { $(vlc_use_enable_force skins qt4) \ $(vlc_use_enable_force skins freetype) \ $(vlc_use_enable_force remoteosd libgcrypt) \ + $(vlc_use_enable_force gnutls libgcrypt) \ $(vlc_use_enable_force vaapi avcodec) } -- 2.26.2