[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ssl-cert.eclass

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ssl-cert.eclass

[Alon Bar-Lev (alonbl)]

alonbl      13/01/03 19:19:55

  Modified:             ChangeLog ssl-cert.eclass
  Log:
  ssl-cert - support mandatory enrollment and custom USE flag

Revision  Changes    Path
1.591                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.591&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.591&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.590&r2=1.591

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -r1.590 -r1.591
--- ChangeLog	3 Jan 2013 08:39:49 -0000	1.590
+++ ChangeLog	3 Jan 2013 19:19:55 -0000	1.591
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.590 2013/01/03 08:39:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.591 2013/01/03 19:19:55 alonbl Exp $
+
+  03 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> ssl-cert.eclass:
+  Support mandatory enrollment and custom USE flag.
 
   03 Jan 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Remove more dead code, spotted by Arfrever.



1.20                 eclass/ssl-cert.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ssl-cert.eclass?r1=1.19&r2=1.20

Index: ssl-cert.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ssl-cert.eclass	22 Aug 2011 04:46:32 -0000	1.19
+++ ssl-cert.eclass	3 Jan 2013 19:19:55 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.19 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.20 2013/01/03 19:19:55 alonbl Exp $
 
 # @ECLASS: ssl-cert.eclass
 # @MAINTAINER:
@@ -13,10 +13,24 @@
 # @EXAMPLE:
 # "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem}
 
-# Conditionally depend on OpenSSL: allows inheretence
-# without pulling extra packages if not needed
-DEPEND="ssl? ( dev-libs/openssl )"
-IUSE="ssl"
+# @ECLASS-VARIABLE: SSL_CERT_MANDATORY
+# @DESCRIPTION:
+# Set to non zero if ssl-cert is mandatory for ebuild.
+#
+SSL_CERT_MANDATORY="${SSL_CERT_MANDATORY:-0}"
+
+# @ECLASS-VARIABLE: SSL_CERT_USE
+# @DESCRIPTION:
+# Use flag to append dependency to.
+#
+SSL_CERT_USE="${SSL_CERT_USE:-ssl}"
+
+if [[ "${SSL_CERT_MANDATORY}" = 0 ]]; then
+	DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
+	IUSE="${SSL_CERT_USE}"
+else
+	DEPEND="dev-libs/openssl"
+fi
 
 # @FUNCTION: gen_cnf
 # @USAGE: