alonbl 14/08/08 16:19:32 Modified: libgcrypt-1.5.4.ebuild ChangeLog Added: libgcrypt-1.5.4-r100.ebuild Log: Defer multilib changes, bug#513718 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Revision Changes Path 1.2 dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild?r1=1.1&r2=1.2 Index: libgcrypt-1.5.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgcrypt-1.5.4.ebuild 8 Aug 2014 08:57:41 -0000 1.1 +++ libgcrypt-1.5.4.ebuild 8 Aug 2014 16:19:32 -0000 1.2 @@ -1,27 +1,22 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild,v 1.1 2014/08/08 08:57:41 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild,v 1.2 2014/08/08 16:19:32 alonbl Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 -inherit autotools-multilib +inherit autotools-utils DESCRIPTION="General purpose crypto library based on the code used in GnuPG" HOMEPAGE="http://www.gnupg.org/"; SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" -SLOT="11/11" # subslot = soname major version +SLOT="0/11" # subslot = soname major version KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" +IUSE="static-libs" -RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] - !dev-libs/libgcrypt:0/11 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" +RDEPEND=">=dev-libs/libgpg-error-1.8" DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) @@ -37,6 +32,7 @@ --disable-dependency-tracking --enable-noexecstack --disable-O-flag-munging + $(use_enable static-libs static) # disabled due to various applications requiring privileges # after libgcrypt drops them (bug #468616) @@ -47,11 +43,5 @@ $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") ) - autotools-multilib_src_configure -} - -src_install() { - autotools-multilib_src_install - - rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die + autotools-utils_src_configure } 1.210 dev-libs/libgcrypt/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgcrypt/ChangeLog?rev=1.210&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgcrypt/ChangeLog?rev=1.210&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgcrypt/ChangeLog?r1=1.209&r2=1.210 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- ChangeLog 8 Aug 2014 08:57:41 -0000 1.209 +++ ChangeLog 8 Aug 2014 16:19:32 -0000 1.210 @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libgcrypt # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.209 2014/08/08 08:57:41 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.210 2014/08/08 16:19:32 alonbl Exp $ + +*libgcrypt-1.5.4-r100 (08 Aug 2014) + + 08 Aug 2014; Alon Bar-Lev <alo...@gentoo.org> +libgcrypt-1.5.4-r100.ebuild, + libgcrypt-1.5.4.ebuild: + Defer multilib changes, bug#513718 *libgcrypt-1.5.4 (08 Aug 2014) 1.1 dev-libs/libgcrypt/libgcrypt-1.5.4-r100.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4-r100.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4-r100.ebuild?rev=1.1&content-type=text/plain Index: libgcrypt-1.5.4-r100.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4-r100.ebuild,v 1.1 2014/08/08 16:19:32 alonbl Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 inherit autotools-multilib DESCRIPTION="General purpose crypto library based on the code used in GnuPG" HOMEPAGE="http://www.gnupg.org/"; SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="11/11" # subslot = soname major version KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] !dev-libs/libgcrypt:0/11 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )" DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) PATCHES=( "${FILESDIR}"/${PN}-1.5.0-uscore.patch "${FILESDIR}"/${PN}-multilib-syspath.patch ) src_configure() { local myeconfargs=( --disable-padlock-support # bug 201917 --disable-dependency-tracking --enable-noexecstack --disable-O-flag-munging # disabled due to various applications requiring privileges # after libgcrypt drops them (bug #468616) --without-capabilities # http://trac.videolan.org/vlc/ticket/620 # causes bus-errors on sparc64-solaris $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") ) autotools-multilib_src_configure } src_install() { autotools-multilib_src_install rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die }
