summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2009-07-09 20:36:25 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2009-07-09 20:36:25 +0000
commit21f52a93f423cf45639fb51885edf635cf375464 (patch)
treeafb9c89f664fadebda82662700a0b5f918b8afd3 /media-plugins
parentDisable test that is broken with gcc-4.4 and that never worked as it needs fu... (diff)
downloadhistorical-21f52a93f423cf45639fb51885edf635cf375464.tar.gz
historical-21f52a93f423cf45639fb51885edf635cf375464.tar.bz2
historical-21f52a93f423cf45639fb51885edf635cf375464.zip
Fix makefile recursion.
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-burn/ChangeLog7
-rw-r--r--media-plugins/vdr-burn/Manifest11
-rw-r--r--media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff22
-rw-r--r--media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild5
4 files changed, 37 insertions, 8 deletions
diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index 043a70d78334..ab5dc633df71 100644
--- a/media-plugins/vdr-burn/ChangeLog
+++ b/media-plugins/vdr-burn/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/vdr-burn
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.40 2009/07/09 20:25:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.41 2009/07/09 20:36:24 zzam Exp $
+
+ 09 Jul 2009; Matthias Schwarzott <zzam@gentoo.org>
+ vdr-burn-0.1.0_pre21-r6.ebuild,
+ +files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff:
+ Fix makefile recursion.
09 Jul 2009; Matthias Schwarzott <zzam@gentoo.org>
vdr-burn-0.1.0_pre21-r6.ebuild:
diff --git a/media-plugins/vdr-burn/Manifest b/media-plugins/vdr-burn/Manifest
index d8388992adfc..52bd067d4648 100644
--- a/media-plugins/vdr-burn/Manifest
+++ b/media-plugins/vdr-burn/Manifest
@@ -10,6 +10,7 @@ AUX 0.1.0_pre21/rc-addon.sh 760 RMD160 6b09bc5f9a60b9ee5c22bb067d6909b8810e69d1
AUX 0.1.0_pre21/requantfactor.diff 691 RMD160 6fbe6ab9c7329562f23675823f64cc97e9192a27 SHA1 0fd8a4b88f07191b561607f9c0f9792abb5933ff SHA256 dbd168033ef4623d5ce97fb307a1ed19c4dee23cfc71f4cd2ca9c83812f6cbca
AUX 0.1.0_pre21/vdr-burn-0.1.0_pre21-gcc43.patch 1905 RMD160 e9c71ee754f9e80405cd9744c6c0bd08b37990c0 SHA1 59658039844162f74f4406fc3fff0d96f5aab7c5 SHA256 667f559cac8eced2d59b6a10722cfaa821da225489f9e0d4459631418db39b8c
AUX 0.1.0_pre21/vdr-burn-0.1.0_pre21-gentoo.diff 1847 RMD160 2870491be90fc6143a1fd02e89e1605a776c84b8 SHA1 320eec0a457ce544f8c0ffb894fd8f8e744b62a9 SHA256 3b0e233e26ef2b057d9dcff88e5c4cff6091e7d9e3853de6333dca65636dc972
+AUX 0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff 707 RMD160 aca35de2be141ea380c1635aca1588e7cd3e552f SHA1 d5e1487d676f7ef0b7742d85b3b3ba5fb450227b SHA256 68b3c9ffde2fa5e9564046e44948ec8e029049c4f7bd92030df11f1b0dc9d1ce
AUX 0.1.0_pre21/vdr-burn-0.1.0_pre21_setdefaults-V2.diff 2623 RMD160 a8b5968d1e7e1e8e5a9eef13e801a5bcde645f86 SHA1 4d3c927a955914aeed3366733ec1182cb7f77312 SHA256 699b7d22611227db7c418e3df2cff4c660cac90ad8e1f065d8c09d6e675b3ed7
AUX 0.1.0_pre21/vdr-burn-0.1.0_pre21_setdefaults.diff 2214 RMD160 87a9cf58342119528e69cc6c2d9b18f86507d135 SHA1 df02e27decc8e37fa7ee6256950afa669e400134 SHA256 556f73d923b12784d2ade9c173b7bbdb4642182d44784e22dd7589a4180c6398
AUX confd-0.0.9 1552 RMD160 afb753609bd4f8551d1abe32ec466dc9d237943f SHA1 36fd3aa43b29fc0f809a05a6c5ed651c9f3d7cc6 SHA256 a0e30cc2b0b87a09bcc1d425d3eabbeb82ed31cbcc009b8697e3e0c602c9480e
@@ -23,13 +24,13 @@ EBUILD vdr-burn-0.0.9-r2.ebuild 2230 RMD160 0992aa723e49b88f652a5fa90243d41e572f
EBUILD vdr-burn-0.0.9-r3.ebuild 2241 RMD160 d3143e4e288682a612eb401ca9452124fde628f2 SHA1 f5f62cdf345df19612033cf0112494268ad85fe0 SHA256 d4d2d8b8d04a6dd163b3d5ea5a65b394d7385890e88f346018e7c022953d23fa
EBUILD vdr-burn-0.1.0_pre21-r4.ebuild 3681 RMD160 26ba0ae64b0260f2caf283f4bcc60af4bc9ef295 SHA1 863a3864e138f250bb3b61d1f588dcb927f6b1ab SHA256 927631e71a5eb23e3238bd7a01d523b0eac90c3c802f627eba061e87415bcb1e
EBUILD vdr-burn-0.1.0_pre21-r5.ebuild 3342 RMD160 1b20f11db3c6b68dd919491110ae592f9d2456de SHA1 67ff29621eaebf1d4dc8b515f65a18c9f3eb3994 SHA256 d09639815b086dee07d7bdc9523a6a2ac5b79ecc86cb558df229e28e7bf35539
-EBUILD vdr-burn-0.1.0_pre21-r6.ebuild 3315 RMD160 e716afada50beb8f30857f8f76ed4f6621395596 SHA1 edf5cd9d5ed26df6b07167f108d135b12c71879e SHA256 d27e32f4dec4f14850e16ce55006ae9ee1edc740e4fd8470ea0166ffa7b41258
-MISC ChangeLog 7536 RMD160 3a385b2a18d898caa6722f727f028f553c1a12c2 SHA1 02479c66b5462de66c46554c2461201ea2781cd7 SHA256 a16946b2442e2a2f209b65075a3b5ada921cb70ecfcfe27037cef5178977e151
+EBUILD vdr-burn-0.1.0_pre21-r6.ebuild 3355 RMD160 aa29a2e47b336bbe76d8e6bafe4fa1275d30852f SHA1 a27eb1adafcfe962f34151c203fd79f7282b9d5b SHA256 2414bc69e49d311c69b6b1e6e31e157b0c1a3cff03a61ed636aafd9ebf2a55f5
+MISC ChangeLog 7707 RMD160 628ab96b682d4c4bf97d95ad3395a95f34c2c2b1 SHA1 9b07d74abbbf54aa712363bfc49970a389b05e8c SHA256 1c94fd220934d2a5e9b5fb506861b4913fabfb667e406825b422e7a68153fba0
MISC metadata.xml 451 RMD160 3e1513e64344669532732f16a2893878b2c60d38 SHA1 726331222f87de37d6bec9b4d83ef45c024e41a6 SHA256 17e6e4ae11581ce983dd1ee2e9dd3fbba30b27ded1102fc4c2b340dfd366afea
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkpWUlAACgkQt2vP6XvVdOe5JwCgnjqYs9cyF5W2+fABF+p9J7DL
-62IAoKZdPsh3IzDXm9025lDetGizVJef
-=Hk4r
+iEYEARECAAYFAkpWVM4ACgkQt2vP6XvVdOcJJQCfTu7IVpXpK8f6QRx10wKzjK3d
+pisAoNFd0lOrhamfWDwTFznmpYtF31PC
+=VCIQ
-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff
new file mode 100644
index 000000000000..d066b85abe0b
--- /dev/null
+++ b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff
@@ -0,0 +1,22 @@
+Index: burn-0.1.0-pre21/Makefile
+===================================================================
+--- burn-0.1.0-pre21.orig/Makefile
++++ burn-0.1.0-pre21/Makefile
+@@ -133,7 +133,7 @@ all: libvdr-$(PLUGIN).so burn-buffers i1
+
+ SUBDIRS:
+ @for dir in $(SUBDIRS); do \
+- make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
++ $(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
+ done
+
+ libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
+@@ -165,7 +165,7 @@ clean:
+ @-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
+ scan-test test t/*.o
+ @for dir in $(SUBDIRS); do \
+- make -C $$dir clean ; \
++ $(MAKE) -C $$dir clean ; \
+ done
+
+ ### Implicit rules:
diff --git a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild
index 0275e8dd8dcf..1e93d6427772 100644
--- a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild
+++ b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild,v 1.3 2009/07/09 20:25:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild,v 1.4 2009/07/09 20:36:24 zzam Exp $
EAPI="2"
@@ -28,7 +28,8 @@ PATCHES=("${FILESDIR}/${PV}/i18n.diff"
"${FILESDIR}/${PV}/${P}_setdefaults-V2.diff"
"${FILESDIR}/${PV}/requantfactor.diff"
"${FILESDIR}/${PV}/charset-vdr-1.5.diff"
- "${FILESDIR}/${PV}/${P}-gcc43.patch")
+ "${FILESDIR}/${PV}/${P}-gcc43.patch"
+ "${FILESDIR}/${PV}/${P}-makefile.diff")
DEPEND=">=media-video/vdr-1.4
>=dev-libs/libcdio-0.71