Apply 64-bit compatibility patch on all architectures instead of just ia64

5 files changed, 94 insertions, 16 deletions

diff --git a/mail-client/mailx/ChangeLog b/mail-client/mailx/ChangeLog
index 70d859735ee6..3eb7c4e9bc27 100644
--- a/mail-client/mailx/ChangeLog
+++ b/mail-client/mailx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mailx
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.2 2004/06/04 18:26:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.3 2004/06/07 04:09:39 agriffis Exp $
+
+*mailx-8.1.2.20021129-r3 (07 Jun 2004)
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  +mailx-8.1.2.20021129-r3.ebuild:
+  Apply 64-bit compatibility patch on all architectures instead of just ia64
 
   04 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
   mailx-8.1.2.20021129-r2.ebuild:
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index a1011ec65714..84fb6e095207 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,14 +1,16 @@
-MD5 9fc3c3abee53b16780c76c313fe99b79 mailx-8.1.2.20021129-r2.ebuild 1535
-MD5 62154577e95e0cbbe6d11cc8f214f1c1 mailx-8.1.2.20021129.ebuild 1204
+MD5 690d586baaac06c67d716aea67ed49e9 mailx-8.1.2.20021129-r3.ebuild 1512
+MD5 d0f0868bfd89300b5cd7292cde5503af mailx-8.1.2.20021129.ebuild 1203
+MD5 7596f6fbf0c33789f04fdd9820d6bd2f mailx-8.1.2.20021129-r2.ebuild 1534
+MD5 f90549954d6a170202a25bbbf447e188 mailx-8.1.1.11.ebuild 1298
+MD5 b6b0877b7c6bddf3d480414c1769e775 mailx-8.1.2.20021129-r1.ebuild 1393
+MD5 c7259c09fcd03689c5167932731e6f64 ChangeLog 3262
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 bc670c7f9c008dd8e937e8298aa93ef4 ChangeLog 3058
-MD5 7c9e2305297eccad306385900fba2bb0 mailx-8.1.1.11.ebuild 1299
-MD5 831b43005a041d25b5ae98db8e3101c0 mailx-8.1.2.20021129-r1.ebuild 1394
-MD5 b55cd4835b1455405746de99343a1829 files/digest-mailx-8.1.1.11 67
-MD5 03da0db1eb8ae098acadd868243269e9 files/mailx-8.1.1.11-version.diff 314
 MD5 b55cd4835b1455405746de99343a1829 files/digest-mailx-8.1.2.20021129 67
-MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r2 192
-MD5 3aa3c2c06077baa24f3a60f4f07f4e5a files/mailx-8.1.1.11-Makefile.diff 697
+MD5 b55cd4835b1455405746de99343a1829 files/digest-mailx-8.1.1.11 67
 MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r1 192
-MD5 43bee2592e0aaf68de420a44df5cf3b6 files/mailx-64bit.diff 4989
+MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r2 192
+MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r3 192
 MD5 e1210a2c73f4c28a1ddfef47de783040 files/mailx-8.1.1.11.diff 59404
