reinit the tree, so we can have metadata

7 files changed, 468 insertions, 0 deletions

diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
new file mode 100644
index 000000000000..b77e87f70de5
--- /dev/null
+++ b/mail-client/nail/Manifest
@@ -0,0 +1,9 @@
+AUX nail-12.4-debian.patch 1060 SHA256 57d6259bb0de14e8583fc77dbff4329ac6a9ebcd002fcc38d435d7d94db4efb8 SHA512 3cf37a64acf205bb8404e87e93cd920ee71ae8a9a2af147c21ef7d7b4684a05c1bf38eb3cf9e7a7fef7c883fb48de2324d3a687064f1adea3ab3949d6dcce513 WHIRLPOOL 0f3dbb5d67d73f866087f219542818d77419a85bf3de9a009a4d634e741e7ef71ab9c9b554738155d55d1d10183a57ee2a52257563c7b76f6a332076d4e5b470
+AUX nail-12.4-openssl-1.patch 1860 SHA256 0c3fbb7f23f0000a40addf20d3d41d0a8e62ec8f93172118fa8798eb45dfa2e1 SHA512 6496973734f4a4c724c3dc7c46a8fde160e4bd456405737098d65d193581c891e697d728b7ebc7cb0317f9ede9b39110e1b27b2bce896aee9eec85474758eeca WHIRLPOOL 99b9cb4505d8ce7773087d38f59d4fda4bbba44ca6a98c22b2904cfff2e711c7cbc0066a382bda36b7509ce3996ddcc683864d0b63d9daff1c4233f6da36eff0
+DIST mailx-12.4.tar.bz2 271482 SHA256 92201e769fe346bc0364c87437a330ef3c97ab3e9d7b2235b93f509e85e5716a SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8 WHIRLPOOL 05884e1fe21b49dfdec298a7ba1e812d471686c744073b766cffb9f5f7bc62573f82ca59a0bd9e6fabc4625dedff97a1401167a1c8fbc92c24b47ce9d56c259e
+EBUILD nail-12.4-r2.ebuild 2370 SHA256 326df11ab083556f415015338201626c300310f0f8ecb67812bac7c7cd003e32 SHA512 026e36fffa7fe7386aa72fe1ad7fb498d37be430ed31937491edaa0b591d8963aa59597a770f0e0c7042bccf2ae9fbb96ea00d3e4143d1d543801e4c01e69dc2 WHIRLPOOL be46c11663fed250149dc881f5dd36751e5574dd1c603df9e59c96391555bb8b29670a3ba57067ec3cd82d1c71cf35fa8e3d82f936ab6b4e12467a12548b056c
+EBUILD nail-12.4-r3.ebuild 2438 SHA256 33b156ba2bf374506592a692f73d19b6fe8b6731eba45b8936e9ac8bd7aaabce SHA512 31cd2c8bab65af9ca5b1fc76e81321fe96e47017d394f4f5d7ff8b74cd94e67ac59449f200f97b77fb0d0ef55b5fd6cd9493cbfa362d9f08fb27c0c6e7212d36 WHIRLPOOL 874c8e716f3753ad53d2c8f7459f9117e8d85fbcfb85c2e1f1887592ecd2a2eb890dad3efcbe9c56d3e277db5e1ecca615d813de037b25794a51200b3a1c794e
+EBUILD nail-12.4.ebuild 2177 SHA256 294f5ffe40bc0b2152182bbd5df80e6622547595d307943988746cc9edd69c91 SHA512 e8697a8be27325b82aa4ff17b80878bbf0ea9bafa2c5bfa473789538efbb397b1e27c2aaa755f9ccddded1e7daef8262e36d7e2ab561ad78b35fa3a438a24762 WHIRLPOOL c94b1062006d0c41ccadb876d75fdfb49e58ae6f453c169adafe20b36728955ac4d526211d31a62c615459c7ec81cd6eed9ec4151033a92398dd7f9de89b531b
+MISC ChangeLog 2842 SHA256 1d5ff48e925524ea05837250619d8172add57b81ffcd0a0ebe02c6ecefdb9aa6 SHA512 92fcbac9b961dc867be4dd208c489ccaca4c4c4106df0b8f9537d643bacfbd792643985f0cfe50a0024974d79acef706ea747c6a92961e5a6362dd41784d2f86 WHIRLPOOL 0397c7bdf84e240020118a59fabbfc64b714feaeedd9d271da6079def7ba12130e3e5e918659a6819f8e868d0b0f42543a14ded5217d5a9084d14c0a899e891c
+MISC ChangeLog-2015 10869 SHA256 b72ca19cb77510a2a75250c2a8d8889db71e6ecea5e6acd9b299ee80f08afddc SHA512 64dc5ee686c2306f57ad838492bb76a7b9083420eb68762fdceb53c74344f2b5448bc923aa718947169fa79518a9570a2ae22be22e636062084153cf2b68ae80 WHIRLPOOL 21e927dd8ff0bd029b12a1bb979079d44aa0b61b19e1606e04bed5c67a39714d61cf68cc6f7b1e0886606a8a9e55a27546456e4a46cda2ecf68ed8100c987f14
+MISC metadata.xml 907 SHA256 09c18a17087d88ad42999dd19618570a44217631cc57daa5282332d04ef5ebac SHA512 7f03613e2f7f8621b996d59a63505882925e755bbc8567a2c3dce3db0304e19ee007df2633fde5232877b71161eb51d037cf205a42b926d36d3aad111a9636d3 WHIRLPOOL 7f6bb80430b5e420c4a8e5d9d2ec8bb20be624e976b358a72f12897ecf20aa1c4c6adb7b00883d666a94d5824f3c885fbfb3daa6b5f09e4553928ed090b2aa79
diff --git a/mail-client/nail/files/nail-12.4-debian.patch b/mail-client/nail/files/nail-12.4-debian.patch
new file mode 100644
index 000000000000..2fea0b190d29
--- /dev/null
+++ b/mail-client/nail/files/nail-12.4-debian.patch
@@ -0,0 +1,56 @@
+--- heirloom-mailx-12.4.orig/getopt.c
++++ heirloom-mailx-12.4/getopt.c
+@@ -43,7 +43,7 @@
+ char	*optarg;
+ int	optind = 1;
+ int	opterr = 1;
+-int	optopt;
++int	optoptc;
+ 
+ static void
+ error(const char *s, int c)
+@@ -69,7 +69,7 @@
+ 		*bp++ = *s++;
+ 	while (*msg)
+ 		*bp++ = *msg++;
+-	*bp++ = optopt;
++	*bp++ = optoptc;
+ 	*bp++ = '\n';
+ 	write(2, buf, bp - buf);
+ 	ac_free(buf);
+@@ -101,13 +101,13 @@
+ 		}
+ 		curp = &argv[optind][1];
+ 	}
+-	optopt = curp[0] & 0377;
++	optoptc = curp[0] & 0377;
+ 	while (optstring[0]) {
+ 		if (optstring[0] == ':') {
+ 			optstring++;
+ 			continue;
+ 		}
+-		if ((optstring[0] & 0377) == optopt) {
++		if ((optstring[0] & 0377) == optoptc) {
+ 			if (optstring[1] == ':') {
+ 				if (curp[1] != '\0') {
+ 					optarg = (char *)&curp[1];
+@@ -127,7 +127,7 @@
+ 					optind++;
+ 				optarg = 0;
+ 			}
+-			return optopt;
++			return optoptc;
+ 		}
+ 		optstring++;
+ 	}
+--- heirloom-mailx-12.4.orig/mailx.1
++++ heirloom-mailx-12.4/mailx.1
+@@ -3766,7 +3766,7 @@
+ .sp
+ .fi
+ which might cause
+-.N mailx
++.B mailx
+ to respond with, for example:
+ .nf
+ .sp
diff --git a/mail-client/nail/files/nail-12.4-openssl-1.patch b/mail-client/nail/files/nail-12.4-openssl-1.patch
new file mode 100644
index 000000000000..376c4d668e36
--- /dev/null
+++ b/mail-client/nail/files/nail-12.4-openssl-1.patch
@@ -0,0 +1,72 @@
+http://bugs.gentoo.org/328363
+http://repos.archlinux.org/wsvn/community/mailx-heirloom/trunk/mailx-heirloom-openssl-1.0.patch
+
+--- openssl.c
++++ openssl.c
+@@ -105,7 +105,7 @@
+ static void ssl_load_verifications(struct sock *sp);
+ static void ssl_certificate(struct sock *sp, const char *uhp);
+ static enum okay ssl_check_host(const char *server, struct sock *sp);
+-static int smime_verify(struct message *m, int n, STACK *chain,
++static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
+ 		X509_STORE *store);
+ static EVP_CIPHER *smime_cipher(const char *name);
+ static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
+@@ -308,7 +308,7 @@
+ 	X509 *cert;
+ 	X509_NAME *subj;
+ 	char data[256];
+-	/*GENERAL_NAMES*/STACK	*gens;
++	/*GENERAL_NAMES*/STACK_OF(GENERAL_NAMES)	*gens;
+ 	GENERAL_NAME	*gen;
+ 	int	i;
+ 
+@@ -496,7 +496,7 @@
+ }
+ 
+ static int
+-smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
++smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
+ {
+ 	struct message	*x;
+ 	char	*cp, *sender, *to, *cc, *cnttype;
+@@ -505,7 +505,8 @@
+ 	off_t	size;
+ 	BIO	*fb, *pb;
+ 	PKCS7	*pkcs7;
+-	STACK	*certs, *gens;
++	STACK_OF(X509)	*certs;
++	STACK_OF(GENERAL_NAMES) *gens;
+ 	X509	*cert;
+ 	X509_NAME	*subj;
+ 	char	data[LINESIZE];
+@@ -614,7 +615,7 @@
+ {
+ 	int	*msgvec = vp, *ip;
+ 	int	ec = 0;
+-	STACK	*chain = NULL;
++	STACK_OF(X509)	*chain = NULL;
+ 	X509_STORE	*store;
+ 	char	*ca_dir, *ca_file;
+ 
+@@ -687,7 +688,7 @@
+ 	X509	*cert;
+ 	PKCS7	*pkcs7;
+ 	BIO	*bb, *yb;
+-	STACK	*certs;
++	STACK_OF(X509)	*certs;
+ 	EVP_CIPHER	*cipher;
+ 
+ 	certfile = expand((char *)certfile);
+@@ -950,9 +951,9 @@
+ 	off_t	size;
+ 	BIO	*fb, *pb;
+ 	PKCS7	*pkcs7;
+-	STACK	*certs;
++	STACK_OF(X509)	*certs;
+ 	X509	*cert;
+-	STACK	*chain = NULL;
++	STACK_OF(X509)	*chain = NULL;
+ 	enum okay	ok = OKAY;
+ 
+ 	message_number = n;
diff --git a/mail-client/nail/metadata.xml b/mail-client/nail/metadata.xml
new file mode 100644
index 000000000000..c2674f0bafba
--- /dev/null
+++ b/mail-client/nail/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
+  <use>
+    <flag name="net">
+      Enable support for network protocols (POP, IMAP and SMTP). If you
+      only need to send mail with the local Transport Agent, disabling
+      this will get you support for only /usr/sbin/sendmail call.
+    </flag>
+    <flag name="ssl">
+      If network is enabled, this adds support for S/MIME and
+      SSL/TLS-powered protocols through <pkg>dev-libs/openssl</pkg>.
+    </flag>
+    <flag name="kerberos">
+      If network is enabled, this adds support for GSSAPI login on IMAP
+      through <pkg>virtual/krb5</pkg>.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">heirloom</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/mail-client/nail/nail-12.4-r2.ebuild b/mail-client/nail/nail-12.4-r2.ebuild
new file mode 100644
index 000000000000..ca0cec9d82f5
--- /dev/null
+++ b/mail-client/nail/nail-12.4-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ssl net kerberos"
+
+RDEPEND="
+	net? (
+		ssl? ( dev-libs/openssl )
+		kerberos? ( virtual/krb5 )
+	)
+	!mail-client/mailx
+	!net-mail/mailutils
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+undef() {
+	sed -i -e "/$1/s:#define:#undef:" config.h || die
+}
+
+droplib() {
+	sed -i -e "/$1/s:^:#:" LIBS || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
+	# Do not strip the binary
+	sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	# use -j1 because it will produce bogus output otherwise
+	emake -j1 config.h LIBS || die
+
+	# Logic to 'configure' the package
+
+	if ! use ssl || ! use net ; then
+		undef 'USE_\(OPEN\)\?SSL'
+		droplib -lssl
+	fi
+
+	if ! use kerberos || ! use net ; then
+		undef 'USE_GSSAPI'
+		droplib -lgssapi_krb5
+	fi
+
+	if ! use net ; then
+		undef 'HAVE_SOCKETS'
+	fi
+}
+
+src_compile() {
+	# No configure script to check for and set this
+	tc-export CC
+
+	emake \
+		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+		SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
+		MAILSPOOL='/var/spool/mail' \
+		|| die "emake failed"
+}
+
+src_install () {
+	# Use /usr/sbin/sendmail by default and provide an example
+	cat <<- EOSMTP >> nail.rc
+
+		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
+		# (Uncomment the following line to use a SMTP server)
+		#set smtp=localhost
+
+		# Ask for CC: list too.
+		set askcc
+	EOSMTP
+
+	emake DESTDIR="${D}" \
+		UCBINSTALL=$(type -p install) \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+		|| die
+
+	dodoc AUTHORS README || die
+
+	dodir /bin
+	dosym ../usr/bin/mailx /bin/mail || die
+	dosym mailx /usr/bin/mail || die
+	dosym mailx /usr/bin/Mail || die
+
+	dosym mailx.1 /usr/share/man/man1/mail.1 || die
+	dosym mailx.1 /usr/share/man/man1/Mail.1 || die
+}
diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild
new file mode 100644
index 000000000000..5100ada3c923
--- /dev/null
+++ b/mail-client/nail/nail-12.4-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="libressl ssl net kerberos"
+
+RDEPEND="
+	net? (
+		ssl? (
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+		)
+		kerberos? ( virtual/krb5 )
+	)
+	!mail-client/mailx
+	!net-mail/mailutils
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+undef() {
+	sed -i -e "/$1/s:#define:#undef:" config.h || die
+}
+
+droplib() {
+	sed -i -e "/$1/s:^:#:" LIBS || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
+	# Do not strip the binary
+	sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	# use -j1 because it will produce bogus output otherwise
+	emake -j1 config.h LIBS || die
+
+	# Logic to 'configure' the package
+
+	if ! use ssl || ! use net ; then
+		undef 'USE_\(OPEN\)\?SSL'
+		droplib -lssl
+	fi
+
+	if ! use kerberos || ! use net ; then
+		undef 'USE_GSSAPI'
+		droplib -lgssapi_krb5
+	fi
+
+	if ! use net ; then
+		undef 'HAVE_SOCKETS'
+	fi
+}
+
+src_compile() {
+	# No configure script to check for and set this
+	tc-export CC
+
+	emake \
+		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+		SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
+		MAILSPOOL='/var/spool/mail' \
+		|| die "emake failed"
+}
+
+src_install () {
+	# Use /usr/sbin/sendmail by default and provide an example
+	cat <<- EOSMTP >> nail.rc
+
+		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
+		# (Uncomment the following line to use a SMTP server)
+		#set smtp=localhost
+
+		# Ask for CC: list too.
+		set askcc
+	EOSMTP
+
+	emake DESTDIR="${D}" \
+		UCBINSTALL=$(type -p install) \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+		|| die
+
+	dodoc AUTHORS README || die
+
+	dodir /bin
+	dosym ../usr/bin/mailx /bin/mail || die
+	dosym mailx /usr/bin/mail || die
+	dosym mailx /usr/bin/Mail || die
+
+	dosym mailx.1 /usr/share/man/man1/mail.1 || die
+	dosym mailx.1 /usr/share/man/man1/Mail.1 || die
+}
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
new file mode 100644
index 000000000000..00e9a0fd8c72
--- /dev/null
+++ b/mail-client/nail/nail-12.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="ssl net kerberos"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	!mail-client/mailx
+	!net-mail/mailutils
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+remove_ssl() {
+	elog "Disabling SSL support"
+	sed -i -e 's~#define USE_\(OPEN\)\?SSL~#undef USE_\1SSL~' config.h
+	sed -i -e 's~-ssl~~' -e 's~-lcrypto~~' LIBS
+}
+
+remove_sockets() {
+	elog "Not enabling sockets (thus disabling IMAP, POP and SMTP)"
+	sed -i -e 's~#define HAVE_SOCKETS~#undef HAVE_SOCKETS~' config.h
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
+	# Do not strip the binary
+	sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	make config.h LIBS
+
+	# Logic to 'configure' the package
+	if use net && ! use ssl ; then
+		remove_ssl
+	elif ! use net ; then
+		# Linking to ssl without net support is pointless
+		remove_ssl
+		remove_sockets
+	fi
+}
+
+src_compile() {
+	# No configure script to check for and set this
+	tc-export CC
+
+	emake \
+		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+		MAILSPOOL='/var/spool/mail' \
+		|| die "emake failed"
+}
+
+src_install () {
+	# Use /usr/lib/sendmail by default and provide an example
+	cat <<- EOSMTP >> nail.rc
+
+		# Use the local sendmail (/usr/lib/sendmail) binary by default.
+		# (Uncomment the following line to use a SMTP server)
+		#set smtp=localhost
+	EOSMTP
+
+	make DESTDIR="${D}" \
+		UCBINSTALL=$(type -p install) \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+		|| die
+	dodoc AUTHORS README
+	dodir /bin
+	dosym /usr/bin/mailx /bin/mail
+	dosym /usr/bin/mailx /usr/bin/mail
+	dosym /usr/bin/mailx /usr/bin/Mail
+}