Remove adns USE, bug#513990

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

3 files changed, 175 insertions, 7 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 141d61a917c2..2e15ced4a700 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.543 2014/08/29 18:37:15 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.544 2014/08/29 21:08:19 alonbl Exp $
+
+*gnupg-2.0.26-r1 (29 Aug 2014)
+
+  29 Aug 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnupg-2.0.26-r1.ebuild:
+  Remove adns USE, bug#513990
 
   29 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> gnupg-2.0.26.ebuild:
   alpha stable wrt bug #521174
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5ecc1c249a34..94c91a4d81c0 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -9,16 +9,15 @@ DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea
 DIST gnupg-2.1.0-beta783.tar.bz2 3095003 SHA256 b2bab71204fead83d07790c4f35743a0a464d1d3368a923affc766188097aca1 SHA512 c299195390f2cd6ec85944113f18e8a6987926ccb98d94eb6cf61bdf47548d64faf2a96f751d6a41432c7e72ce65c26ab9ce9fc8fe320c0e96c4159a94cb9e82 WHIRLPOOL e7992174cfae8cbd08d96e57132a38705eca71fed4231ad63f744b186c326276c1a298fc65e971a743f383cab4939944a5b4bbc857e2f3c8210dd6e50085054d
 EBUILD gnupg-1.4.18.ebuild 3763 SHA256 37cedb3946b555e83111f5096b3dd73f9506175976be10d648f8eb76b0b5fd3a SHA512 3dd165eb15a4946a9e2157549f0da6864e84c054a6369d7053730a899b50c5f05a703c1ce8e208b9de21b135bc8888f0f13835fce50f0e9eec467140e7e63355 WHIRLPOOL 9c64d59b7c444dde1fb601a6ab8d1085525153174b5995009ff7758866e56b88028056b42154fa0e28b3328978e15df515e4c65e65cb667fc17b75fb340e8e15
 EBUILD gnupg-2.0.25.ebuild 4747 SHA256 6c57559a986cb9271891d041a6f1e7903ccce835c00d7ea16818078f56f11d78 SHA512 f3d81564eb1c708d188d357521f3c6c43f15a8ac8f2758d14328cc3d7cc40306af50a8269f09dd2f80ec6469dc5f31dd2864008d7526dd9f108b1972ce1a7000 WHIRLPOOL f41c54bef5b0b4b7a7cba514c4c39d2cc938eae5e56c8a225755435393f4e483e5c1bd02d02dd0c86c9d6a945ccfe40090523b7f35228a899043dfa79eff9ba1
+EBUILD gnupg-2.0.26-r1.ebuild 4791 SHA256 978626f06c04e305e29ecadc45e8d7412b4f51b3abbf2bdb863b21979e96bb4c SHA512 58081c4a5404df41f2eaeec1e7c49d9bb5b4f80da8eae01f4cb30a0c9eb4003dd4d93518cabdff8ca23ab3ad1ee176a02d4a31fb5f48f5ff8ca36e2a60f47736 WHIRLPOOL 6d7ab6fe90fd327f08786bf44bcab2b65f805a89604650b3d64f7b5eeb6100e4973c8d8e649f66edea374cf5c77e79adf3bcf7888fbdf08509150fbf080932b0
 EBUILD gnupg-2.0.26.ebuild 4823 SHA256 496f109339789a34af53e4cad3eb4dd41089b1845fe42f958549f95076d90823 SHA512 1f733ef90ec67be7e37cd16f289e9ce3ab0704c4c887ab99ba1be3b7fc54055d53e7a5b6a461992ddc614b5db46d905433e270c7cdcfbd6db5b717fecaadffd8 WHIRLPOOL 13d29bf70ecb6d9876df1757e6a4907bd05e4b5b0c578fe312fc2f5d57702ea78ed4699a44798907067e7bb37740c6e79d3ebb6558062732162fe29dfc8c084c
 EBUILD gnupg-2.1.0_beta783.ebuild 4287 SHA256 673e1aa4f124939ca4831631bdf0e608f2f0f786414ef8d160c8ee039cde91ce SHA512 5f5aa7280df05ff9e2b5b81ee9f56ddf4b286a69f61fe6d578e3001238032b07995aaaeb0180106309e1e12368d367110cbe5e84d75e515843f6dc3f4b8bc5a0 WHIRLPOOL 4a8fc95fbcdc3d51053e4402ca13ae4542681f19aac88fc230e60b49e3f1d7cb0b0f11bebfce6af875057f095f4b93ab4b53f04e43e372eef10b56c989e94dee
