summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-06-07 14:23:46 +0000
committerJeroen Roovers <jer@gentoo.org>2013-06-07 14:23:46 +0000
commit365c3e49300d2d8289036f171632ac0d65994418 (patch)
treec3c37fbfc8796b7fa6594af16ee1a5930a1421e1 /media-gfx/xfig
parentfix bug #472578 (diff)
downloadgentoo-2-365c3e49300d2d8289036f171632ac0d65994418.tar.gz
gentoo-2-365c3e49300d2d8289036f171632ac0d65994418.tar.bz2
gentoo-2-365c3e49300d2d8289036f171632ac0d65994418.zip
Die more often. RDEPEND on x11-libs/libXt. Remove unneeded einfo.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'media-gfx/xfig')
-rw-r--r--media-gfx/xfig/ChangeLog6
-rw-r--r--media-gfx/xfig/xfig-3.2.5b-r2.ebuild16
-rw-r--r--media-gfx/xfig/xfig-3.2.5b-r3.ebuild24
3 files changed, 32 insertions, 14 deletions
diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index b16ab29c56db..385ae1d2017f 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/xfig
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.81 2013/06/06 21:50:51 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.82 2013/06/07 14:23:46 jer Exp $
+
+ 07 Jun 2013; Jeroen Roovers <jer@gentoo.org> xfig-3.2.5b-r2.ebuild,
+ xfig-3.2.5b-r3.ebuild:
+ Die more often. RDEPEND on x11-libs/libXt. Remove unneeded einfo.
06 Jun 2013; Chema Alonso <nimiux@gentoo.org> xfig-3.2.5b-r3.ebuild:
Stable for amd64 wrt bug #472340
diff --git a/media-gfx/xfig/xfig-3.2.5b-r2.ebuild b/media-gfx/xfig/xfig-3.2.5b-r2.ebuild
index 85e6d4a04268..d06aac7fb570 100644
--- a/media-gfx/xfig/xfig-3.2.5b-r2.ebuild
+++ b/media-gfx/xfig/xfig-3.2.5b-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild,v 1.1 2011/11/06 06:39:07 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r2.ebuild,v 1.2 2013/06/07 14:23:46 jer Exp $
EAPI="2"
inherit eutils multilib
@@ -50,12 +50,18 @@ sed_Imakefile() {
for variable in "${vars2subs[@]}" ; do
varname=${variable%%=*}
varval=${variable##*=}
- sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
+ sed -i \
+ -e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
+ "$@" || die
done
- sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" "$@"
+ sed -i \
+ -e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
+ "$@" || die
if has_version '>=x11-libs/libXaw3d-1.5e'; then
einfo "x11-libs/libXaw3d 1.5e and abover installed"
- sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@"
+ sed -i \
+ -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" \
+ "$@" || die
fi
}
diff --git a/media-gfx/xfig/xfig-3.2.5b-r3.ebuild b/media-gfx/xfig/xfig-3.2.5b-r3.ebuild
index 5417faa13740..47abf1a57392 100644
--- a/media-gfx/xfig/xfig-3.2.5b-r3.ebuild
+++ b/media-gfx/xfig/xfig-3.2.5b-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r3.ebuild,v 1.4 2013/06/06 21:50:51 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5b-r3.ebuild,v 1.5 2013/06/07 14:23:46 jer Exp $
EAPI=5
@@ -22,6 +22,7 @@ RDEPEND="x11-libs/libXaw
x11-libs/libXaw3d
nls? ( x11-libs/libXaw3d[unicode] )
x11-libs/libXi
+ x11-libs/libXt
virtual/jpeg
media-libs/libpng
media-fonts/font-misc-misc
@@ -52,23 +53,30 @@ sed_Imakefile() {
for variable in "${vars2subs[@]}" ; do
varname=${variable%%=*}
varval=${variable##*=}
- sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
+ sed -i \
+ -e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
+ "$@" || die
done
if use nls; then
- sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" "$@"
+ sed -i \
+ -e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
+ "$@" || die
# Fix #405475 and #426780 by Markus Peloquin #405475 comment 17
- sed -i 's:^I18N_DEFS[[:space:]]*=.*:& -DXAW_INTERNATIONALIZATION:' "$@"
+ sed -i \
+ -e 's:^I18N_DEFS[[:space:]]*=.*:& -DXAW_INTERNATIONALIZATION:' \
+ "$@" || die
fi
if has_version '>=x11-libs/libXaw3d-1.5e'; then
- einfo "x11-libs/libXaw3d 1.5e and abover installed"
- sed -i "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@"
+ sed -i \
+ -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" \
+ "$@" || die
fi
}
src_prepare() {
# Permissions are really crazy here
- chmod -R go+rX .
- find . -type f -exec chmod a-x '{}' \;
+ chmod -R go+rX . || die
+ find . -type f -exec chmod a-x '{}' \; || die
epatch "${FILESDIR}/${P}-figparserstack.patch" #297379
epatch "${FILESDIR}/${P}-spelling.patch"
epatch "${FILESDIR}/${P}-papersize_b1.patch"