k_f 15/04/17 09:13:05 Modified: ChangeLog Added: gnupg-2.1.3-r2.ebuild Removed: gnupg-2.1.3-r1.ebuild Log: Remove the warning about being a developer version that showed up due to the LDAP fix (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xFED5002857C1ABFA!)
Revision Changes Path 1.596 app-crypt/gnupg/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?rev=1.596&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?rev=1.596&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?r1=1.595&r2=1.596 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v retrieving revision 1.595 retrieving revision 1.596 diff -u -r1.595 -r1.596 --- ChangeLog 14 Apr 2015 12:23:52 -0000 1.595 +++ ChangeLog 17 Apr 2015 09:13:05 -0000 1.596 @@ -1,6 +1,13 @@ # ChangeLog for app-crypt/gnupg # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.595 2015/04/14 12:23:52 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.596 2015/04/17 09:13:05 k_f Exp $ + +*gnupg-2.1.3-r2 (17 Apr 2015) + + 17 Apr 2015; Kristian Fiskerstrand <k...@gentoo.org> +gnupg-2.1.3-r2.ebuild, + -gnupg-2.1.3-r1.ebuild: + Remove the warning about being a developer version that showed up due to the + LDAP fix 14 Apr 2015; Mikle Kolyada <zlog...@gentoo.org> gnupg-2.1.3-r1.ebuild: Add ~amd64 keyword wrt bug #546478 1.1 app-crypt/gnupg/gnupg-2.1.3-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3-r2.ebuild?rev=1.1&content-type=text/plain Index: gnupg-2.1.3-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3-r2.ebuild,v 1.1 2015/04/17 09:13:05 k_f Exp $ EAPI="5" inherit autotools eutils flag-o-matic toolchain-funcs DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" HOMEPAGE="http://www.gnupg.org/"; MY_P="${P/_/-}" SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~hppa" IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb" COMMON_DEPEND_LIBS=" dev-libs/npth >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.6.2 >=dev-libs/libgpg-error-1.17 >=dev-libs/libksba-1.0.7 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0 ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) " COMMON_DEPEND_BINS="app-crypt/pinentry !app-crypt/dirmngr" # Existence of executables is checked during configuration. DEPEND="${COMMON_DEPEND_LIBS} ${COMMON_DEPEND_BINS} static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.6.2[static-libs] >=dev-libs/libgpg-error-1.17[static-libs] >=dev-libs/libksba-1.0.7[static-libs] dev-libs/npth[static-libs] >=net-misc/curl-7.10[static-libs] sys-libs/zlib[static-libs] bzip2? ( app-arch/bzip2[static-libs] ) ) nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo )" RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} ) ${COMMON_DEPEND_BINS} selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )" REQUIRED_USE="smartcard? ( !static )" S="${WORKDIR}/${MY_P}" src_prepare() { epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch" epatch "${FILESDIR}/${P}-dirmngr-Fix-segfault-in-ldap-engine.patch" epatch "${FILESDIR}/${P}-dirmngr-no-ldap.patch" epatch "${FILESDIR}/${P}-gpg-fix-null-segv.patch" epatch_user eautoreconf } src_configure() { local myconf=() # 'USE=static' support was requested: # gnupg1: bug #29299 # gnupg2: bug #159623 use static && append-ldflags -static if use smartcard; then myconf+=( --enable-scdaemon $(use_enable usb ccid-driver) ) else myconf+=( --disable-scdaemon ) fi if use elibc_SunOS || use elibc_AIX; then myconf+=( --disable-symcryptrun ) else myconf+=( --enable-symcryptrun ) fi econf \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --enable-gpg \ --enable-gpgsm \ --without-adns \ "${myconf[@]}" \ $(use_enable bzip2) \ $(use_enable gnutls) \ $(use_with ldap) \ $(use_enable nls) \ $(use_with readline) \ CC_FOR_BUILD="$(tc-getBUILD_CC)" # Due to the LDAP patch specific to 2.1.3 is causing an eautoreconf # it shows up as being a developer version and with "unknown" suffix # we remove this explicitly for the 2.1.3 release as it does not contain # unstable code sed -i "s/#define IS_DEVELOPMENT_VERSION 1//" config.h || die sed -i "s/2.1.3-unknown/2.1.3/" config.h || die } src_compile() { default if use doc; then cd doc emake html fi } src_install() { default use tools && dobin tools/{convert-from-106,gpg-check-pattern} \ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert} emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA rm "${ED}"/usr/share/gnupg/help* || die dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* dosym gpg2 /usr/bin/gpg dosym gpgv2 /usr/bin/gpgv echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 dodir /etc/env.d echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg if use doc; then dohtml doc/gnupg.html/* doc/*.png fi } pkg_postinst() { elog "If you wish to view images emerge:" elog "media-gfx/xloadimage, media-gfx/xli or any other viewer" elog "Remember to use photo-viewer option in configuration file to activate" elog "the right viewer." elog if use smartcard; then elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of" use usb && elog " - a CCID-compatible reader, used directly through libusb;" elog " - sys-apps/pcsc-lite and a compatible reader device;" elog " - dev-libs/openct and a compatible reader device;" elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces." elog "" elog "General hint: you probably want to try installing sys-apps/pcsc-lite and" elog "app-crypt/ccid first." fi ewarn "Please remember to restart gpg-agent if a different version" ewarn "of the agent is currently used. If you are unsure of the gpg" ewarn "agent you are using please run 'killall gpg-agent'," ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'." if [[ -n ${REPLACING_VERSIONS} ]]; then elog "If upgrading from a version prior than 2.1 you might have to re-import" elog "secret keys after restarting the gpg-agent as the new version is using" elog "a new storage mechanism." elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg" fi }
