summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2014-11-02 08:33:52 +0000
committerSven Vermeulen <swift@gentoo.org>2014-11-02 08:33:52 +0000
commit425a25b3e196271af8b81b33074d9812c57fd5a1 (patch)
tree3b78335d8a2e7104f4d433d58893ace07d06fa64 /mail-client
parentRemove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug #... (diff)
downloadgentoo-2-425a25b3e196271af8b81b33074d9812c57fd5a1.tar.gz
gentoo-2-425a25b3e196271af8b81b33074d9812c57fd5a1.tar.bz2
gentoo-2-425a25b3e196271af8b81b33074d9812c57fd5a1.zip
Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug #527698)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/thunderbird/ChangeLog7
-rw-r--r--mail-client/thunderbird/thunderbird-24.8.0.ebuild11
-rw-r--r--mail-client/thunderbird/thunderbird-31.2.0-r1.ebuild11
3 files changed, 20 insertions, 9 deletions
diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 03a53cdb7c48..689919ce7413 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for mail-client/thunderbird
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.303 2014/10/20 17:53:11 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.304 2014/11/02 08:33:52 swift Exp $
+
+ 02 Nov 2014; Sven Vermeulen <swift@gentoo.org> thunderbird-24.8.0.ebuild,
+ thunderbird-31.2.0-r1.ebuild:
+ Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+ #527698)
*thunderbird-31.2.0-r1 (20 Oct 2014)
diff --git a/mail-client/thunderbird/thunderbird-24.8.0.ebuild b/mail-client/thunderbird/thunderbird-24.8.0.ebuild
index 05f9d2b6e273..69e5743cce5d 100644
--- a/mail-client/thunderbird/thunderbird-24.8.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-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/mail-client/thunderbird/thunderbird-24.8.0.ebuild,v 1.5 2014/09/07 13:27:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.8.0.ebuild,v 1.6 2014/11/02 08:33:52 swift Exp $
EAPI=5
WANT_AUTOCONF="2.1"
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI}
ASM_DEPEND=">=dev-lang/yasm-1.1"
-RDEPEND="
+CDEPEND="
>=dev-libs/nss-3.16.2
>=dev-libs/nspr-4.10.4
>=dev-libs/glib-2.26:2
@@ -71,7 +71,6 @@ RDEPEND="
system-sqlite? ( >=dev-db/sqlite-3.8.0.2:3[secure-delete,debug=] )
>=media-libs/libvpx-1.0.0
kernel_linux? ( media-libs/alsa-lib )
- selinux? ( sec-policy/selinux-thunderbird )
!x11-plugins/enigmail
crypt? ( || (
( >=app-crypt/gnupg-2.0
@@ -83,7 +82,7 @@ RDEPEND="
=app-crypt/gnupg-1.4*
) )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
>=sys-devel/binutils-2.16.1
virtual/pkgconfig
amd64? ( ${ASM_DEPEND}
@@ -91,6 +90,10 @@ DEPEND="${RDEPEND}
x86? ( ${ASM_DEPEND}
virtual/opengl )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-thunderbird )
+"
+
if [[ ${PV} =~ beta ]]; then
S="${WORKDIR}/comm-beta"
else
diff --git a/mail-client/thunderbird/thunderbird-31.2.0-r1.ebuild b/mail-client/thunderbird/thunderbird-31.2.0-r1.ebuild
index e7cd3c840244..f2c116c7f2ca 100644
--- a/mail-client/thunderbird/thunderbird-31.2.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-31.2.0-r1.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/mail-client/thunderbird/thunderbird-31.2.0-r1.ebuild,v 1.1 2014/10/20 17:53:11 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-31.2.0-r1.ebuild,v 1.2 2014/11/02 08:33:52 swift Exp $
EAPI=5
WANT_AUTOCONF="2.1"
@@ -59,10 +59,9 @@ SRC_URI="${SRC_URI}
ASM_DEPEND=">=dev-lang/yasm-1.1"
-RDEPEND="
+CDEPEND="
>=dev-libs/nss-3.16.5
>=dev-libs/nspr-4.10.6
- selinux? ( sec-policy/selinux-thunderbird )
!x11-plugins/enigmail
crypt? ( || (
( >=app-crypt/gnupg-2.0
@@ -74,12 +73,16 @@ RDEPEND="
=app-crypt/gnupg-1.4*
) )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
amd64? ( ${ASM_DEPEND}
virtual/opengl )
x86? ( ${ASM_DEPEND}
virtual/opengl )"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-thunderbird )
+"
+
if [[ ${PV} =~ beta ]]; then
S="${WORKDIR}/comm-beta"
else