From dcd7dbfab9a40b6b01255f36a222393044a88526 Mon Sep 17 00:00:00 2001 From: Sven Vermeulen Date: Sun, 2 Nov 2014 10:28:40 +0000 Subject: Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug #527698) Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2EDD52403B68AF47 --- www-client/firefox/ChangeLog | 7 ++++++- www-client/firefox/Manifest | 26 ++++++++++++++++++-------- www-client/firefox/firefox-24.8.0.ebuild | 13 ++++++++----- www-client/firefox/firefox-31.2.0.ebuild | 12 ++++++++---- www-client/firefox/firefox-33.0.ebuild | 12 ++++++++---- 5 files changed, 48 insertions(+), 22 deletions(-) (limited to 'www-client/firefox') diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog index 9a3a9ed1aaf6..08f129e1446f 100644 --- a/www-client/firefox/ChangeLog +++ b/www-client/firefox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/firefox # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.363 2014/10/17 11:30:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.364 2014/11/02 10:25:40 swift Exp $ + + 02 Nov 2014; Sven Vermeulen firefox-24.8.0.ebuild, + firefox-31.2.0.ebuild, firefox-33.0.ebuild: + Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug + #527698) 17 Oct 2014; Jeroen Roovers firefox-31.2.0.ebuild: Apply HPPA patch in 31.2.0 too (bug #524556). diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index ce6bcf6897fe..174025898a1b 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -433,16 +433,26 @@ DIST firefox-33.0-zu.xpi 443460 SHA256 6deb6b853ec1923ab325332d2eb5e96e6a0cea443 DIST firefox-33.0.source.tar.bz2 155177527 SHA256 1018c2fae8c54c8a45f5a3ce348a2617a3f8039a789b09b7cfa5a27be069b229 SHA512 856585bedb0c0cc2a5c8591a5a3d373dca66fd8c15dd2c04b09e17e9a2da2bf978e4bff872a814b42e1963c3a6def05ccc0b68d9a8f4e7c9152dca878cf17e51 WHIRLPOOL be267b29bc9d21b6f0d35d1e42410afe9a0d6bed9174f5de5bfd80898fd1a73fc4e762a7e606c94c99562c6ac2b99eb33022509a85f5a762685cf26496a2744b EBUILD firefox-10.0.11.ebuild 10716 SHA256 615a282826523ddf9177762a36d591a005476d19f4366f28cf5f6d129b8b7a26 SHA512 910a64fa40a47efe90a7070a2395ddcf248f14ff01b6da642d7985c6e0d9ef18d44e0a528167309a819ca91b8d2ea4c66eafd937809251507daeff2965ce35ba WHIRLPOOL 2496f7f54785c949f4ac7e0118d413d7d7ecd6bd876253cca1ec66d66b571a4cccbdd515fa308c96144cf5927fbf81de9d7726740010b84e01de4f29b1e9e3d6 EBUILD firefox-24.3.0.ebuild 12059 SHA256 25fbf1a1db269332d3b9df1f47707a55081763367a72507f11da19ea9fa6a48b SHA512 e3e067b1472e657713813816a86a9e25244353592fd7415265bd7bfe454d9314b3ce462194ecf663dc4a556b9d48b32e2cde970de3faaf013fbf79f88d73d1fd WHIRLPOOL 2dc2c713b903b397d9194a8dcf0a4dbc06ffcc3d7d9064bed04bf6120b48a8c921dffacf4bc8e94e881c6560753fb8b82c7a00d913122055a323536cdd9a454b -EBUILD firefox-24.8.0.ebuild 12039 SHA256 385e712c303459440edc43af1baaee6504ef0babafad4a76f6c2a2f6837610e5 SHA512 7bcd63a25edae84ddd3377fb0a3cd87df6ce99dbcd009aae432fd4f61b8a1e9867141b92210883d0a8d9f9f227d67706cd91187004dca09d01874d186c4d32d0 WHIRLPOOL 3fb9267825a83ce36b051f80af6a3725ca2fc1cdd12293295cac96575de25ce4b17119dc8515adde6b0f9d571cb69a77760951466983e1710bd2ef8fb6133a5c -EBUILD firefox-31.2.0.ebuild 11590 SHA256 d37e2da7c48d98117fa37b5461e42ab656dbf33246da72ac0d8c01a0812e4f7c SHA512 7b7563d169aafe160166c1159db092edaa2cd90f30d12cf1fb975acdaf7fc3b80c770cca19723c52c92c8e00b41a574c120f68af922654d34373dd01829b675b WHIRLPOOL 6a0d0112d23ae6e6b383a91cf5e59a28873f8a54978cf34f55c0dd47159b37829d4edf81953ed374b4371e0acad4775d1b42dfa21e95951718aa40b3838c22f6 -EBUILD firefox-33.0.ebuild 11698 SHA256 76b31fdd16288fbb647e24d1bb6d7b728e8a9296a764bec89b26c82449b9ae5a SHA512 c500e2a0a1fe62948bff45e721a7c5350308fa732bac731e98fd0ca4a67fc8fcedadda77f06f86b28e25993fda539b0c7462f17386daffaf671c857e12bd3486 WHIRLPOOL c6699fa3fa13aecf6ddf64b53b92c31316fabca5c1131dfa82a25402ba82c008ed048f767719398d7b305f9f454fc0cd5dbb2ecaa8cc446df99487850a90480c -MISC ChangeLog 60071 SHA256 59a76fd1b9169fd6803c6ce94d57877481332423a97aa853d55087d2b23c46ba SHA512 43ff60f403d8befdc2b5bcda6a6896a86c08942d15f4f4c1ff783c65edd6796f63f90dc7d2fc5287399369b8a82400586055f8aaa7741791c744ac14b3be020b WHIRLPOOL a3d2e2038ce4dcf1df5f425ebb21e13115ac9569c361ea7939963cc98b4cc3445783dccefb329409096c5434378ff9963a8d3178339d5ef30bc89e5d8aacbccc +EBUILD firefox-24.8.0.ebuild 12064 SHA256 cec8cf1ff29949cc9ae344ee6ade19c5f5d37a36f17857860a822a3130fe655b SHA512 a6677c826a1555b0f4d791706c797266d98d49bbabef2183f7c1eec6786d76bc25164130100a499b7635be5d1b058329f1e63362dd109824470ab9c131836103 WHIRLPOOL bc9c272dff2e36ca571de91a042794ac5f8836f87be6699cc91b5aaf5034593eda1c2791106f310911d083bc2580a1a1029dd34bb2a44080cac52f70ef5db3c4 +EBUILD firefox-31.2.0.ebuild 11616 SHA256 8b053c6166f8df29e6dde49d1e376a779eb772b3559c7765551699448dd5740f SHA512 4daf5ab4ab618a619f9d8fd98cdb8afb3e699269550f35b0380843dd6a9d01c6fefa9d58db112252a9ce71e107fdc90247092884afda7d16758e7d7ceb56fa4d WHIRLPOOL 092b3d05580233f7da026796b4dfe8e288bb024dc02491d31a95e851695f8618e7c03a5283ecdd5a8267cc7ac5649d592c43776ad57ae7e3445a90d1ea753d16 +EBUILD firefox-33.0.ebuild 11724 SHA256 504bfc44ed9fc3f0e2f53c094d90e264440c47d00a34ddc5dadf2433ce155da6 SHA512 f72337d14f9a7a5859c9c5474619fcf4668823110823b0a27cc7029856c4b27e77372f6a8673476aedc0d06121a03d6fd8a7e5688d732e950a98015c0cf871aa WHIRLPOOL 59eea95132a8b6364ab2917452c96e5e97bff075751cdc8456446536db87b3bc5f0bbee9ed556427622dfd3ce18bf407cb874a066b667c49acf0cf190f8950b4 +MISC ChangeLog 60281 SHA256 611ada85bd1e124c1030fd5660c124278be8ca1c75d8f33244ba1e0b4b39ce83 SHA512 aac105a26d3144e223ec334c0925c951edd2d02e4c16e5db0f38037bde89d729a8a2313ee06221c8c5eee159d0e2e8881d39bc15aee1d802280e88385eae412e WHIRLPOOL 0de4a7a9084ac1731085a02d9039d26203e2fa711e388171bc601eb033d5c3a9a5067df5303a37e855586051a9472df3f11f0c9e99a49d3e0e4cbbada8077d27 MISC ChangeLog-2009 109736 SHA256 6a3f47a190cb2146174953971b193f7d75f408ea2cd1ad7d029fb848dd66f3c8 SHA512 db43c51ba072bd47d8bdf313481156b2e6238c9905147033dc7d7ce5a634ca01b7cfdd399c7b03a4f4af8c44eabf353c7b7e22642220975f1bd33d5a109cce10 WHIRLPOOL 7bdbc95d44e2a564cada83e831ee80b849d468138a6d5e75f23fd4e165408e07af4891bc6989af8e1f792f8d963613de20d013e5a610ee58855c0aad0de475fe MISC metadata.xml 1419 SHA256 ee43c6239b83afed03842cb4e4f13fa85564c2ec9543ee1c9abf2c02699c709a SHA512 f43bdf7068f45f177de2c455b0a3f328d0b886989e3e48fad42547734c78126e1f186e14a71b04ac73ce12a3df7e2741e98ee2988e0324b58426ac4f5e3430c4 WHIRLPOOL f117427249a677d62e9776456a0a957314a3e2d11132134aaf49df0332b6bf580274e6b6f4a08d8797eb8b688065a59e04353195f44f86cbb5d02ce9d1bcc9bd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlRA/dIACgkQVWmRsqeSphPEmQCfWXQT0rnjoLM4zLZ8/tWLAoi3 -5C8An0kE2qrCwhyLHFi3gakXrFHaH4NP -=wcPO +iQIcBAEBCAAGBQJUVgalAAoJEC7dUkA7aK9Hf38QAIyd1RaSM2QiVq9MoIU5vIGE +EHFGQMPIHSpTgNO2t3c3fMEXXgSmnhv3f+iyvG0C5F703lIBtlt3fBzQcRVm4c9O +QDmE8ioN6FZmU6IYnxkYUhecGmnod3L7fWj5n6Y/dln+A0U/PxtLRWzBVytfZ6qk +23EysuD2ERCEvUJeGNEo4j/Bzy7JuyOh1lLKZN9erQOvX6IWRiWHggLgg0GoADW9 +iJVI8lepT5WJOOniYXb08dNe1L3SxwfpvxCKi//dkkKizs7uG8UY65eqoek4A4es +nWSpZp3rgv100IEAJFFQmnbvX2kE15BYS1qjFaVDc162p48T43ocr6V25zNJp7iB +uo5gwAA8fIBeMwMHFT1LgIitbEkd/pLfyfLLINY6CcrylyN3D1OAJp7ks8Jrn9PN +UTuyqx+lTxOrBJivm4EgO0B5dIiiQvA6HqVAi1Rj/RS+eVVGdIoIcBAo5MO2jffZ +d1cd5TkaUeX9EJmsVkLa/EDf+WUKKEcXuH08goc/3ThrRRl5U2HrQXeht6r6RpaB +iYeJtYd3IuEs5o9jnUHe8kvoDMHl3RtW5Tgok8f5rSPIEvmlSsvIP2LfmnttqY9S +j3VEFYEaHy6tNnH4WW4Rc9h+ZmGDrTlnxuEMf3n4Cln5v335a0qH3OWmQAyAbLJ1 +Nd884Vly/oikSG+Ea5w5 +=7VQi -----END PGP SIGNATURE----- diff --git a/www-client/firefox/firefox-24.8.0.ebuild b/www-client/firefox/firefox-24.8.0.ebuild index d6781d1999e9..4ee6eeb5789b 100644 --- a/www-client/firefox/firefox-24.8.0.ebuild +++ b/www-client/firefox/firefox-24.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-24.8.0.ebuild,v 1.6 2014/09/07 13:27:44 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-24.8.0.ebuild,v 1.7 2014/11/02 10:25:40 swift Exp $ EAPI=5 VIRTUALX_REQUIRED="pgo" @@ -49,7 +49,7 @@ SRC_URI="${SRC_URI} ASM_DEPEND=">=dev-lang/yasm-1.1" # Mesa 7.10 needed for WebGL + bugfixes -RDEPEND=" +CDEPEND=" >=dev-libs/nss-3.16.2 >=dev-libs/nspr-4.10.4 >=dev-libs/glib-2.26:2 @@ -63,10 +63,9 @@ RDEPEND=" system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-sqlite? ( >=dev-db/sqlite-3.7.17:3[secure-delete,debug=] ) >=media-libs/libvpx-1.0.0 - kernel_linux? ( media-libs/alsa-lib ) - selinux? ( sec-policy/selinux-mozilla )" + kernel_linux? ( media-libs/alsa-lib )" -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} >=sys-devel/binutils-2.16.1 virtual/pkgconfig pgo? ( @@ -76,6 +75,10 @@ DEPEND="${RDEPEND} x86? ( ${ASM_DEPEND} virtual/opengl )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-mozilla ) +" + # No source releases for alpha|beta if [[ ${PV} =~ alpha ]]; then CHANGESET="8a3042764de7" diff --git a/www-client/firefox/firefox-31.2.0.ebuild b/www-client/firefox/firefox-31.2.0.ebuild index 540cfbf6e67e..411cef207083 100644 --- a/www-client/firefox/firefox-31.2.0.ebuild +++ b/www-client/firefox/firefox-31.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-31.2.0.ebuild,v 1.2 2014/10/17 11:30:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-31.2.0.ebuild,v 1.3 2014/11/02 10:25:40 swift Exp $ EAPI="5" VIRTUALX_REQUIRED="pgo" @@ -51,12 +51,12 @@ SRC_URI="${SRC_URI} ASM_DEPEND=">=dev-lang/yasm-1.1" -RDEPEND=" +CDEPEND=" >=dev-libs/nss-3.16.2 >=dev-libs/nspr-4.10.6 - selinux? ( sec-policy/selinux-mozilla )" +" -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( ${ASM_DEPEND} @@ -64,6 +64,10 @@ DEPEND="${RDEPEND} x86? ( ${ASM_DEPEND} virtual/opengl )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-mozilla ) +" + # No source releases for alpha|beta if [[ ${PV} =~ alpha ]]; then CHANGESET="8a3042764de7" diff --git a/www-client/firefox/firefox-33.0.ebuild b/www-client/firefox/firefox-33.0.ebuild index 67a0f8cedf5a..7b9a7122ce05 100644 --- a/www-client/firefox/firefox-33.0.ebuild +++ b/www-client/firefox/firefox-33.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-33.0.ebuild,v 1.2 2014/10/16 21:12:28 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-33.0.ebuild,v 1.3 2014/11/02 10:25:40 swift Exp $ EAPI="5" VIRTUALX_REQUIRED="pgo" @@ -52,12 +52,12 @@ SRC_URI="${SRC_URI} ASM_DEPEND=">=dev-lang/yasm-1.1" # Mesa 7.10 needed for WebGL + bugfixes -RDEPEND=" +CDEPEND=" >=dev-libs/nss-3.17.1 >=dev-libs/nspr-4.10.6 - selinux? ( sec-policy/selinux-mozilla )" +" -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} pgo? ( >=sys-devel/gcc-4.5 ) amd64? ( ${ASM_DEPEND} @@ -65,6 +65,10 @@ DEPEND="${RDEPEND} x86? ( ${ASM_DEPEND} virtual/opengl )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-mozilla ) +" + # No source releases for alpha|beta if [[ ${PV} =~ alpha ]]; then CHANGESET="8a3042764de7" -- cgit v1.2.3-65-gdbad