app-crypt/gnupg: Move 2.1-9999 til slot 0 since 2.1.0 is released
authorkristianf <devnull@localhost>
Fri, 14 Nov 2014 09:11:45 +0000 (10:11 +0100)
committerkristianf <devnull@localhost>
Fri, 14 Nov 2014 09:11:45 +0000 (10:11 +0100)
app-crypt/gnupg/Manifest
app-crypt/gnupg/gnupg-9999.ebuild

index e2ebb87..72ebad9 100644 (file)
@@ -1,4 +1,4 @@
 AUX 0001-doc-gpg-agent-Add-missing-entry-for-allow-preset-pas.patch 1006 SHA256 a59e2fc6a1834dc1d826b58c756577be33f89035f0caa898c8fa1b8e1269250a SHA512 3bb96755eb87d19fdff1205eabe865f25db3662939d939e7542292d414c860c0cb28a5e722fdd167558ad3f6493c35605ac1b4016cef9dcdd6962b2fe26bc094 WHIRLPOOL 9b90de94a1dcec98de92dba45c137b8486476ebd9150ca2357effe5049bc0fbfead4518ef5718320b7fb35743d015d7941b46e8d6461ed9da722435cd958445e
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1121 SHA256 fa8369a4466b3cce54215a348940422f46f4d359f9e9b3c7029a1138870888df SHA512 ecde032b205cc16c33ff21ded55b93e74058cd804d68e4a0738ac70d54b5b388b6f709d21719a5e418c662b7ee74bc4aef7a0c59de106e2d4bd06b7bc1a11138 WHIRLPOOL 5dc4d3de29290e8e274a0f4fef871cea7f49553846254d819ca776000978a72c694212559d9ad03312f94f71f406de4641c0575188d340017a7937b01753b8a0
 AUX gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch 2143 SHA256 2413ac5c9607450c7792c52754d4500249ab5e07ded649c752f89f243cf43b4e SHA512 adf90513afd9b3c7384b53e3b5b95c305567b6707ed9a60d76e49b28744e358da4b4412b0df266e9a214e3c4fbcf9ebe8523584436143b7e57aca620a0db422e WHIRLPOOL f2d2f59656caf1abfaf0066383deb1d27aab43c2b25bd3a9fa27cf3c4a0357e875058ef138b7a5237526fece6c3910604deac5fec6af01ada97e88f7b44b54bf
-EBUILD gnupg-9999.ebuild 1717 SHA256 9b7ce05bc73479f147a682dbd9583074114e173540cf406df0e3be71fad77a96 SHA512 cbf3f3ff24e17d3f642dfa5248dbd6c4f13cc7c4e274ac2e2f633502be677b09dc3f859f952af20b9c40fedf1761451c852235166a6c4cf034177d8ed416972a WHIRLPOOL e2aedbe3c75ff2923881e01919bb767f2a0ed268a1c2b21f56fc9dc98ae0fdf71f856e53da01520662e6d69042eb778ac7e53c47995cef2f5b88875652d988c9
+EBUILD gnupg-9999.ebuild 4839 SHA256 f4871925784d5fab10b361dcf2a57b688a5775822d6d51dcc06899de9c2f7ee5 SHA512 e1a024e223620cc89e2e3a7f33c808f1a4797c6a0a32c9fff2f65f9e3cb0eb66f15047fbb5c39fe4f966abfd0b98ab7214c7c6d3d18658895ed981ae34b90a67 WHIRLPOOL 4f390398fdd753c60059d8872045547050d46ede951bcb448750cb18404f7e45b89c0aadfe7e4692a5792067366162122e5755489982ad49ea9a88411534823a
index e32c0e5..9c6a204 100644 (file)
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.7 2013/05/03 07:56:29 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.0.ebuild,v 1.4 2014/11/09 01:42:34 k_f Exp $
 
-EAPI=5
+EAPI="5"
 
-inherit eutils autotools flag-o-matic user git-2
+inherit eutils flag-o-matic toolchain-funcs git-2
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+
 EGIT_REPO_URI="git://git.gnupg.org/${PN}.git"
-#EGIT_COMMIT="a77ed0f266d03e234027dda4de5a7f3dd6787b1e"
-HOMEPAGE="http://gnupg.org/"
 
-LICENSE="GPL-2"
-SLOT="2.1"
+LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS=""
-IUSE=""
-
-REQUIRED_USE=""
+IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
 
 RESTRICT="test"
 
-WANT_AUTOMAKE="1.13"
 COMMON_DEPEND_LIBS="
-    >=dev-libs/libassuan-2.1:0
-    >=dev-libs/libgcrypt-1.6
-    >=dev-libs/libgpg-error-1.11:0
-    >=dev-libs/libksba-1.2.0:0
-       >=net-libs/gnutls-3.3.1:0
-    dev-libs/npth:2.1
-    >=net-misc/curl-7.10:0
-    >=net-libs/gnutls-3.0"
+       dev-libs/npth
+       >=dev-libs/libassuan-2
+       >=dev-libs/libgcrypt-1.6.2
+       >=dev-libs/libgpg-error-1.15
+       >=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/pinentry-qt )"
+
+# 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.4[static-libs]
+               >=dev-libs/libgpg-error-1.7[static-libs]
+               >=dev-libs/libksba-1.0.7[static-libs]
+               >=dev-libs/pth-1.3.7[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 )"
 
-BDEPEND="dev-vcs/git:0
-       media-gfx/transfig:0"
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+       ${COMMON_DEPEND_BINS}
+       !<=app-crypt/gnupg-2.0.1
+       selinux? ( sec-policy/selinux-gpg )
+       nls? ( virtual/libintl )"
 
-DEPEND="
-       ${COMMON_DEPEND_LIBS}
-       net-nds/openldap:0=
-       ${BDEPEND}"
+REQUIRED_USE="smartcard? ( !static )"
 
-RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
        epatch "${FILESDIR}/gnupg_master_0002-Fix-building-with-GNU-Automake-1.13.patch"
-       epatch "${FILESDIR}/0001-doc-gpg-agent-Add-missing-entry-for-allow-preset-pas.patch"
-
+       epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+       epatch_user
        autoreconf || die "Autoreconf fail"
        ./autogen.sh || die "Autgen script failed"
 }
 
 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 \
-               --program-prefix='gpg2.1-' \
-               --infodir=/usr/share/info/gnupg2.1 \
-               --datarootdir=/usr/share/gnupg2.1 \
-               --docdir=/usr/share/doc/gnupg2.1 \
                --enable-maintainer-mode \
-               --enable-symcryptrun \
-               --enable-mailto \
-               --enable-gpgtar || die "Configure fail"
+               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+               --enable-gpg \
+               --enable-gpgsm \
+               --enable-agent \
+               --without-adns \
+               "${myconf[@]}" \
+               $(use_enable bzip2) \
+               $(use_enable gnutls) \
+               $(use_with ldap) \
+               $(use_enable nls) \
+               $(use_with readline) \
+               CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+       default
+
+       if use doc; then
+               cd doc
+               emake html
+       fi
 }
 
-src_install(){
+src_install() {
        default
-       dosym gpg2.1-gpg2 /usr/bin/gpg2.1
-       dosym gpg2.1-gpg-agent /usr/bin/gpg2.1-agent
-       dosym gpg2.1-dirmngr /usr/bin/dirmngr
-       dosym gpg2.1-dirmngr-client /usr/bin/dirmngr-client
+
+       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 will 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
 }