Patch by Diego Pettenò to respect user LDFLAGS #126872.

Package-Manager: portage-2.1_pre6-r3

4 files changed, 196 insertions, 19 deletions

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index d7c0e2f848ca..d030cbe0f9fe 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,20 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0557d3b284744618056bd303859aa0ad ChangeLog 11381
+RMD160 3c9945db48765f698ecda08adda53de99528bc7f ChangeLog 11381
+SHA256 ef78689f10406f164452c6053cb649d7044d5cd48dbd4b9d61c67e1597f857e1 ChangeLog 11381
 MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
+RMD160 536439602f48539452c626fe80a3022640ff1277 files/1.2.7-gentoo.diff 464
+SHA256 5e44bbb599b25c4909a7cfc8b3478847ebc6f10bfcc21e98e1609d83f4c1acc6 files/1.2.7-gentoo.diff 464
 MD5 cfc3cad1942561090fafce6a25a23bf0 files/digest-libpng-1.2.8 127
+RMD160 a1105514178390e02316cb95b0cfeb87d3d61185 files/digest-libpng-1.2.8 127
+SHA256 143982c51ac244ae82332d6e228c8001a3793b17776f7483acbd6c7727987619 files/digest-libpng-1.2.8 127
 MD5 cfc3cad1942561090fafce6a25a23bf0 files/digest-libpng-1.2.8-r1 127
+RMD160 a1105514178390e02316cb95b0cfeb87d3d61185 files/digest-libpng-1.2.8-r1 127
+SHA256 143982c51ac244ae82332d6e228c8001a3793b17776f7483acbd6c7727987619 files/digest-libpng-1.2.8-r1 127
 MD5 c13ed05aceb450c805e01fd39d16ae45 files/libpng-1.2.8-build.patch 3845
+RMD160 e99732989a4c41980340cd8564c6e10e31b07501 files/libpng-1.2.8-build.patch 3845
+SHA256 50d4375bc56b5923793893554ef64d9727c9651df672ac4f0beec2463034b105 files/libpng-1.2.8-build.patch 3845
 MD5 029ec280f20678b76004c1a0a0270111 files/libpng-1.2.8-strnlen.patch 580
+RMD160 ec0791a765010160a18d6ec9c8f47e589aa4c79d files/libpng-1.2.8-strnlen.patch 580
+SHA256 1b44de20e24aebaf27623d0948b9d6cc7d60109315d0bc22f072cf55953ad304 files/libpng-1.2.8-strnlen.patch 580
 MD5 7443cfcd027ad293e56ec7bed76ee21c files/macos.patch 589
-MD5 8cbfa1a002c1920f7dd6a6b1ca85cc8a libpng-1.2.8-r1.ebuild 1835
-MD5 67b7ae796734a04480c98efbb6ee7c06 libpng-1.2.8.ebuild 1813
+RMD160 657686efc13a74dbf7247a5a00e5a351185e3a1a files/macos.patch 589
+SHA256 078a1410fdaea45d238eedb46500d49dae301f051f3d01db0550e718b20eed5d files/macos.patch 589
+MD5 738b6bb5594b020c0841918279609033 libpng-1.2.8-r1.ebuild 1842
+RMD160 1946a6560a8789db36bdc279aaff3502ca3d1a1c libpng-1.2.8-r1.ebuild 1842
+SHA256 d16617d1c7718054307dc44cb1b1ef7f45fb7f21d24233ed417d8eecc7b433ee libpng-1.2.8-r1.ebuild 1842
+MD5 a6a8b653764ecf6efa311404db62388e libpng-1.2.8.ebuild 1818
+RMD160 d52fa31b3d68cab5d998e66bd48b440824b626fd libpng-1.2.8.ebuild 1818
+SHA256 ac11e228c265207ea91008bdeecb0bf341392704a5ba53a67f1b7a1c779e9584 libpng-1.2.8.ebuild 1818
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDz+5jH6mNYUtVdIARAm4aAJ9wnmeqxtR/PQb47bHvbOBCwQCR7QCgq3aN
-3p6mC2vC+YItdfOBtyDgosI=
-=gy2V
------END PGP SIGNATURE-----
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
diff --git a/media-libs/urt/ChangeLog b/media-libs/urt/ChangeLog
index 4082ed643676..46ad824a16ae 100644
--- a/media-libs/urt/ChangeLog
+++ b/media-libs/urt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/urt
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/ChangeLog,v 1.23 2005/12/11 23:12:33 spyderous Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/ChangeLog,v 1.24 2006/03/20 02:39:43 vapier Exp $
+
+  20 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  files/urt-3.1b-build-fixes.patch:
+  Patch by Diego Pettenò to respect user LDFLAGS #126872.
 
   11 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; urt-3.1b-r1.ebuild:
   Add modular X dependencies.
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index a1e6a41bd809..160206b5ea8a 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -1,9 +1,37 @@
-MD5 ffbd3785c8fd1c358dcf7a768f272493 ChangeLog 3027
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8a10c36f012c41f199ec8538b2063219 ChangeLog 3170
+RMD160 f297ba34bd7dffd0509c970b4007321a2e65f304 ChangeLog 3170
+SHA256 4fd79112ef269203efc76b00f5d4b04a6c0756ee9e415830183eaa6ced4e6f8e ChangeLog 3170
 MD5 6f003bc3da29163d55742e87559a3a87 files/digest-urt-3.1b-r1 60
