summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-06-13 05:23:39 +0000
committerMichał Górny <mgorny@gentoo.org>2015-06-13 05:23:39 +0000
commit5f596c23a8c2a2421f56aa312301171111a153a9 (patch)
tree8516bafba1f968adc60775accac08ec50380a3a9 /dev-libs/libgcrypt
parentVersion bump. (diff)
downloadgentoo-2-5f596c23a8c2a2421f56aa312301171111a153a9.tar.gz
gentoo-2-5f596c23a8c2a2421f56aa312301171111a153a9.tar.bz2
gentoo-2-5f596c23a8c2a2421f56aa312301171111a153a9.zip
Fix multilib install, bug #551930.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-libs/libgcrypt')
-rw-r--r--dev-libs/libgcrypt/ChangeLog5
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild14
2 files changed, 11 insertions, 8 deletions
diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 855ae64d6042..7db8103e75f5 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libgcrypt
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.233 2015/06/12 21:35:28 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.234 2015/06/13 05:23:39 mgorny Exp $
+
+ 13 Jun 2015; Michał Górny <mgorny@gentoo.org> libgcrypt-1.6.3-r1.ebuild:
+ Fix multilib install, bug #551930.
*libgcrypt-1.6.3-r1 (12 Jun 2015)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild
index 5c4923bcde38..63af4456d5a9 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild,v 1.1 2015/06/12 21:35:28 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild,v 1.2 2015/06/13 05:23:39 mgorny Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=1
@@ -62,12 +62,12 @@ multilib_src_configure() {
autotools-utils_src_configure
}
-src_compile() {
- autotools-utils_src_compile
- use doc && emake -C "${BUILD_DIR}/doc" gcrypt.pdf
+multilib_src_compile() {
+ emake
+ use doc && emake -C doc gcrypt.pdf
}
-src_install() {
- autotools-utils_src_install
- use doc && dodoc "${BUILD_DIR}/doc/gcrypt.pdf"
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+ use doc && dodoc doc/gcrypt.pdf
}