remove old and change to new style virtual/mailx - bug 350792

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

5 files changed, 17 insertions, 122 deletions

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index 0005f0077c9f..11466a51119e 100644
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/nail
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.76 2010/10/04 19:55:54 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.77 2011/03/20 13:18:38 eras Exp $
+
+  20 Mar 2011; Eray Aslan <eras@gentoo.org> nail-12.4.ebuild,
+  -nail-12.4-r1.ebuild, nail-12.4-r2.ebuild:
+  remove old and change to new style virtual/mailx - bug 350792
 
   04 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org> nail-12.4-r2.ebuild:
   Use -j1 when building config or it'll produce bad files.
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index fc309ab29b8f..0bb68a173c48 100644
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nail-12.4-debian.patch 1060 RMD160 0df7a5654c0cc8b38570cc73fb5e8efcceaab26e SHA1 59066d0220e6ca4d86fc24c87d5f74900e149645 SHA256 57d6259bb0de14e8583fc77dbff4329ac6a9ebcd002fcc38d435d7d94db4efb8
 AUX nail-12.4-openssl-1.patch 1860 RMD160 93e57687e7a65b2751c86e83da7749df68817313 SHA1 aee47cfa611d44ecf2abf2ea79ae2e214fa57480 SHA256 0c3fbb7f23f0000a40addf20d3d41d0a8e62ec8f93172118fa8798eb45dfa2e1
 DIST mailx-12.4.tar.bz2 271482 RMD160 8244d04d0a0058fdbe9867ca503c7cda8d580154 SHA1 b1e105adf9d36269daf317dedf68b6e4cca404a7 SHA256 92201e769fe346bc0364c87437a330ef3c97ab3e9d7b2235b93f509e85e5716a
-EBUILD nail-12.4-r1.ebuild 2272 RMD160 78d8b04e11c4492bd91383577f7a96321a6878f7 SHA1 e1915e26b3124da987e90bbb96dfd97fed09a41a SHA256 596559b02ebf662ad8c7c20019384afcb2b2531204be0ba5813c44dc1bf19df0
-EBUILD nail-12.4-r2.ebuild 2501 RMD160 290aa5a40e48d6669c3492e092621b6e54a30a69 SHA1 8fa13c3f1a16735b2176dee9616c9754dba45180 SHA256 98be2a6b1bc80c35bc8dfa6ebad691358a6b68aece6427a28ed02e60b9e54fdf
-EBUILD nail-12.4.ebuild 2302 RMD160 5ceea95bb3b2f3e5e09814cf7a43f364db05b010 SHA1 c8c2113a2aaf6aed4f4322b3edbfc5f390b6737c SHA256 2acd4d1aebcd424a85846efc9e0b6ed046d4086169fa3917e124d2d3488fcca8
-MISC ChangeLog 10261 RMD160 6eee3b8fc21262f274089221ab94f8d1f7058162 SHA1 2d61e1f8c406626e0203b73b5c0bbe7d90f73944 SHA256 81d4f5c277411ad055db88b544361dd10f58a881de1429f6d39b64696e266771
+EBUILD nail-12.4-r2.ebuild 2497 RMD160 fc107d9e2c8b7406143cf9e0eb5a2d789f0fe417 SHA1 4986a5a12afdcfd2718cc4d946ce96c1cb9cdd5e SHA256 359f16d6477d5c1e51b6c4d3afdfe8eee0aef7159cdf2f099e762486ed70061c
+EBUILD nail-12.4.ebuild 2300 RMD160 adcbea48651f4e44b1ec1b7e57ac56e8fa5fa0fd SHA1 40590d8964372be2f7f24d67638cf909e69d44e4 SHA256 b359879f6673e576f338a3b47d1a10809300ffefc7bb1d05cf4881c798eab3aa
+MISC ChangeLog 10428 RMD160 5c47aae9a034e312c8975f7852e877fb9ee0f411 SHA1 95e95964d310200950e021eaa28590513eb3fd4b SHA256 af9343831b55922cc1c8096f5872876a8f4a7c56f19ec92cab373081a2c2b4c3
 MISC metadata.xml 816 RMD160 13c6aecac2e81344c9dd9d73c0c91f37b6749895 SHA1 53d0182112045838900c2c7f2a91407895bd8ec0 SHA256 462ca41c8f5f6f72d7ae605dddaa936ac656272f4c1e8297ef369d30cc7cd7d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyqMT4ACgkQAiZjviIA2XgJ3ACcCQvokq+fibqK3kJC/Ucesh9c
-0zQAmgKcN6L+BMdpV6ux0jD58/TPfVHy
-=l2Ko
------END PGP SIGNATURE-----
diff --git a/mail-client/nail/nail-12.4-r1.ebuild b/mail-client/nail/nail-12.4-r1.ebuild
deleted file mode 100644
index ad60411b38c3..000000000000
--- a/mail-client/nail/nail-12.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4-r1.ebuild,v 1.3 2010/09/23 20:51:49 maekke Exp $
-
-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 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ssl net kerberos"
-
-PROVIDE="virtual/mailx"
-RDEPEND="
-	net? (
-		ssl? ( dev-libs/openssl )
-		kerberos? ( virtual/krb5 )
-	)
-	!virtual/mailx
-"
-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
-	make config.h LIBS
-
-	# 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/lib/sendmail" \
-		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
-}
diff --git a/mail-client/nail/nail-12.4-r2.ebuild b/mail-client/nail/nail-12.4-r2.ebuild
index 5fa52d829194..cc2c70f7db04 100644
--- a/mail-client/nail/nail-12.4-r2.ebuild
+++ b/mail-client/nail/nail-12.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4-r2.ebuild,v 1.2 2010/10/04 19:55:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4-r2.ebuild,v 1.3 2011/03/20 13:18:38 eras Exp $
 
 EAPI="3"
 
@@ -17,13 +17,13 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl net kerberos"
 
-PROVIDE="virtual/mailx"
 RDEPEND="
 	net? (
 		ssl? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
 	)
-	!virtual/mailx
+	!mail-client/mailx
+	!net-mail/mailutils
 "
 DEPEND="${RDEPEND}"
 
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
index 0cf406a07a5b..576f21f687a1 100644
--- a/mail-client/nail/nail-12.4.ebuild
+++ b/mail-client/nail/nail-12.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.15 2010/09/04 14:53:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.16 2011/03/20 13:18:38 eras Exp $
 
 EAPI="3"
 
@@ -17,11 +17,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~x86-interix"
 IUSE="ssl net kerberos"
 
-PROVIDE="virtual/mailx"
 RDEPEND="
 	ssl? ( dev-libs/openssl )
 	kerberos? ( virtual/krb5 )
-	!virtual/mailx
+	!mail-client/mailx
+	!net-mail/mailutils
 "
 DEPEND="${RDEPEND}"