summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2006-10-05 04:00:30 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2006-10-05 04:00:30 +0000
commit799a8f0d6e036bb30caf946ddc0527dc44bd5fec (patch)
treeb09fd19dcb123b919a6c9fbcb85bb3110864836f /app-crypt
parentVersion bump, also build HTML docs per bug #135028. (diff)
downloadgentoo-2-799a8f0d6e036bb30caf946ddc0527dc44bd5fec.tar.gz
gentoo-2-799a8f0d6e036bb30caf946ddc0527dc44bd5fec.tar.bz2
gentoo-2-799a8f0d6e036bb30caf946ddc0527dc44bd5fec.zip
Forgot to make new html optional via USE=doc.
(Portage version: 2.1.2_pre2-r3)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/gnupg/ChangeLog5
-rw-r--r--app-crypt/gnupg/gnupg-1.9.22.ebuild16
2 files changed, 14 insertions, 7 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 50c0065df96e..5e7a2589e340 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-crypt/gnupg
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.231 2006/10/05 03:58:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.232 2006/10/05 04:00:30 robbat2 Exp $
+
+ 05 Oct 2006; Robin H. Johnson <robbat2@gentoo.org> gnupg-1.9.22.ebuild:
+ Forgot to make new html optional via USE=doc.
*gnupg-1.9.22 (05 Oct 2006)
diff --git a/app-crypt/gnupg/gnupg-1.9.22.ebuild b/app-crypt/gnupg/gnupg-1.9.22.ebuild
index 59198c487b43..d5a0a4e930f9 100644
--- a/app-crypt/gnupg/gnupg-1.9.22.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.22.ebuild,v 1.1 2006/10/05 03:58:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.22.ebuild,v 1.2 2006/10/05 04:00:30 robbat2 Exp $
inherit eutils flag-o-matic autotools
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/alpha/gnupg/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="1.9"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X gpg2-experimental ldap nls openct pcsc-lite smartcard selinux"
+IUSE="X gpg2-experimental doc ldap nls openct pcsc-lite smartcard selinux"
COMMON_DEPEND="
virtual/libc
@@ -27,7 +27,8 @@ COMMON_DEPEND="
# X? ( app-crypt/pinentry )
DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
+ nls? ( sys-devel/gettext )
+ doc? ( sys-apps/texinfo )"
RDEPEND="${COMMON_DEPEND}
!app-crypt/gpg-agent
@@ -80,8 +81,10 @@ src_compile() {
${myconf} \
|| die
emake || die
- cd doc
- emake html || die
+ if use doc; then
+ cd doc
+ emake html || die
+ fi
}
src_install() {
@@ -91,7 +94,8 @@ src_install() {
# neither of these should really be needed, please check
use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
fperms u+s,go-r /usr/bin/gpg-agent
- dohtml doc/gnupg.html/* doc/*jpg doc/*png
+
+ use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
}
pkg_postinst() {