* [gentoo-commits] gentoo-x86 commit in app-misc/ca-certificates: ca-certificates-20140223.3.15.5.ebuild ChangeLog
@ 2014-03-20 2:23 Mike Gilbert (floppym)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2014-03-20 2:23 UTC (permalink / raw
To: gentoo-commits
floppym 14/03/20 02:23:42
Modified: ca-certificates-20140223.3.15.5.ebuild ChangeLog
Log:
Force usage of python 2.x during build.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.2 app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild?r1=1.1&r2=1.2
Index: ca-certificates-20140223.3.15.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ca-certificates-20140223.3.15.5.ebuild 19 Mar 2014 22:05:21 -0000 1.1
+++ ca-certificates-20140223.3.15.5.ebuild 20 Mar 2014 02:23:42 -0000 1.2
@@ -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/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild,v 1.1 2014/03/19 22:05:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild,v 1.2 2014/03/20 02:23:42 floppym Exp $
# The Debian ca-certificates package merely takes the CA database as it exists
# in the nss package and repackages it for use by openssl.
@@ -26,8 +26,9 @@
# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
EAPI="4"
+PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils
+inherit eutils python-any-r1
if [[ ${PV} == *.* ]] ; then
# Compile from source ourselves.
@@ -73,6 +74,8 @@
dev-libs/openssl
sys-apps/debianutils"
+DEPEND+=" ${PYTHON_DEPS}"
+
S=${WORKDIR}
pkg_setup() {
@@ -80,6 +83,7 @@
# we need to tell users about it once manually first.
[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
|| ewarn "You should run update-ca-certificates manually after etc-update"
+ python_setup
}
src_unpack() {
1.99 app-misc/ca-certificates/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?r1=1.98&r2=1.99
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ChangeLog 19 Mar 2014 22:05:21 -0000 1.98
+++ ChangeLog 20 Mar 2014 02:23:42 -0000 1.99
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/ca-certificates
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.98 2014/03/19 22:05:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.99 2014/03/20 02:23:42 floppym Exp $
+
+ 20 Mar 2014; Mike Gilbert <floppym@gentoo.org>
+ ca-certificates-20140223.3.15.5.ebuild:
+ Force usage of python 2.x during build.
*ca-certificates-20140223.3.15.5 (19 Mar 2014)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/ca-certificates: ca-certificates-20140223.3.15.5.ebuild ChangeLog
@ 2014-03-20 2:38 Mike Gilbert (floppym)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2014-03-20 2:38 UTC (permalink / raw
To: gentoo-commits
floppym 14/03/20 02:38:21
Modified: ca-certificates-20140223.3.15.5.ebuild ChangeLog
Log:
We only need python if we are not using the precompiled certs.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.3 app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild?r1=1.2&r2=1.3
Index: ca-certificates-20140223.3.15.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ca-certificates-20140223.3.15.5.ebuild 20 Mar 2014 02:23:42 -0000 1.2
+++ ca-certificates-20140223.3.15.5.ebuild 20 Mar 2014 02:38:21 -0000 1.3
@@ -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/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild,v 1.2 2014/03/20 02:23:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20140223.3.15.5.ebuild,v 1.3 2014/03/20 02:38:21 floppym Exp $
# The Debian ca-certificates package merely takes the CA database as it exists
# in the nss package and repackages it for use by openssl.
@@ -74,7 +74,10 @@
dev-libs/openssl
sys-apps/debianutils"
-DEPEND+=" ${PYTHON_DEPS}"
+
+if ! ${PRECOMPILED}; then
+ DEPEND+=" ${PYTHON_DEPS}"
+fi
S=${WORKDIR}
@@ -83,7 +86,6 @@
# we need to tell users about it once manually first.
[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
|| ewarn "You should run update-ca-certificates manually after etc-update"
- python_setup
}
src_unpack() {
@@ -121,6 +123,7 @@
src_compile() {
cd "image/${EPREFIX}" || die
if ! ${PRECOMPILED} ; then
+ python_setup
local d="${S}/${PN}/mozilla"
# Grab the database from the nss sources.
cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
1.100 app-misc/ca-certificates/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/ca-certificates/ChangeLog?r1=1.99&r2=1.100
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog 20 Mar 2014 02:23:42 -0000 1.99
+++ ChangeLog 20 Mar 2014 02:38:21 -0000 1.100
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/ca-certificates
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.99 2014/03/20 02:23:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.100 2014/03/20 02:38:21 floppym Exp $
+
+ 20 Mar 2014; Mike Gilbert <floppym@gentoo.org>
+ ca-certificates-20140223.3.15.5.ebuild:
+ We only need python if we are not using the precompiled certs.
20 Mar 2014; Mike Gilbert <floppym@gentoo.org>
ca-certificates-20140223.3.15.5.ebuild:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-20 2:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-20 2:38 [gentoo-commits] gentoo-x86 commit in app-misc/ca-certificates: ca-certificates-20140223.3.15.5.ebuild ChangeLog Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2014-03-20 2:23 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox