Fixed compilation problem with parallel building. Closes bug #52586.

5 files changed, 14 insertions, 35 deletions

diff --git a/media-libs/libirman/ChangeLog b/media-libs/libirman/ChangeLog
index 9660b1dada62..8652a0d5cbd1 100644
--- a/media-libs/libirman/ChangeLog
+++ b/media-libs/libirman/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for media-libs/libirman
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/ChangeLog,v 1.12 2004/09/24 10:02:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/ChangeLog,v 1.13 2004/09/24 10:06:36 eradicator Exp $
 
   24 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -libirman-0.4.2.ebuild, libirman-0.4.2-r1.ebuild,
   +files/libirman-0.4.2-destdir.patch:
+  Fixed compilation problem with parallel building.  Closes bug #52586.
   Fixed installation on amd64 with multilib.
+  Removing old version.
 
   01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   libirman-0.4.2-r1.ebuild:
diff --git a/media-libs/libirman/Manifest b/media-libs/libirman/Manifest
index 429162e3a87e..df13e0f9ee19 100644
--- a/media-libs/libirman/Manifest
+++ b/media-libs/libirman/Manifest
@@ -1,8 +1,6 @@
 MD5 e1130571bb48518bda6de7441a063dff metadata.xml 159
-MD5 a0fc58b42f1df87c3dc1fdaa8983f754 libirman-0.4.2.ebuild 727
-MD5 8956c5e65de1f48444e90911cd1c4fa5 ChangeLog 1628
-MD5 385bee801412082776104a88d8a1fe0a libirman-0.4.2-r1.ebuild 858
-MD5 3cd23162cf3639176a9e24d4b1fd6b80 files/digest-libirman-0.4.2 65
+MD5 5d5de994be43f85961eca28053ee392c ChangeLog 1776
+MD5 e608832769d67533f8ea604a592b24fd libirman-0.4.2-r1.ebuild 944
 MD5 831a488284f41ff536f9f16429321fd0 files/libirman-0.4.2-PICShared.patch 2217
 MD5 3cd23162cf3639176a9e24d4b1fd6b80 files/digest-libirman-0.4.2-r1 65
 MD5 50d07f277bdd8d7ff6e2a74cddc0eadd files/libirman-0.4.2-destdir.patch 1726
diff --git a/media-libs/libirman/files/digest-libirman-0.4.2 b/media-libs/libirman/files/digest-libirman-0.4.2
deleted file mode 100644
index 8ab6c6141c1c..000000000000
--- a/media-libs/libirman/files/digest-libirman-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b99017d049685cb84a95098190a89de8 libirman-0.4.2.tar.gz 52665
diff --git a/media-libs/libirman/libirman-0.4.2-r1.ebuild b/media-libs/libirman/libirman-0.4.2-r1.ebuild
index 5b76dba996f3..ae899bfd0cca 100644
--- a/media-libs/libirman/libirman-0.4.2-r1.ebuild
+++ b/media-libs/libirman/libirman-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/libirman-0.4.2-r1.ebuild,v 1.4 2004/09/24 10:02:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/libirman-0.4.2-r1.ebuild,v 1.5 2004/09/24 10:06:36 eradicator Exp $
 
 IUSE=""
 inherit eutils
@@ -23,6 +23,13 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-destdir.patch
 }
 
+src_compile() {
+	econf || die
+
+	# See bug #52586 for -j1 reasons
+	emake -j1 || die
+}
+
 src_install() {
 	dodir /usr/include
 
diff --git a/media-libs/libirman/libirman-0.4.2.ebuild b/media-libs/libirman/libirman-0.4.2.ebuild
deleted file mode 100644
index 85978e6b2375..000000000000
--- a/media-libs/libirman/libirman-0.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/libirman-0.4.2.ebuild,v 1.13 2004/07/13 08:15:07 eradicator Exp $
-
-IUSE=""
-
-DESCRIPTION="library for Irman control of Unix software"
-SRC_URI="http://www.lirc.org/software/snapshots/${P}.tar.gz"
-HOMEPAGE="http://www.evation.com/libirman/libirman.html"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 sparc alpha ia64"
-
-DEPEND="virtual/libc"
-
-src_install() {
-	dodir /usr/include
-
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		LIRC_DRIVER_DEVICE=${D}/dev/lirc \
-		install || die
-
-	dobin test_func test_io test_name
-	dodoc COPYING* NEWS README* TECHNICAL TODO
-}