change to new style virtual/mailx - bug 350792

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

4 files changed, 24 insertions, 21 deletions

diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index eb8d90fe9637..bc747c9618b8 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -2,8 +2,8 @@ AUX mailx-8.1.2.20050715-nostrip.patch 668 RMD160 86080719a66d0889f6fa6458ab65e7
 AUX mailx-8.1.2.20050715-offsetof.patch 1566 RMD160 1c6e36cd7607550ef7616d17a4ca2a1223f7a85b SHA1 640f93913ea9d517d9ae6233450c069cdb970eee SHA256 be6bf29554e6f695492e2c9dd3a8e6d6e19a4e375982c7478941c61f992dfe4b
 DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 RMD160 bf116b8e7d1207b37d0f9451771f0f318880aff2 SHA1 f8b54d1c6fff315444f5342481fad9d5cf9b52c0 SHA256 2fb891f912624766d0bef765d69cec75ad3334dda1aa58659f3c3c1d0579c2c3
 DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 RMD160 9fdf63d616f2240141bf06dc1fbf6457ddd5fc1c SHA1 23e2ddef1bbd0df85d7ecbecc5fd62f90eb9a4a4 SHA256 5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3
-EBUILD mailx-8.1.2.20050715-r1.ebuild 1482 RMD160 95c588a2130d1e9de71deb6dd8871177a06e3091 SHA1 0a08c640e1331f7e232f40e2f97739baafaade64 SHA256 ff76b0d97e9954e1ad74ed7ff51146c936386789decf79a43e7f29577bc6733f
-EBUILD mailx-8.1.2.20050715-r2.ebuild 1550 RMD160 53a21c40105e39618f2e420ab5ed605a85cb700e SHA1 6fd335c3f2f10b75253166e9d6d92cfb3156a795 SHA256 ce5f96a0af714afef42b6921867ec654468ce28512037baa1408bec4aaaabb2e
-EBUILD mailx-8.1.2.20050715-r3.ebuild 1575 RMD160 01158d30ae348edc4be17d1dcdac32704bd43613 SHA1 135b3dbe0777a0eee8255527d43cc9e7d86a248d SHA256 60472cc3627b4b5ea098af551bf070ba8ae98fb4b4de343d868b813947504a75
+EBUILD mailx-8.1.2.20050715-r1.ebuild 1481 RMD160 7f63289831b15b23b3aacaf1351a9be37cabb1cf SHA1 09ddbb32616d3b20b0a7ac54b7a639f8fd077561 SHA256 35c7149e175bcc4a2e837d6d371450c6d167fd22c3ad6d31e67fe8c57efcdbb1
+EBUILD mailx-8.1.2.20050715-r2.ebuild 1543 RMD160 837bbae7bcb1e7328b7f789dd82f8c2a96badd19 SHA1 4179000893f12410669d4431b38a20d5d4dada21 SHA256 e4c2ea93532b76ec924ab1d771e809825b7f307d0940b2fef941363b01fb4c88
+EBUILD mailx-8.1.2.20050715-r3.ebuild 1566 RMD160 4d16d58e9fc7a394d4b97b320c5b10d378bde963 SHA1 c4d286bec9de08d647fc71dc00738639fa8ec480 SHA256 1cd74038b3c0d6f29a7dccaeab163f02c9ba8a76e58d7db3e214f0ed7644769c
 MISC ChangeLog 11156 RMD160 2c5454ae35f3b585e9bc7108ecad77e6474654cc SHA1 0a5f5b49921cca81c89f690bf196a3739477d55e SHA256 52ac615fd8b1ea078e42572f205934a4d59511c873faf7f48c5286ce6746ca44
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r1.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r1.ebuild
index 269745dd40bc..9aa1ec5d0a02 100644
--- a/mail-client/mailx/mailx-8.1.2.20050715-r1.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r1.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/mailx/mailx-8.1.2.20050715-r1.ebuild,v 1.15 2010/10/19 05:56:43 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r1.ebuild,v 1.16 2011/03/20 13:26:20 eras Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,14 +22,15 @@ IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
 	virtual/mta
-	!mail-client/mailutils
-	mail-client/mailx-support
-	!virtual/mailx"
-PROVIDE="virtual/mailx"
+	mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+	!mail-client/nail
+	!net-mail/mailutils"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch "${DISTDIR}/${debian_patch}"
 	epatch "${FILESDIR}/${P}-nostrip.patch"
 	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r2.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r2.ebuild
index 0f0b3454c3da..93fffe9696be 100644
--- a/mail-client/mailx/mailx-8.1.2.20050715-r2.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20050715-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/mailx/mailx-8.1.2.20050715-r2.ebuild,v 1.3 2010/11/01 12:19:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r2.ebuild,v 1.4 2011/03/20 13:26:20 eras Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,10 +22,11 @@ IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
 	virtual/mta
-	!mail-client/mailutils
-	mail-client/mailx-support
-	!virtual/mailx"
-PROVIDE="virtual/mailx"
+	mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+	!mail-client/nail
+	!net-mail/mailutils"
 
 src_unpack() {
 	unpack ${A}
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r3.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r3.ebuild
index beb2b92a5c27..8bf0cb9067a2 100644
--- a/mail-client/mailx/mailx-8.1.2.20050715-r3.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r3.ebuild,v 1.6 2011/01/22 20:58:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r3.ebuild,v 1.7 2011/03/20 13:26:20 eras Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -22,10 +22,11 @@ IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
 	virtual/mta
-	!mail-client/mailutils
-	mail-client/mailx-support
-	!virtual/mailx"
-PROVIDE="virtual/mailx"
+	mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+	!mail-client/nail
+	!net-mail/mailutils"
 
 src_unpack() {
 	unpack ${A}