Fix parallel-make issues, Bug #247800.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27-gentoo-r1 i686

4 files changed, 72 insertions, 10 deletions

diff --git a/media-plugins/vdr-mount/ChangeLog b/media-plugins/vdr-mount/ChangeLog
index 679f3aef08e9..1a30e0af9283 100644
--- a/media-plugins/vdr-mount/ChangeLog
+++ b/media-plugins/vdr-mount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-mount
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mount/ChangeLog,v 1.3 2008/12/14 16:56:37 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mount/ChangeLog,v 1.4 2008/12/17 21:29:31 zzam Exp $
+
+  17 Dec 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-mount-0.0.2-makefile-fix.diff, vdr-mount-0.0.2.ebuild:
+  Fix parallel-make issues, Bug #247800.
 
   14 Dec 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-mount-0.0.2.ebuild:
diff --git a/media-plugins/vdr-mount/Manifest b/media-plugins/vdr-mount/Manifest
index 4c0ba6448f8a..1d855b08512f 100644
--- a/media-plugins/vdr-mount/Manifest
+++ b/media-plugins/vdr-mount/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-mount-0.0.2-makefile-fix.diff 1577 RMD160 591d9dddf4a7fc523f3c2ca45ef2656dba65af64 SHA1 e2916b75356a22b25de13e2522a7474f449a6845 SHA256 7ac968fe64cb47987882d5d12dc9591365baffaa1aab27f3ce04a2df823b102f
 DIST vdr-mount-0.0.2.tgz 13127 RMD160 58a9b859d1196a73117d37739a809466007f3851 SHA1 13a6197c2f784e0d0e5278bdf59e37ff353434c3 SHA256 5aceb1b21af73a73a9da0d6fccd1f522c0126d04af6bcae161dd2b82627c45aa
-EBUILD vdr-mount-0.0.2.ebuild 559 RMD160 d3f690e5ca882c8baa614c4d9b95d4eeef7c1c12 SHA1 8152fd646eae433d50df41c39c3f5b9d9689b7bc SHA256 6765a4c49ff0618f218eeec58f2b1ca5b1faf9eff1dabb4f148e5213a8381731
-MISC ChangeLog 672 RMD160 8f4d185d08024e26425b9371e074d5aed442f538 SHA1 ff8dcdd1aa926cfa02e8387fb667d1a8252e0b4c SHA256 431a2fb5967a7728401470487237fec4a9ed945172eb45de135f92876608b4ae
+EBUILD vdr-mount-0.0.2.ebuild 583 RMD160 1ae1bb1d287dbbeb1196db764062f172daa2deaa SHA1 a6f6f14428f330c10569452ef2a91da2b28e0342 SHA256 7d9b384940340dde7ea391c9e6ebdcce83a26eef1c3cfe2b8ecb888697939a3a
+MISC ChangeLog 830 RMD160 1a1a2ada1adf5dfbb9f9177d80d37dc346d22346 SHA1 72a0ae6128c4e0e92e96f4dce29f931fcec2dca3 SHA256 0079132b18006b0a1d4828ef2c9911f85309015f66f4be58f869d0580586a17e
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFJRTrPdn07HTTCgIoRAhrMAJ9U48ZkSkm5HcSKce5jRYaE1nKWNQCff+8J
-rQG0P8yhb3aEkc0daGdLerE=
-=xavX
+iEYEARECAAYFAklJb0AACgkQt2vP6XvVdOcqIQCgrnEU0fuuX9Ymsja0wTJAtx7o
+as0AoI9B0zMnjzfJ+pWFIEwbiykNSMlx
+=TZYL
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-mount/files/vdr-mount-0.0.2-makefile-fix.diff b/media-plugins/vdr-mount/files/vdr-mount-0.0.2-makefile-fix.diff
new file mode 100644
index 000000000000..ba2bcc437242
--- /dev/null
+++ b/media-plugins/vdr-mount/files/vdr-mount-0.0.2-makefile-fix.diff
@@ -0,0 +1,58 @@
+Index: mount-0.0.2/Makefile
+===================================================================
+--- mount-0.0.2.orig/Makefile
++++ mount-0.0.2/Makefile
+@@ -59,12 +59,12 @@ OBJS = $(subst .C,.o, $(shell ls *.C 2>/
+ 
+ ### Targets:
+ 
+-all: medialist libvdr-$(PLUGIN).so
++all: libvdr-$(PLUGIN).so
+ 
+ medialist:
+-	cd MediaList; make
++	$(MAKE) -C MediaList
+ 
+-libvdr-$(PLUGIN).so: $(OBJS)
++libvdr-$(PLUGIN).so: $(OBJS) medialist
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -L MediaList/src -l MediaList -o $@
+ 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+@@ -77,7 +77,7 @@ dist: clean
+ 	@echo Distribution package created as $(PACKAGE).tgz
+ 
+ clean:
+-	cd MediaList; make clean
++	$(MAKE) -C MediaList clean
+ 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ *.d
+ 
+ -include *.d
+Index: mount-0.0.2/MediaList/Makefile
+===================================================================
+--- mount-0.0.2.orig/MediaList/Makefile
++++ mount-0.0.2/MediaList/Makefile
+@@ -6,18 +6,18 @@ $(subst .cxx,, $(shell cd prog; ls *.cxx
+ 
+ 
+ all: 
+-	export MYLIBNAME=$(LIBNAME);cd src; make
+-	export PROGS=$(PROGRAMMS);cd prog; make
+-	export MYLIBNAME=$(LIBNAME);export PROGS=$(PROGRAMMS);cd bin; make
++	$(MAKE) -C src MYLIBNAME=$(LIBNAME)
++	$(MAKE) -C prog PROGS=$(PROGRAMMS)
++	$(MAKE) -C bin MYLIBNAME=$(LIBNAME) PROGS=$(PROGRAMMS)
+ 	
+ depend:
+ 	@echo target depend is obsolete --- just make
+ 
+ 
+ clean:
+-	cd src; make clean
+-	cd prog; make clean
+-	export PROGS=$(PROGRAMMS);cd bin; make clean
++	$(MAKE) -C src clean
++	$(MAKE) -C prog clean
++	$(MAKE) -C bin clean PROGS=$(PROGRAMMS)
+ 	
+ 
+ install:
diff --git a/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild b/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild
index cb7fe5c44743..97379356c4ed 100644
--- a/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild
+++ b/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild,v 1.3 2008/12/14 16:56:37 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mount/vdr-mount-0.0.2.ebuild,v 1.4 2008/12/17 21:29:31 zzam Exp $
 
 inherit vdr-plugin
 
@@ -15,4 +15,4 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6"
 
-BUILD_PARAMS="-j1"
\ No newline at end of file
+PATCHES=("${FILESDIR}/${P}-makefile-fix.diff")