Cleaned uneeded patches

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 6 insertions, 133 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index 3b0a2a13a597..ee7aa9eb75ef 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/ming
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.71 2010/06/25 10:00:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.72 2010/06/25 10:07:03 jlec Exp $
+
+  25 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  -files/ming-0.2a-linking.patch, -files/ming-0.2a-make.patch,
+  -files/ming-0.4.x-libpng14.patch:
+  Cleaned uneeded patches
 
   25 Jun 2010; Justin Lecher <jlec@gentoo.org> -ming-0.4.0_rc2.ebuild:
   Cleaned uneeded version
diff --git a/media-libs/ming/files/ming-0.2a-linking.patch b/media-libs/ming/files/ming-0.2a-linking.patch
deleted file mode 100644
index 7cfe815e2ac0..000000000000
--- a/media-libs/ming/files/ming-0.2a-linking.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nuar --exclude '*~' ming-0.2a.orig/py_ext/Makefile ming-0.2a/py_ext/Makefile
---- ming-0.2a.orig/py_ext/Makefile	2006-06-11 03:55:18.102054000 -0700
-+++ ming-0.2a/py_ext/Makefile	2006-06-11 03:59:15.500918176 -0700
-@@ -7,7 +7,7 @@
- all:
- 
- mingcmodule.so: ming_wrap.o
--	$(CC) $(CFLAGS) -shared -o mingcmodule.so ming_wrap.o -lming
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L.. -lming 
- 
- mingc.pyd: ming_wrap.o
- 	dllwrap --dllname mingc.pyd --driver-name gcc --def mingc.def \
-diff -Nuar --exclude '*~' ming-0.2a.orig/src/Makefile ming-0.2a/src/Makefile
---- ming-0.2a.orig/src/Makefile	2006-06-11 03:55:18.076055000 -0700
-+++ ming-0.2a/src/Makefile	2006-06-11 04:04:20.289175057 -0700
-@@ -24,7 +24,7 @@
- dynamic: ${OFILES}
- 	cd blocks && make
- 	cd actioncompiler && make
--	${CC} ${CFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \
-+	${CC} ${CFLAGS} ${LDFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \
- 	  -o libming.so
- 	cp libming.so ..
- 
-@@ -45,4 +45,4 @@
- #	${CC} ${FLAGS} -c $<
- 
- test: static test.o
--	${CC} -o test test.o libming.a -lm
-+	${CC} ${LDFLAGS} -o test test.o libming.a -lm
diff --git a/media-libs/ming/files/ming-0.2a-make.patch b/media-libs/ming/files/ming-0.2a-make.patch
deleted file mode 100644
index 67d644f1d9e1..000000000000
--- a/media-libs/ming/files/ming-0.2a-make.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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/files/ming-0.4.x-libpng14.patch b/media-libs/ming/files/ming-0.4.x-libpng14.patch
deleted file mode 100644
index ce43fdec1d91..000000000000
--- a/media-libs/ming/files/ming-0.4.x-libpng14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/blocks/pngdbl.c
-+++ src/blocks/pngdbl.c
-@@ -49,7 +49,7 @@
- 
- 	if(fread(header, 1, 8, fp) != 8)
- 		return NULL;
--	if(!png_check_sig(header, 8))
-+	if(png_sig_cmp(header, 0, 8))
- 		return NULL;
- 	result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 	if(!result)
-@@ -69,7 +69,7 @@
- 	
- 	if(SWFInput_read(input, header, 8) != 8)
- 		return NULL;
--	if(!png_check_sig(header, 8))
-+	if(png_sig_cmp(header, 0, 8))
- 		return NULL;
- 	result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 	if(!result)