summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-10-06 08:24:48 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-10-06 08:24:48 +0000
commit88a3d5e4f9e0c8f8a8b73d240f63d8a7a18eb197 (patch)
tree530f7b4a0016ebdad1268c685b049b15f9b55055
parentFixup error message for bug #239846. (diff)
downloadgentoo-2-88a3d5e4f9e0c8f8a8b73d240f63d8a7a18eb197.tar.gz
gentoo-2-88a3d5e4f9e0c8f8a8b73d240f63d8a7a18eb197.tar.bz2
gentoo-2-88a3d5e4f9e0c8f8a8b73d240f63d8a7a18eb197.zip
Fix obvious typo, don't die every time X is disabled reporting a sed failure.
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
-rw-r--r--dev-libs/mpatrol/ChangeLog7
-rw-r--r--dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild22
2 files changed, 18 insertions, 11 deletions
diff --git a/dev-libs/mpatrol/ChangeLog b/dev-libs/mpatrol/ChangeLog
index 82bc01459e52..27e63db7f3b1 100644
--- a/dev-libs/mpatrol/ChangeLog
+++ b/dev-libs/mpatrol/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/mpatrol
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.17 2008/04/21 17:14:57 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.18 2008/10/06 08:24:48 flameeyes Exp $
+
+ 06 Oct 2008; Diego Pettenò <flameeyes@gentoo.org>
+ mpatrol-1.4.8-r2.ebuild:
+ Fix obvious typo, don't die every time X is disabled reporting a sed
+ failure.
21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
index 9b5cd8bdcd99..ae4d4eede772 100644
--- a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
+++ b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild,v 1.2 2007/07/12 02:25:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild,v 1.3 2008/10/06 08:24:48 flameeyes Exp $
inherit eutils flag-o-matic
@@ -30,21 +30,23 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-textrel-fix.patch || die "patching failed"
sed -i \
- -e 's:#define MP_SYMBOL_LIBS , MP_LIBNAME(bfd), MP_LIBNAME(iberty):#define MP_SYMBOL_LIBS , MP_LIBNAME(bfd):' config.h \
- || die "sed config.h failed"
+ -e 's:#define MP_SYMBOL_LIBS , MP_LIBNAME(bfd), MP_LIBNAME(iberty):#define MP_SYMBOL_LIBS , MP_LIBNAME(bfd):' config.h \
+ || die "sed config.h failed"
cd ${S}/build/unix
sed -i \
- -e 's:^OFLAGS.= -O3:OFLAGS = ${OPT_FLAGS}:' Makefile \
- || die "sed Makefile for CFLAGS failed"
+ -e 's:^OFLAGS.= -O3:OFLAGS = ${OPT_FLAGS}:' Makefile \
+ || die "sed Makefile for CFLAGS failed"
sed -i \
- -e 's:$(LD) $(LDFLAGS) -o $@ $(SHARED_MPTOBJS):$(LD) $(LDFLAGS) -liberty -o $@ $(SHARED_MPTOBJS):' Makefile \
- || die "sed Makefile for fixing -libiberty failed"
+ -e 's:$(LD) $(LDFLAGS) -o $@ $(SHARED_MPTOBJS):$(LD) $(LDFLAGS) -liberty -o $@ $(SHARED_MPTOBJS):' Makefile \
+ || die "sed Makefile for fixing -libiberty failed"
- use X && sed -i \
- -e 's:^GUISUP.= false:GUISUP = true:' Makefile \
+ if use X; then
+ sed -i \
+ -e 's:^GUISUP.= false:GUISUP = true:' Makefile \
|| die "sed Makefile for GUISUP failed"
+ fi
}