+MD5 03da0db1eb8ae098acadd868243269e9 files/mailx-8.1.1.11-version.diff 314
+MD5 43bee2592e0aaf68de420a44df5cf3b6 files/mailx-64bit.diff 4989
+MD5 3aa3c2c06077baa24f3a60f4f07f4e5a files/mailx-8.1.1.11-Makefile.diff 697
diff --git a/mail-client/mailx/files/digest-mailx-8.1.2.20021129-r3 b/mail-client/mailx/files/digest-mailx-8.1.2.20021129-r3
new file mode 100644
index 000000000000..abbfdc5927fd
--- /dev/null
+++ b/mail-client/mailx/files/digest-mailx-8.1.2.20021129-r3
@@ -0,0 +1,3 @@
+MD5 c779002cb043b57fd5198ec2032cacb0 mailx_8.1.1.orig.tar.gz 89069
+MD5 49a4dbee10b9997127dd4d3001bd5b04 multifix.diff.gz 91955
+MD5 c75f19ddb9dd35d6d22e5d63e8b96d06 20021129-cvs.diff.bz2 64969
diff --git a/mail-client/mailx/mailx-8.1.2.20021129-r3.ebuild b/mail-client/mailx/mailx-8.1.2.20021129-r3.ebuild
new file mode 100644
index 000000000000..6ac763d2827e
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20021129-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20021129-r3.ebuild,v 1.1 2004/06/07 04:09:39 agriffis Exp $
+
+inherit ccc eutils
+
+MX_VER="8.1.1"
+S=${WORKDIR}/mailx-${MX_VER}.orig
+
+DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts."
+SRC_URI="ftp://ftp.debian.org/debian/pool/main/m/mailx/mailx_${MX_VER}.orig.tar.gz
+	mirror://gentoo/multifix.diff.gz
+	mirror://gentoo/20021129-cvs.diff.bz2"
+HOMEPAGE="http://www.debian.org"
+
+DEPEND=">=net-libs/liblockfile-1.03
+	virtual/mta
+	!mail-client/mailutils
+	mail-client/mailx-support"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${DISTDIR}/20021129-cvs.diff.bz2 || die "patch failed"
+	epatch ${DISTDIR}/multifix.diff.gz || die "patch failed"
+	epatch ${FILESDIR}/mailx-64bit.diff || die "patch failed"
+}
+
+src_compile() {
+
+	is-ccc && replace-cc-hardcode
+
+	# Can't compile mailx with optimizations
+	_CFLAGS=$(echo $CFLAGS|sed 's/-O.//g')
+
+	make CFLAGS="$_CFLAGS" || die "make failed"
+
+}
+
+src_install() {
+
+	dodir /bin /usr/share/man/man1 /etc /usr/lib
+
+	insinto /bin
+	insopts -m 755
+	doins mail
+
+	doman mail.1
+
+	dosym mail /bin/Mail
+	dosym mail /bin/mailx
+	dosym mail.1 /usr/share/man/man1/Mail.1
+
+	cd ${S}/misc
+	insinto /usr/lib
+	insopts -m 644
+	doins mail.help mail.tildehelp
+	insinto /etc
+	insopts -m 644
+	doins mail.rc
+
+}
diff --git a/mail-client/ximian-connector/Manifest b/mail-client/ximian-connector/Manifest
index 617b5f848c7c..0405d4b8bcf2 100644
--- a/mail-client/ximian-connector/Manifest
+++ b/mail-client/ximian-connector/Manifest
@@ -1,8 +1,8 @@
+MD5 121179b635d6b4597f254e65262507fb ximian-connector-1.2.2_p1.ebuild 1888
+MD5 2e1d96b86b8cc87b93fea5adf3894306 ximian-connector-1.4.6.0.6.1.ebuild 1995
+MD5 bbf077e6bac6f9edffa17feec80ccde9 ximian-connector-1.4.5.0.6.1.ebuild 1900
+MD5 0aea371b06632a9f153a77d2d10d8555 ChangeLog 4231
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9dfb89cf8aa1ed2f2530cf73c0c6c478 files/digest-ximian-connector-1.2.2_p1 173
 MD5 4e676dc9e9dec624d8642279f3adca58 files/digest-ximian-connector-1.4.5.0.6.1 90
 MD5 3730cdefc85ccad40292f6321fc0f4d3 files/digest-ximian-connector-1.4.6.0.6.1 90
-MD5 25f8f70925842ed46f2d7e05dc6524f9 ChangeLog 4086
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 640ee7c1034e9e0634d0813ce398f20c ximian-connector-1.2.2_p1.ebuild 1900
-MD5 cf091d9861bb229198040a9ba0b9e0e7 ximian-connector-1.4.5.0.6.1.ebuild 1909
-MD5 653c118b910d602b0bf5c82767d58025 ximian-connector-1.4.6.0.6.1.ebuild 1996