Add a patch to use $MAKE instead of make and add ~x86-fbsd keyword

Package-Manager: portage-2.1.2_rc2-r4

8 files changed, 127 insertions, 28 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index ecb001b367fc..56b7dfc1c8cb 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ming
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.23 2006/08/20 20:32:19 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.24 2006/12/08 23:34:28 drizzt Exp $
+
+  08 Dec 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/ming-0.2a-make.patch, ming-0.2a-r3.ebuild:
+  Add a patch to use $MAKE instead of make and add ~x86-fbsd keyword
 
   20 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org> ming-0.3.0.ebuild:
   applying java patch needs to be conditional on java useflag (Bug #144548)
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 3434cd4a6fc6..2a5288313962 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -13,11 +13,15 @@ AUX ming-0.2a-linking.patch 1115 RMD160 4857939ffbb2fd852f866e5135ac762d9d8a383a
 MD5 2e40db07f5d7c10ef83b8cbadcc0ccd5 files/ming-0.2a-linking.patch 1115
 RMD160 4857939ffbb2fd852f866e5135ac762d9d8a383a files/ming-0.2a-linking.patch 1115
 SHA256 1d81fd16680d1dbdbb797cd88874efd4f4bd76f0d159496c83a2d307244efdf4 files/ming-0.2a-linking.patch 1115
+AUX ming-0.2a-make.patch 2243 RMD160 658072052ecc9c33f693f191419b2ecf90ad6815 SHA1 34059195be138931509a44d0a3166c97b3bc40ed SHA256 ac6c74ca729e4678e5dc7cee245bef0d33568e8cb063fdc65d81399a1fb62d84
+MD5 ac9dc3425a0a00dc647536cc59a040ed files/ming-0.2a-make.patch 2243
+RMD160 658072052ecc9c33f693f191419b2ecf90ad6815 files/ming-0.2a-make.patch 2243
+SHA256 ac6c74ca729e4678e5dc7cee245bef0d33568e8cb063fdc65d81399a1fb62d84 files/ming-0.2a-make.patch 2243
 AUX ming-0.3.0-java-compiler.patch 255 RMD160 3d036a1d3f6c8c78a033cee078937d7999b05e83 SHA1 110ddb4758e233a8fcb463703a07448c4873c006 SHA256 89aab1dc522d89270b0745c7f7c8b3faf55f7533248741236e50e758ab16436d
 MD5 cdb971ff0e03dd08f4d65cafee69bd0b files/ming-0.3.0-java-compiler.patch 255
 RMD160 3d036a1d3f6c8c78a033cee078937d7999b05e83 files/ming-0.3.0-java-compiler.patch 255
 SHA256 89aab1dc522d89270b0745c7f7c8b3faf55f7533248741236e50e758ab16436d files/ming-0.3.0-java-compiler.patch 255
-DIST ming-0.2a.tgz 316447
+DIST ming-0.2a.tgz 316447 RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 SHA1 9f8b4d9afcee51351b326e6f072352cc8ac013f5 SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744
 DIST ming-0.3.0.tar.gz 287330 RMD160 b41c93e28c221d9ae35666f34ca3ed37bbb0dfcb SHA1 3920de3070fa66b26fe53765298175789aacdb70 SHA256 820afbafc8697dabb34415eb86b2c589625449709f4434446c323c4d14391cd9
 DIST ming-java-0.3.0.tar.gz 19373 RMD160 62549a05b23f46e8860239cfeb81bc983b48be59 SHA1 1750221b7733e4c0e62e33bdd2be313727487768 SHA256 a51336aaa9855cbcae228faea98bedf30109e26dba934b4248594e88c449c0c1
 DIST ming-perl-0.3.0.tar.gz 49783 RMD160 3cb5054e0166ddded383c7594c38b2a633333717 SHA1 854c62539fc06f96b4f3c1b4614f76c7b3d84daf SHA256 44bbcec7f41f33fcf402d0e43bdf7aa61d567ab098247f114674a8786d98e2b5
@@ -31,10 +35,10 @@ EBUILD ming-0.2a-r2.ebuild 2222 RMD160 4fd777f03068d402a9fdcd658348fac184cb7853
 MD5 b2dfb3a9b6846fff7079f57c20f81526 ming-0.2a-r2.ebuild 2222
 RMD160 4fd777f03068d402a9fdcd658348fac184cb7853 ming-0.2a-r2.ebuild 2222
 SHA256 58dc14eb780b3e91593844d930328b5f517b453657e6959359988ffb6124f153 ming-0.2a-r2.ebuild 2222
-EBUILD ming-0.2a-r3.ebuild 2719 RMD160 65acd1a48035a021784d2c2dba6f0e908080cf30 SHA1 62dc360a0a3aa99814a1315061cc363294016ac2 SHA256 d3c5c73d23075229b999bc825fa0df41ba624e50627ff5996f3dd40a55e73ba7
-MD5 2bf33509987a1cade2fd4b4717091c14 ming-0.2a-r3.ebuild 2719
-RMD160 65acd1a48035a021784d2c2dba6f0e908080cf30 ming-0.2a-r3.ebuild 2719
-SHA256 d3c5c73d23075229b999bc825fa0df41ba624e50627ff5996f3dd40a55e73ba7 ming-0.2a-r3.ebuild 2719
+EBUILD ming-0.2a-r3.ebuild 2791 RMD160 67c00d53bd7f481a7ee17b32a94b2c6ae0fa988d SHA1 67b0c79f389f19fbb2cee1880e8616467b16f8e2 SHA256 1fdbcf0d6dad720c43a695a923240deb63f84775791382a5760f641757f6d6bd
+MD5 609c931fcd6a7073a5b3d606abecd1b8 ming-0.2a-r3.ebuild 2791
+RMD160 67c00d53bd7f481a7ee17b32a94b2c6ae0fa988d ming-0.2a-r3.ebuild 2791
+SHA256 1fdbcf0d6dad720c43a695a923240deb63f84775791382a5760f641757f6d6bd ming-0.2a-r3.ebuild 2791
 EBUILD ming-0.2a.ebuild 1163 RMD160 1a46af5263a1e1e1d546ba3948e84cb5c9f6bb0a SHA1 5d43153a7d1a551f91102bd2d1b49f38a66dbdf0 SHA256 698243eefa4720d891d8c4f460ab0596f7bd175c68e5d02a5eb5c6a5b91b27bc
 MD5 6e8e25682a0a27c2f29a89dcfc12a201 ming-0.2a.ebuild 1163
 RMD160 1a46af5263a1e1e1d546ba3948e84cb5c9f6bb0a ming-0.2a.ebuild 1163
@@ -43,33 +47,33 @@ EBUILD ming-0.3.0.ebuild 3017 RMD160 f79e748d4321ee3db0f38074ec9e288169c4feed SH
 MD5 c3f20271f2cbbbddd0f11502b3fee2c3 ming-0.3.0.ebuild 3017
 RMD160 f79e748d4321ee3db0f38074ec9e288169c4feed ming-0.3.0.ebuild 3017
 SHA256 5a84cc950da4260adaac9183da4be3346bf1528bb9f0aba966152626744525a8 ming-0.3.0.ebuild 3017
-MISC ChangeLog 2992 RMD160 99fa7ddb728437192aab8cab63a257749da41185 SHA1 d996aacbf716f37d2d55b3d3e146f7ea07f3bbe9 SHA256 2547d47cd5c58d7861bbef807d8fd349591ebcd7cb22437a1450b6eb9d1420f5
-MD5 dce65426698d6d813f4645b8835e5eae ChangeLog 2992
-RMD160 99fa7ddb728437192aab8cab63a257749da41185 ChangeLog 2992
-SHA256 2547d47cd5c58d7861bbef807d8fd349591ebcd7cb22437a1450b6eb9d1420f5 ChangeLog 2992
+MISC ChangeLog 3167 RMD160 5c33b6f957b42ff5cfb8cb5ef6924f9ae61dd2d9 SHA1 4dc5afe4ab7c6d77617e3c25e2302c39a898d473 SHA256 175b268e389bb58541be82ae57826607ace78c2a34a8c430a86412ad68bcd0b1
+MD5 09368bcfc66718d8c7c434af97edf7ff ChangeLog 3167
+RMD160 5c33b6f957b42ff5cfb8cb5ef6924f9ae61dd2d9 ChangeLog 3167
+SHA256 175b268e389bb58541be82ae57826607ace78c2a34a8c430a86412ad68bcd0b1 ChangeLog 3167
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
 SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
-MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a 58
-RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a 58
-SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a 58
-MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a-r1 58
-RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a-r1 58
-SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a-r1 58
-MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a-r2 58
-RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a-r2 58
-SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a-r2 58
-MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a-r3 58
-RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a-r3 58
-SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a-r3 58
+MD5 19d787c6a4c03bb3b2f0c472b1e25e1f files/digest-ming-0.2a 220
+RMD160 336deaa77bc92f86ca810139ed4cea12b42359a9 files/digest-ming-0.2a 220
+SHA256 73af69078ed1ac57d08026d6b9b54bda9ae6635e4dffff94a399d827e0849887 files/digest-ming-0.2a 220
+MD5 19d787c6a4c03bb3b2f0c472b1e25e1f files/digest-ming-0.2a-r1 220
+RMD160 336deaa77bc92f86ca810139ed4cea12b42359a9 files/digest-ming-0.2a-r1 220
+SHA256 73af69078ed1ac57d08026d6b9b54bda9ae6635e4dffff94a399d827e0849887 files/digest-ming-0.2a-r1 220
+MD5 19d787c6a4c03bb3b2f0c472b1e25e1f files/digest-ming-0.2a-r2 220
+RMD160 336deaa77bc92f86ca810139ed4cea12b42359a9 files/digest-ming-0.2a-r2 220
+SHA256 73af69078ed1ac57d08026d6b9b54bda9ae6635e4dffff94a399d827e0849887 files/digest-ming-0.2a-r2 220
+MD5 19d787c6a4c03bb3b2f0c472b1e25e1f files/digest-ming-0.2a-r3 220
+RMD160 336deaa77bc92f86ca810139ed4cea12b42359a9 files/digest-ming-0.2a-r3 220
+SHA256 73af69078ed1ac57d08026d6b9b54bda9ae6635e4dffff94a399d827e0849887 files/digest-ming-0.2a-r3 220
 MD5 3a8cedb2efd4015742bfc46e90d96370 files/digest-ming-0.3.0 1199
 RMD160 35c44f40f0b7b1525c110842e55c714e5f3a6ace files/digest-ming-0.3.0 1199
 SHA256 836c548dca16c6e878fc6f93612e2aea678620aedc264ed5f94fe74bb810cafa files/digest-ming-0.3.0 1199
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE63Kt/NoSW7FuNV8RAip4AKCUiMldscFUlibawXJIuYPJVStDWwCbB4wJ
-r1OgrJgCVWsmEuLQLKvDMUU=
-=6k3C
+iD8DBQFFefaOGDyatLGpTbYRArppAJ4mGEI4GbRtw5UvVKOMtfqek6UICwCePMxC
+uLxF32XIh29r+WyevH+2I2w=
+=Q7+6
 -----END PGP SIGNATURE-----
diff --git a/media-libs/ming/files/digest-ming-0.2a b/media-libs/ming/files/digest-ming-0.2a
index 146ed635587e..86b4bd3bb217 100644
--- a/media-libs/ming/files/digest-ming-0.2a
+++ b/media-libs/ming/files/digest-ming-0.2a
@@ -1 +1,3 @@
 MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
+RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 ming-0.2a.tgz 316447
+SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/digest-ming-0.2a-r1 b/media-libs/ming/files/digest-ming-0.2a-r1
index 146ed635587e..86b4bd3bb217 100644
--- a/media-libs/ming/files/digest-ming-0.2a-r1
+++ b/media-libs/ming/files/digest-ming-0.2a-r1
@@ -1 +1,3 @@
 MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
+RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 ming-0.2a.tgz 316447
+SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/digest-ming-0.2a-r2 b/media-libs/ming/files/digest-ming-0.2a-r2
index 146ed635587e..86b4bd3bb217 100644
--- a/media-libs/ming/files/digest-ming-0.2a-r2
+++ b/media-libs/ming/files/digest-ming-0.2a-r2
@@ -1 +1,3 @@
 MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
+RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 ming-0.2a.tgz 316447
+SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/digest-ming-0.2a-r3 b/media-libs/ming/files/digest-ming-0.2a-r3
index 146ed635587e..86b4bd3bb217 100644
--- a/media-libs/ming/files/digest-ming-0.2a-r3
+++ b/media-libs/ming/files/digest-ming-0.2a-r3
@@ -1 +1,3 @@
 MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
+RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 ming-0.2a.tgz 316447
+SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/ming-0.2a-make.patch b/media-libs/ming/files/ming-0.2a-make.patch
new file mode 100644
index 000000000000..67d644f1d9e1
--- /dev/null
+++ b/media-libs/ming/files/ming-0.2a-make.patch
@@ -0,0 +1,82 @@
+diff -ur ming-0.2a.orig/Makefile ming-0.2a/Makefile
+--- ming-0.2a.orig/Makefile	2006-12-09 00:15:45 +0100
++++ ming-0.2a/Makefile	2006-12-09 00:18:27 +0100
+@@ -25,16 +25,16 @@
+ 	install libming.a ${LIBDIR}/libming.a
+ 
+ dynamic:
+-	cd src && make dynamic
++	cd src && ${MAKE} dynamic
+ 
+ static:
+-	cd src && make static
++	cd src && ${MAKE} static
+ 
+ clean:
+-	cd src && make clean
+-	cd util && make clean
+-	cd py_ext && make clean
+-	cd php_ext && make clean
++	cd src && ${MAKE} clean
++	cd util && ${MAKE} clean
++	cd py_ext && ${MAKE} clean
++	cd php_ext && ${MAKE} clean
+ 	rm -f test.o test test.exe *.core
+ 	rm -f libming.a libming.so
+ 
+diff -ur ming-0.2a.orig/php_ext/Makefile ming-0.2a/php_ext/Makefile
+--- ming-0.2a.orig/php_ext/Makefile	2006-12-09 00:15:44 +0100
++++ ming-0.2a/php_ext/Makefile	2006-12-09 00:18:30 +0100
+@@ -13,7 +13,7 @@
+ 	${CC} ${DEFINES} -c ming.c -I. -I.. `php-config --includes`
+ 
+ ../libming.a:
+-	cd ..; make static
++	cd ..; ${MAKE} static
+ 
+ clean:
+ 	rm -f php_ming.so
+diff -ur ming-0.2a.orig/py_ext/Makefile ming-0.2a/py_ext/Makefile
+--- ming-0.2a.orig/py_ext/Makefile	2006-12-09 00:15:44 +0100
++++ ming-0.2a/py_ext/Makefile	2006-12-09 00:18:30 +0100
+@@ -18,7 +18,7 @@
+ 	gcc -g -Wall -I .. -I ${PYINCDIR} -fpic -c ming_wrap.c
+ 
+ ../libming.a:
+-	cd ..; make static
++	cd ..; ${MAKE} static
+ 
+ swig:
+ 	swig -I.. -python ming.i
+diff -ur ming-0.2a.orig/src/Makefile ming-0.2a/src/Makefile
+--- ming-0.2a.orig/src/Makefile	2006-12-09 00:15:44 +0100
++++ ming-0.2a/src/Makefile	2006-12-09 00:18:30 +0100
+@@ -19,22 +19,22 @@
+ all: dynamic
+ 
+ dynamic: ${OFILES}
+-	cd blocks && make
+-	cd actioncompiler && make
++	cd blocks && ${MAKE}
++	cd actioncompiler && ${MAKE}
+ 	${CC} ${CFLAGS} ${LDFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \
+ 	  -o libming.so
+ 	cp libming.so ..
+ 
+ static: ${OFILES}
+-	cd blocks && make
+-	cd actioncompiler && make
++	cd blocks && ${MAKE}
++	cd actioncompiler && ${MAKE}
+ 	ar r libming.a blocks/*.o ${OFILES} ${COMPILEROFILES}
+ 	ranlib libming.a  # bsd requires this?
+ 	cp libming.a ..
+ 
+ clean:
+-	cd blocks && make clean
+-	cd actioncompiler && make clean
++	cd blocks && ${MAKE} clean
++	cd actioncompiler && ${MAKE} clean
+ 	rm -f *.o libming.a libming.so test test.exe core *.core
+ 
+ # breaks on bsd:
diff --git a/media-libs/ming/ming-0.2a-r3.ebuild b/media-libs/ming/ming-0.2a-r3.ebuild
index 19c77d94e81d..a528a7540cdb 100644
--- a/media-libs/ming/ming-0.2a-r3.ebuild
+++ b/media-libs/ming/ming-0.2a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a-r3.ebuild,v 1.1 2006/06/11 12:19:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a-r3.ebuild,v 1.2 2006/12/08 23:34:28 drizzt Exp $
 
 inherit eutils toolchain-funcs flag-o-matic python
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.opaque.net/ming/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="python"
 
 RDEPEND="python? ( virtual/python )
@@ -24,6 +24,7 @@ src_unpack() {
 	EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${P}-gentoo.diff
 	sed -e 's,gcc -g -Wall,$(CC) $(CFLAGS),g' -i ${S}/py_ext/Makefile
 	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-linking.patch
+	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-make.patch
 }
 
 src_compile() {