Enforce the use of CFLAGS, #79655 reported by Stefan Briesenick <sbriesen@gmx.de>

(Portage version: 2.0.51-r15)

5 files changed, 84 insertions, 12 deletions

diff --git a/mail-client/mailx/ChangeLog b/mail-client/mailx/ChangeLog
index 0eea11a62006..99ad43ede073 100644
--- a/mail-client/mailx/ChangeLog
+++ b/mail-client/mailx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mailx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.26 2005/01/26 18:21:17 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.27 2005/01/27 08:00:02 ferdy Exp $
+
+  27 Jan 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/mailx-2004-cflags.diff:
+  Patch Makefile to enforce the use of CFLAGS. Closes #79655. First approach
+  submitted by: Stefan Briesenick <sbriesen@gmx.de>
 
 *mailx-8.1.2.20040524 (26 Jan 2005)
 
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index f1088999465e..9ed542d46c66 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ca72ff49d1022c43e94a865bcaa3483e mailx-8.1.2.20021129-r3.ebuild 1479
 MD5 22b49780b2accf7fcb5d93a5f82458c2 mailx-8.1.2.20021129-r2.ebuild 1496
 MD5 59f54243560db62fc8783e9aa82ea624 mailx-8.1.2.20040524.ebuild 1419
 MD5 6909795ce09841347b25cca6a4ac27cb mailx-8.1.2.20021129-r4.ebuild 1519
-MD5 e40958523c4503f00876a34341961d66 ChangeLog 5806
+MD5 9ac63319b5c7e2869e164eb1affe3645 mailx-8.1.2.20040524-r1.ebuild 1400
+MD5 87bc55a19396c2fa08f54ab36c200c5f ChangeLog 6022
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 455a91688ea40637788a8a20ae4a6f89 files/digest-mailx-8.1.2.20040524 138
 MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r2 192
 MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r3 192
 MD5 0fabe69aadfc340d678b9d355e0d451e files/digest-mailx-8.1.2.20021129-r4 192
+MD5 455a91688ea40637788a8a20ae4a6f89 files/digest-mailx-8.1.2.20040524-r1 138
+MD5 6d4a755db204fb8ecbcf89f15a962ed9 files/mailx-2004-cflags.diff 325
 MD5 43bee2592e0aaf68de420a44df5cf3b6 files/mailx-64bit.diff 4989
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB9+JIViELBEf1JB0RAmvoAJsHc1w2DZKEaeA+SNycNb82shhU9gCeI6Y5
-TLdInvzpJ1ZKeAYouqw5k0g=
-=LdzU
------END PGP SIGNATURE-----
diff --git a/mail-client/mailx/files/digest-mailx-8.1.2.20040524-r1 b/mail-client/mailx/files/digest-mailx-8.1.2.20040524-r1
new file mode 100644
index 000000000000..d2d11f45a6ef
--- /dev/null
+++ b/mail-client/mailx/files/digest-mailx-8.1.2.20040524-r1
@@ -0,0 +1,2 @@
+MD5 beb851e5eeb1d793c0674b37ea84fda1 mailx_8.1.2.orig.tar.gz 94950
+MD5 29a399e2b806ec45b989a62dbb83c8c3 mailx-20040524-cvs.diff.bz2 34358
diff --git a/mail-client/mailx/files/mailx-2004-cflags.diff b/mail-client/mailx/files/mailx-2004-cflags.diff
new file mode 100644
index 000000000000..14ee8f54f38c
--- /dev/null
+++ b/mail-client/mailx/files/mailx-2004-cflags.diff
@@ -0,0 +1,11 @@
+--- Makefile.old        2005-01-27 08:50:34.910805608 +0100
++++ Makefile    2005-01-27 08:51:29.803460656 +0100
+@@ -3,7 +3,7 @@
+ PROG=mail
+ CC=gcc
+ 
+-CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT
++CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT $(EXTRAFLAGS)
+ 
+ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+   CFLAGS += -O0
diff --git a/mail-client/mailx/mailx-8.1.2.20040524-r1.ebuild b/mail-client/mailx/mailx-8.1.2.20040524-r1.ebuild
new file mode 100644
index 000000000000..f56faa35ae87
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20040524-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 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.20040524-r1.ebuild,v 1.1 2005/01/27 08:00:02 ferdy Exp $
+
+inherit ccc eutils flag-o-matic
+
+IUSE=""
+MX_VER="8.1.2"
+S=${WORKDIR}/${PN}-${MX_VER}
+
+DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts."
+SRC_URI="http://dev.gentoo.org/~ferdy/distfiles/${PN}_${MX_VER}.orig.tar.gz
+	http://dev.gentoo.org/~ferdy/distfiles/${PN}-20040524-cvs.diff.bz2"
+#SRC_URI="mirror://gentoo/mailx_${MX_VER}.orig.tar.gz
+#	mirror://gentoo/${PN}-20040524-cvs.diff.bz2"
+HOMEPAGE="http://www.debian.org"
+
+DEPEND=">=net-libs/liblockfile-1.03
+	virtual/mta
+	!mail-client/mailutils
+	mail-client/mailx-support
+	!virtual/mailx"
+PROVIDE="virtual/mailx"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${DISTDIR}/${PN}-20040524-cvs.diff.bz2 || die "epatch failed"
+	epatch ${FILESDIR}/${PN}-2004-cflags.diff || die "epatch failed"
+}
+
+src_compile() {
+	is-ccc && replace-cc-hardcode
+	make EXTRAFLAGS="${CFLAGS}" || die
+}
+
+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
+}