-MISC ChangeLog 79558 SHA256 68d130b46fd59ba93bdaad23c60d6e80719088bf1b9a834348a5cb19a3eb5053 SHA512 8ee4362f3b873b9907e73c4b2798a20eded2ebf95f32b712c594e32e564eb447989f49beca40f154e19e292701cbd9d1d4eb157f44a2f1733252533363b386ac WHIRLPOOL 8ca8561d0daa2b4a7efc21314295216e508bb4019cc703e6c02695fac97b83ab3ea10144274f8afc947c1030377614dd83f0c87f6e3aaf77043357d36d559fb9
+MISC ChangeLog 79693 SHA256 73b79ad98266d01708dea4d61795b88d7cd58b1940d8f3c7852e9f806c3a9a08 SHA512 bc5e2fbf9eb1a65c08b6e24add7038e03ccc584992e6e2827bd0f071bfae46fadd7e777daca7f1f7a2c870818c95458e93a5bc85d5f97138e96271bd5e3797a6 WHIRLPOOL 41507164a32809dd1fc0887d6d3780cae8ec317fff7f801c00ac1d519d8b845cbc04b7eb4e176687b0445ca4691c4b5891478b487dd3e155935f493370d86e83
 MISC metadata.xml 969 SHA256 969b10a1be20daa309d3e392d005a9b1325e7e1a5bf638ae7a9151c625e79d66 SHA512 8cfc927b9df66c91a16e1d54091d36c4610575f7cbc45732dd2d7ce943859b6ec1afd7b25effb16da61d5ad2df7958daf4769fdcef4f137ceaf5112b24a78793 WHIRLPOOL a043979724cc3f4a5cf869459d60998948ed9018666824c2941a21823c3ce03a3012006767951300bdf346582f3aa6f9c035bfa0c607363eb8ef35713cd18254
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlQAyBcACgkQG9wOWsQutdYt5QQAmaYVexGIcoXxF9ltvOaPr0dx
-a3J7xZkO45o2VeSAgdQMMdHi0+Iov3uLY2qV9y+Ty6ZXJPu5Vyv6CV6IPgJJVtIO
-KepPQBIia/RuPUtc8AdWrRmMf+3dBNmq1mxkJH2IfjYTB6S8kTUNFavAHQR0vTiy
-4EpcTpi/3ufce7qLdMw=
-=7dqO
+iF4EAREIAAYFAlQA68cACgkQXYk9GL8g3FHEPAD+Jigaj+mDHP9kDkikwhrjC3mo
+81QxFqPOPWVS6UhKVN8A/AvQBGEYAK6/Co3XHft1Mo8U8JFz5Uz3MCVq8mqiTjWt
+=J1Ez
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-2.0.26-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.26-r1.ebuild
new file mode 100644
index 000000000000..fb2c98d869e9
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.26-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r1.ebuild,v 1.1 2014/08/29 21:08:19 alonbl Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-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="bzip2 doc ldap nls mta readline static selinux smartcard usb"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.4:0=
+	>=dev-libs/libgpg-error-1.11
+	>=dev-libs/libksba-1.0.7
+	>=dev-libs/pth-1.3.7
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	ldap? ( net-nds/openldap )"
+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:0=[static-libs]
+		>=dev-libs/libgpg-error-1.11[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 )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+	${COMMON_DEPEND_BINS}
+	mta? ( virtual/mta )
+	!<=app-crypt/gnupg-2.0.1
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+	epatch "${FILESDIR}/${P}-Need-to-init-the-trustdb-for-import.patch"
+	epatch_user
+}
+
+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 \
+		--enable-agent \
+		--disable-adns \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable mta mailto) \
+		$(use_enable ldap) \
+		$(use_with readline) \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd doc
+		emake html
+	fi
+}
+
+src_install() {
+	default
+
+	# bug#192151
+	dobin tools/gpgsplit tools/gpg-zip
+
+	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
+	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
+	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
+	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
+	if use ldap; then
+		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+	fi
+	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'."
+}