summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2007-10-05 23:15:27 +0000
committerRyan Hill <dirtyepic@gentoo.org>2007-10-05 23:15:27 +0000
commit04a99b9ff622fb105d851d0042f4410b6a8ee1b0 (patch)
tree8e1fed74bf8f52b7f8bef69f6ab969591a4e43d6 /media-libs/t1lib
parentversion bump. (diff)
downloadgentoo-2-04a99b9ff622fb105d851d0042f4410b6a8ee1b0.tar.gz
gentoo-2-04a99b9ff622fb105d851d0042f4410b6a8ee1b0.tar.bz2
gentoo-2-04a99b9ff622fb105d851d0042f4410b6a8ee1b0.zip
Fix parallel build for bug #194720.
(Portage version: 2.1.3.11)
Diffstat (limited to 'media-libs/t1lib')
-rw-r--r--media-libs/t1lib/ChangeLog6
-rw-r--r--media-libs/t1lib/files/t1lib-5.1.1-parallel.patch12
-rw-r--r--media-libs/t1lib/t1lib-5.1.1.ebuild5
3 files changed, 20 insertions, 3 deletions
diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index 5bc67c766730..733b9d6c752e 100644
--- a/media-libs/t1lib/ChangeLog
+++ b/media-libs/t1lib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/t1lib
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.65 2007/09/27 23:37:56 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.66 2007/10/05 23:15:27 dirtyepic Exp $
+
+ 05 Oct 2007; Ryan Hill <dirtyepic@gentoo.org>
+ +files/t1lib-5.1.1-parallel.patch, t1lib-5.1.1.ebuild:
+ Fix parallel build for bug #194720.
27 Sep 2007; Hanno Boeck <hanno@gentoo.org> +files/t1lib-5.1.1-qa.diff,
t1lib-5.1.1.ebuild:
diff --git a/media-libs/t1lib/files/t1lib-5.1.1-parallel.patch b/media-libs/t1lib/files/t1lib-5.1.1-parallel.patch
new file mode 100644
index 000000000000..d829c9ff1756
--- /dev/null
+++ b/media-libs/t1lib/files/t1lib-5.1.1-parallel.patch
@@ -0,0 +1,12 @@
+diff -Naur t1lib-5.1.1-orig/lib/Makefile.in t1lib-5.1.1/lib/Makefile.in
+--- t1lib-5.1.1-orig/lib/Makefile.in 2006-11-05 17:06:05.000000000 -0600
++++ t1lib-5.1.1/lib/Makefile.in 2007-10-04 21:21:20.000000000 -0600
+@@ -133,7 +133,7 @@
+ cp t1lib/t1lib.h .
+
+
+-libt1x.la: $(T1LIBX_OBJS)
++libt1x.la: $(T1LIBX_OBJS) libt1.la
+ $(LIBTOOL) --mode=link \
+ $(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \
+ -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
diff --git a/media-libs/t1lib/t1lib-5.1.1.ebuild b/media-libs/t1lib/t1lib-5.1.1.ebuild
index 5fa3c58fabb3..e75a3bc3030a 100644
--- a/media-libs/t1lib/t1lib-5.1.1.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.1.1.ebuild,v 1.5 2007/09/27 23:37:56 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.1.1.ebuild,v 1.6 2007/10/05 23:15:27 dirtyepic Exp $
inherit eutils flag-o-matic libtool toolchain-funcs
@@ -28,6 +28,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-5.0.2-SA26241_buffer_overflow.patch
epatch "${FILESDIR}/${P}-qa.diff"
+ epatch "${FILESDIR}"/${P}-parallel.patch
sed -i -e "s:dvips:#dvips:" "${S}"/doc/Makefile.in
sed -i -e "s:\./\(t1lib\.config\):/etc/t1lib/\1:" "${S}"/xglyph/xglyph.c
@@ -48,7 +49,7 @@ src_compile() {
econf \
--datadir=/etc \
$(use_with X x) \
- || die "econf failed."
+ || die "econf failed."
emake ${myopt} || die "emake failed."
}