+RMD160 7c656340fef79d918ab0a743cfa8e3ef43f7550b files/digest-urt-3.1b-r1 60
+SHA256 f7512bbe000a95cd02f7106e771cbd5c65aeefc271d14d96b0248dc7acf8747a files/digest-urt-3.1b-r1 60
 MD5 8084f697c1e179ccb48ec8f1e6d1d564 files/gentoo-config 949
-MD5 95677aac597cb74671547777ca82e9e5 files/urt-3.1b-build-fixes.patch 350
+RMD160 2c492473f38b0d2b27be21c7cb43db3c35b71554 files/gentoo-config 949
+SHA256 2760897a7b9848154f4ccb1f8c31b59f7fd8952513cb45ef659d89d342f37caa files/gentoo-config 949
+MD5 781fd5376d272eaa8751e96e7efd8122 files/urt-3.1b-build-fixes.patch 5182
+RMD160 381b76a57d993112b022b53dd58a19ef21c7684f files/urt-3.1b-build-fixes.patch 5182
+SHA256 e4e768b8198fa1f1c76e308ae931dee483cdd58fdc9e14b079cfddb083c5d6d7 files/urt-3.1b-build-fixes.patch 5182
 MD5 3f2cd2217e501f325bdc547781337c5c files/urt-3.1b-compile-updates.patch 3397
+RMD160 6e71cb6ccbf67a9efffbc625cfeb3d7bcd974433 files/urt-3.1b-compile-updates.patch 3397
+SHA256 b4f1b926bc3592ed44b2913a29fab3dd8265007dd9c395541691816344909d16 files/urt-3.1b-compile-updates.patch 3397
 MD5 17ad983b2b258ee3e633108e342276c1 files/urt-3.1b-rle-fixes.patch 5072
+RMD160 5574f0f079aa458e189520c6cddddf536cd3da7a files/urt-3.1b-rle-fixes.patch 5072
+SHA256 02e71a51b6ce7d9565ed5501a7f93429ec6697ceb9a700833fdf62229fbcdef7 files/urt-3.1b-rle-fixes.patch 5072
 MD5 eb209f87460fb61c12f96550740045e8 files/urt-3.1b-tempfile.patch 593
+RMD160 2d1b9dcb817521f9318896237ef89d362fc21bd5 files/urt-3.1b-tempfile.patch 593
+SHA256 4b5c741ed1f55ec83e7076e45eda6b88828fbb6b0af6192eb97dd0a285151f45 files/urt-3.1b-tempfile.patch 593
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
+SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 metadata.xml 161
 MD5 5639a33afe155d1a108b546a4bdc2b08 urt-3.1b-r1.ebuild 1980
+RMD160 dc2980b9cca5e437789a68cbeaaf2cd5eb59300b urt-3.1b-r1.ebuild 1980
+SHA256 b9d8c576f6fc5410cdb3b17b438dad9a3d5fd8faa4f272e6117a54ac03d83d1f urt-3.1b-r1.ebuild 1980
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD4DBQFEHhYU2+ySkm8kpY0RAsosAJdmXQjAC4BfL3rnIeAk7j67fROoAJsHtqg+
+pD3FL21Clseim7r2sPLW8g==
+=0ia5
+-----END PGP SIGNATURE-----
diff --git a/media-libs/urt/files/urt-3.1b-build-fixes.patch b/media-libs/urt/files/urt-3.1b-build-fixes.patch
index 462357200816..28da6b9b66d9 100644
--- a/media-libs/urt/files/urt-3.1b-build-fixes.patch
+++ b/media-libs/urt/files/urt-3.1b-build-fixes.patch
@@ -1,9 +1,11 @@
 some hosts are more anal about ar usage than others
-
 http://bugs.gentoo.org/107428
 
