summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando J. Pereda <ferdy@gentoo.org>2005-01-27 21:18:46 +0000
committerFernando J. Pereda <ferdy@gentoo.org>2005-01-27 21:18:46 +0000
commitc3f2729d21d477d9ff93b7022b51d7d8a68567f4 (patch)
tree3c8fd8c8065d87766b24a5638ff5d071d3afe4ac /mail-client
parentinitial import (diff)
downloadgentoo-2-c3f2729d21d477d9ff93b7022b51d7d8a68567f4.tar.gz
gentoo-2-c3f2729d21d477d9ff93b7022b51d7d8a68567f4.tar.bz2
gentoo-2-c3f2729d21d477d9ff93b7022b51d7d8a68567f4.zip
Removed the patch in favor of sed. Still #79655 (hope this finally closes it). Thanks to Stefan Briesenick <sbriesen@gmx.de>
(Portage version: 2.0.51-r15)
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/mailx/ChangeLog9
-rw-r--r--mail-client/mailx/Manifest13
-rw-r--r--mail-client/mailx/files/mailx-2004-cflags.diff11
-rw-r--r--mail-client/mailx/mailx-8.1.2.20040524-r1.ebuild4
4 files changed, 11 insertions, 26 deletions
diff --git a/mail-client/mailx/ChangeLog b/mail-client/mailx/ChangeLog
index 99ad43ede073..27618f41583d 100644
--- a/mail-client/mailx/ChangeLog
+++ b/mail-client/mailx/ChangeLog
@@ -1,6 +1,13 @@
# 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.27 2005/01/27 08:00:02 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.28 2005/01/27 21:18:46 ferdy Exp $
+
+*mailx-8.1.2.20040524-r1 (27 Jan 2005)
+
+ 27 Jan 2005; Fernando J. Pereda <ferdy@gentoo.org>
+ -files/mailx-2004-cflags.diff, mailx-8.1.2.20040524-r1.ebuild:
+ Removed cflags patch. Using sed to do the task still #79655 thanks again to
+ Stefan Briesenick <sbriesen@gmx.de>
27 Jan 2005; Fernando J. Pereda <ferdy@gentoo.org>
+files/mailx-2004-cflags.diff:
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index dd1762e7f9e9..f606eb2e0a8a 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,11 +1,8 @@
------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 b4906d25a42232d5c543ea4235415acd mailx-8.1.2.20040524-r1.ebuild 1511
+MD5 178392079a990083f12ae47fc6f07c94 mailx-8.1.2.20040524-r1.ebuild 1487
MD5 31f36aac4b437de339c8f00ac3509370 ChangeLog 6022
MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
MD5 455a91688ea40637788a8a20ae4a6f89 files/digest-mailx-8.1.2.20040524 138
@@ -13,12 +10,4 @@ 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)
-
-iD8DBQFB+J+QViELBEf1JB0RAgLkAJ9kyuEtU2jun/uOMIiZi0E0PgVn5wCfV5Ao
-pNbmXsnKYzeSS0DquHNV7cI=
-=Z2gH
------END PGP SIGNATURE-----
diff --git a/mail-client/mailx/files/mailx-2004-cflags.diff b/mail-client/mailx/files/mailx-2004-cflags.diff
deleted file mode 100644
index 14ee8f54f38c..000000000000
--- a/mail-client/mailx/files/mailx-2004-cflags.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index f56faa35ae87..ce7ba6f9aaaa 100644
--- a/mail-client/mailx/mailx-8.1.2.20040524-r1.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20040524-r1.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20040524-r1.ebuild,v 1.2 2005/01/27 21:18:46 ferdy Exp $
inherit ccc eutils flag-o-matic
@@ -30,7 +30,7 @@ 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"
+ sed -i -e "s: -O2: ${CFLAGS}:g" Makefile
}
src_compile() {