---- lib/makefile.src
-+++ lib/makefile.src
+respect user LDFLAGS
+http://bugs.gentoo.org/126872
+
+--- urt/lib/makefile.src
++++ urt/lib/makefile.src
 @@ -181,8 +181,7 @@
  # Rebuild the library from all the .o files.
  buildlib: $(OBJS)
@@ -14,3 +16,136 @@ http://bugs.gentoo.org/107428
  #ifndef NO_RANLIB
  	ranlib $(LIBNAME)
  #endif
+--- urt/tools/clock/makefile.src
++++ urt/tools/clock/makefile.src
+@@ -6,7 +6,7 @@ install: rleClock
+ 	mv rleClock ../rleClock.out
+ 
+ rleClock:rleClock.o font.o
+-	${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock
++	${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm
+ 
+ font.c:font.src makeFont
+ 	chmod +x makeFont
+--- urt/tools/makefile.src
++++ urt/tools/makefile.src
+@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h
+ pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
+ 	$(CC) $(CFLAGS) pyrlib.c -c
+ pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h
+-	$(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
++	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
+ 	mv pyrmask.new pyrmask.out
+ 
+ fant.out: fant.o mallocNd.o
+-	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
++	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
+ 	mv fant.new fant.out
+ 	
+ # rlebox and crop use some common code.
+ rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
+ 
+ crop.out: crop.c rle_box.o
+-	${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
++	${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
+ 	mv crop.new crop.out
+ rlebox.out: rlebox.c rle_box.o
+-	${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
++	${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
+ 	mv rlebox.new rlebox.out
+ 
+ # rleClock has it's own directory, must be built special
+@@ -100,7 +100,7 @@ clean:	clean-pgm
+ .SUFFIXES:
+ .SUFFIXES: .out .c .o
+ .c.out:
+-	$(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new
++	$(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new
+ 	mv $*.new $@
+ 
+ .c.o:
+--- urt/cnv/makefile.src
++++ urt/cnv/makefile.src
+@@ -76,13 +76,13 @@ PBMDIR = 
+ # ppmtorle - ppm format to RLE
+ # rletoppm - RLE to ppm format
+ pgmtorle.out: pgmtorle.c
+-	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
+ 	mv $*.new $@
+ ppmtorle.out: ppmtorle.c
+-	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
+ 	mv $*.new $@
+ rletoppm.out: rletoppm.c
+-	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
+ 	mv $*.new $@
+ #endif
+ 
+@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c
+ # iristorle/rletoiris - Convert between RLE and SGI image format.
+ #
+ iristorle.out: iristorle.c
+-	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
+ 	mv $*.new $@
+ rletoiris.out: rletoiris.c
+-	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
+ 	mv $*.new $@
+ #endif
+ 
+@@ -108,10 +108,10 @@ TIFFDIR =
+ # tifftorle - Convert TIFF images to RLE
+ # rletotiff - Convert RLE images to TIFF
+ rletotiff.out: rletotiff.c
+-	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
+ 	mv $*.new $@
+ tifftorle.out: tifftorle.c
+-	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
+ 	mv $*.new $@
+ #endif
+ 
+@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c
+ # Will build with the default rule.
+ # rletorla - RLE to Wavefront RLA
+ rletorla.out: rletorla.c
+-	$(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
+ 	mv $*.new $@
+ #endif WAVEFRONT
+ 
+@@ -144,7 +144,7 @@ pristine: pristine-pgm
+ .SUFFIXES:
+ .SUFFIXES: .out .c
+ .c.out:
+-	$(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new
++	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new
+ 	mv $*.new $@
+ 
+ # Dependency lines.  Make sure to #ifdef them.
+--- urt/cnv/rletoabA62/makefile.src
++++ urt/cnv/rletoabA62/makefile.src
+@@ -15,7 +15,7 @@ all		:	$(PGMS)
+ # Executables.  The .out will be stripped off in the install action.
+ 
+ rletoabA62.out	:	rletoabA62.o rle.o
+-			$(CC) $(CFLAGS) -o rletoabA62.new \
++			$(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \
+ 			  rletoabA62.o rle.o $(LIBS)
+ 			mv rletoabA62.new rletoabA62.out
+ 
+--- urt/cnv/rletogif/makefile.src
++++ urt/cnv/rletogif/makefile.src
+@@ -15,7 +15,7 @@ all:	$(PGMS)
+ # The executable.  The ".out" will be stripped off in the install action.
+ 
+ rletogif.out: ${OBJ}
+-	${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new
++	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new
+ 	mv rletogif.new rletogif.out
+ 
+ # Incremental install, copies executable to DEST dir.