Mark as stable on all archs and remove old versions

22 files changed, 8 insertions, 552 deletions

diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index 516a3fd9a51a..5017616123e1 100644
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for sys-devel/prelink
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.27 2004/04/08 15:43:09 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.28 2004/04/11 11:29:02 cretin Exp $
 
 *prelink-20040317 (05 Apr 2004)
 
+  11 Apr 2004; Stefan Jones <cretin@gentoo.org> :
+  Mark as stable for all remaining archs
+
   09 Apr 2004; Stefan Jones <cretin@gentoo.org> :
   Put in stable to fix bugs
   
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index 355b44cb35de..df7067d94082 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -1,23 +1,4 @@
-MD5 6b6c42d6852774d46060965b1f36cca0 prelink-20030811.ebuild 938
-MD5 676062667c9700aa7c08920c2f1a33ec prelink-20030505.ebuild 982
-MD5 b349b3eb4cd9909b20589b5dc95f077e prelink-20030217.ebuild 979
-MD5 541ced8d996d000e4c980c5c423817d8 prelink-20030902.ebuild 939
-MD5 2e23d408b7bd504b7e6d716c3991f019 prelink-20031012.ebuild 931
-MD5 5d71df80db5d5d383cf4806799f86e3b prelink-20040317.ebuild 827
-MD5 13e6f05efda6796fe7b67002de173243 prelink-20040216.ebuild 830
-MD5 3afbab6edabacf74df560489667b5257 ChangeLog 2799
+MD5 7f5ec8488432e3a05a5e5cc511a554a1 prelink-20040317.ebuild 837
+MD5 ac00ac76847f2c66e77831e27441d80e ChangeLog 2891
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1bd0c4f71208d4507058c905227755cd files/prelink-20030505-glibc231.patch 6089
-MD5 39f05d506ac0a5d39d5d2ef0ef020616 files/prelink-20030217-no-undosyslibs-test.patch 624
-MD5 20113771c3a7830d20df1aa4fd6d205f files/prelink-no-undosyslibs-test.patch 562
-MD5 20c61e40290cdaeb7a51ea64aa5e39c4 files/digest-prelink-20030217 69
-MD5 f54f54ef5eb06e1c718401f23efd962d files/digest-prelink-20030505 69
-MD5 d0620424e50abcea7b45cd1fc211f34e files/digest-prelink-20030811 69
-MD5 12b49fd769983aa90914f85f7b8e2e76 files/digest-prelink-20030902 69
-MD5 3e87a1f5ea3174e85da9de81971f211b files/digest-prelink-20031012 69
-MD5 18b0206a8261fb321a7f03cca57f0eb9 files/digest-prelink-20040216 69
 MD5 2c0d5d2697801972b5ecfa7e99e09791 files/digest-prelink-20040317 69
-MD5 874604d665fcc861ed043ddae21ff9e3 files/prelink-20030217-glibc231.patch 2846
-MD5 74e9570d9acba20fce8600525e1c1826 files/prelink-20021213-no-undosyslibs-test.patch 609
-MD5 30d5e9dc1f009b9a471276904d962030 files/prelink-20021002-copyreloc.patch 338
-MD5 d67cd2bb94b329019e1c8482e399166b files/prelink-20030505-no-undosyslibs-test.patch 646
diff --git a/sys-devel/prelink/files/digest-prelink-20030217 b/sys-devel/prelink/files/digest-prelink-20030217
deleted file mode 100644
index 6c1e312ebb43..000000000000
--- a/sys-devel/prelink/files/digest-prelink-20030217
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12638d4b989739486b6bf8a6ad3cfa8f prelink-20030217.tar.bz2 273682
diff --git a/sys-devel/prelink/files/digest-prelink-20030505 b/sys-devel/prelink/files/digest-prelink-20030505
deleted file mode 100644
index c8727c640c7d..000000000000
--- a/sys-devel/prelink/files/digest-prelink-20030505
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a17274ac2905d67861fec0dcfa2be82 prelink-20030505.tar.bz2 275604
diff --git a/sys-devel/prelink/files/digest-prelink-20030811 b/sys-devel/prelink/files/digest-prelink-20030811
deleted file mode 100644
index a6e0c4be17f8..000000000000
--- a/sys-devel/prelink/files/digest-prelink-20030811
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a455727fe7a64699bb7d03325ac50793 prelink-20030811.tar.bz2 288900
diff --git a/sys-devel/prelink/files/digest-prelink-20030902 b/sys-devel/prelink/files/digest-prelink-20030902
deleted file mode 100644
index 491f77a20b8d..000000000000
--- a/sys-devel/prelink/files/digest-prelink-20030902
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05eba4c64078964d3ce9b7a6aefa983b prelink-20030902.tar.bz2 288575
diff --git a/sys-devel/prelink/files/digest-prelink-20031012 b/sys-devel/prelink/files/digest-prelink-20031012
deleted file mode 100644
index 52cf5b4ad664..000000000000
--- a/sys-devel/prelink/files/digest-prelink-20031012
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e4e40cdaa2fadf6163658d8774f076ec prelink-20031012.tar.bz2 337832
diff --git a/sys-devel/prelink/files/digest-prelink-20040216 b/sys-devel/prelink/files/digest-prelink-20040216
deleted file mode 100644
index 440d296abbf0..000000000000
--- a/sys-devel/prelink/files/digest-prelink-20040216
+++ /dev/null
@@ -1 +0,0 @@
-MD5 742f8181b1fec7d50a57d90b8cf12a96 prelink-20040216.tar.bz2 338790
diff --git a/sys-devel/prelink/files/prelink-20021002-copyreloc.patch b/sys-devel/prelink/files/prelink-20021002-copyreloc.patch
deleted file mode 100644
index 972543060696..000000000000
--- a/sys-devel/prelink/files/prelink-20021002-copyreloc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- prelink/src/get.c.jj	2003-04-13 11:27:03.000000000 +0100
-+++ prelink/src/get.c	2003-04-13 11:27:24.000000000 +0100
-@@ -273,6 +273,7 @@
- 		       adjust the value so that it is relative to library
- 		       base.  */
- 		    value[0] -= deps[i].start - deps[i].l_addr;
-+			value[0] = (unsigned long)value[0];
- 		  }
- 		break;
- 	      }
diff --git a/sys-devel/prelink/files/prelink-20021213-no-undosyslibs-test.patch b/sys-devel/prelink/files/prelink-20021213-no-undosyslibs-test.patch
deleted file mode 100644
index 50bef3da1630..000000000000
--- a/sys-devel/prelink/files/prelink-20021213-no-undosyslibs-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- prelink/testsuite/Makefile.in.orig	2003-01-02 04:24:17.000000000 +0200
-+++ prelink/testsuite/Makefile.in	2003-01-02 04:24:30.000000000 +0200
-@@ -97,8 +97,8 @@
- 	reloc1.sh reloc2.sh reloc3.sh reloc4.sh reloc5.sh reloc6.sh \
- 	reloc7.sh reloc8.sh reloc9.sh \
- 	shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \
--	layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh \
--	undosyslibs.sh
-+	layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh
-+#	undosyslibs.sh
- 
- TESTS_ENVIRONMENT = \
- 	PRELINK="../src/prelink -c ./prelink.conf -C ./prelink.cache --ld-library-path=. --dynamic-linker=`echo ./ld*.so.*[0-9]`" \
diff --git a/sys-devel/prelink/files/prelink-20030217-glibc231.patch b/sys-devel/prelink/files/prelink-20030217-glibc231.patch
deleted file mode 100644
index bc767331950e..000000000000
--- a/sys-devel/prelink/files/prelink-20030217-glibc231.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- prelink/src/prelink.h	2003-02-17 17:27:43.000000000 +0000
-+++ prelink.new/src/prelink.h	2003-04-14 13:10:29.000000000 +0100
-@@ -402,4 +402,62 @@
- extern int verify;
- extern GElf_Addr mmap_reg_start, mmap_reg_end;
- 
-+#if (R_390_NUM == 27)
-+
-+/* Additional s390 relocs */
-+
-+#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
-+#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
-+#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
-+#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
-+#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
-+#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
-+#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
-+#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
-+#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
-+#define R_390_TLS_GDCALL	38	/* Tag for function call in general
-+					   dynamic TLS code. */
-+#define R_390_TLS_LDCALL	39	/* Tag for function call in local
-+					   dynamic TLS code. */
-+#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
-+					   thread local data.  */
-+#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
-+					  thread local data.  */
-+#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
-+					   block offset.  */
-+#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
-+					   block offset.  */
-+#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
-+					   block offset. */
-+#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
-+					   thread local data in LE code.  */
-+#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
-+					   thread local data in LE code.  */
-+#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
-+					   negated static TLS block offset.  */
-+#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
-+					   negated static TLS block offset.  */
-+#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
-+					   negated static TLS block offset.  */
-+#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
-+					   static TLS block.  */
-+#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
-+					   static TLS block.  */
-+#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
-+					   block.  */
-+#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
-+					   block.  */
-+#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
-+#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
-+#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
-+					   block.  */
-+
-+/* Keep this the last entry.  */
-+#undef R_390_NUM
-+#define R_390_NUM		57
-+
-+#endif
-+
- #endif /* PRELINK_H */
diff --git a/sys-devel/prelink/files/prelink-20030217-no-undosyslibs-test.patch b/sys-devel/prelink/files/prelink-20030217-no-undosyslibs-test.patch
deleted file mode 100644
index d9ca7f7dfcc6..000000000000
--- a/sys-devel/prelink/files/prelink-20030217-no-undosyslibs-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- prelink/testsuite/Makefile.in.jj	2003-03-07 20:51:14.000000000 +0000
-+++ prelink/testsuite/Makefile.in	2003-03-07 20:51:31.000000000 +0000
-@@ -97,8 +97,8 @@
- 	reloc1.sh reloc2.sh reloc3.sh reloc4.sh reloc5.sh reloc6.sh \
- 	reloc7.sh reloc8.sh reloc9.sh \
- 	shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \
--	layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh \
--	undosyslibs.sh
-+	layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh 
-+#	undosyslibs.sh
- 
- TESTS_ENVIRONMENT = \
- 	PRELINK="../src/prelink -c ./prelink.conf -C ./prelink.cache --ld-library-path=. --dynamic-linker=`echo ./ld*.so.*[0-9]`" \
diff --git a/sys-devel/prelink/files/prelink-20030505-glibc231.patch b/sys-devel/prelink/files/prelink-20030505-glibc231.patch
deleted file mode 100644
index 548bd9da1a78..000000000000
--- a/sys-devel/prelink/files/prelink-20030505-glibc231.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- prelink/src/prelink.h.jj	2003-05-21 20:18:29.000000000 +0100
-+++ prelink/src/prelink.h	2003-05-21 20:28:14.000000000 +0100
-@@ -411,4 +411,132 @@
- extern int verify;
- extern GElf_Addr mmap_reg_start, mmap_reg_end;
- 
-+#if (R_390_NUM == 27)
-+
-+/* Additional s390 relocs */
-+
-+#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
-+#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
-+#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
-+#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
-+#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
-+#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
-+#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
-+#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
-+#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
-+#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
-+#define R_390_TLS_GDCALL	38	/* Tag for function call in general
-+					   dynamic TLS code. */
-+#define R_390_TLS_LDCALL	39	/* Tag for function call in local
-+					   dynamic TLS code. */
-+#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
-+					   thread local data.  */
-+#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
-+					  thread local data.  */
-+#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
-+					   block offset.  */
-+#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
-+					   block offset.  */
-+#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
-+					   block offset. */
-+#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
-+					   thread local data in LE code.  */
-+#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
-+					   thread local data in LE code.  */
-+#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
-+					   negated static TLS block offset.  */
-+#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
-+					   negated static TLS block offset.  */
-+#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
-+					   negated static TLS block offset.  */
-+#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
-+					   static TLS block.  */
-+#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
-+					   static TLS block.  */
-+#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
-+					   block.  */
-+#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
-+					   block.  */
-+#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
-+#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
-+#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
-+					   block.  */
-+
-+/* Keep this the last entry.  */
-+#undef R_390_NUM
-+#define R_390_NUM		57
-+
-+#endif
-+
-+#if (R_PPC_NUM==37)
-+
-+#undef R_PPC_NUM
-+
-+/* PowerPC relocations defined for the TLS access ABI.  */
-+#define R_PPC_TLS		67 /* none	(sym+add)@tls */
-+#define R_PPC_DTPMOD32		68 /* word32	(sym+add)@dtpmod */
-+#define R_PPC_TPREL16		69 /* half16*	(sym+add)@tprel */
-+#define R_PPC_TPREL16_LO	70 /* half16	(sym+add)@tprel@l */
-+#define R_PPC_TPREL16_HI	71 /* half16	(sym+add)@tprel@h */
-+#define R_PPC_TPREL16_HA	72 /* half16	(sym+add)@tprel@ha */
-+#define R_PPC_TPREL32		73 /* word32	(sym+add)@tprel */
-+#define R_PPC_DTPREL16		74 /* half16*	(sym+add)@dtprel */
-+#define R_PPC_DTPREL16_LO	75 /* half16	(sym+add)@dtprel@l */
-+#define R_PPC_DTPREL16_HI	76 /* half16	(sym+add)@dtprel@h */
-+#define R_PPC_DTPREL16_HA	77 /* half16	(sym+add)@dtprel@ha */
-+#define R_PPC_DTPREL32		78 /* word32	(sym+add)@dtprel */
-+#define R_PPC_GOT_TLSGD16	79 /* half16*	(sym+add)@got@tlsgd */
-+#define R_PPC_GOT_TLSGD16_LO	80 /* half16	(sym+add)@got@tlsgd@l */
-+#define R_PPC_GOT_TLSGD16_HI	81 /* half16	(sym+add)@got@tlsgd@h */
-+#define R_PPC_GOT_TLSGD16_HA	82 /* half16	(sym+add)@got@tlsgd@ha */
-+#define R_PPC_GOT_TLSLD16	83 /* half16*	(sym+add)@got@tlsld */
-+#define R_PPC_GOT_TLSLD16_LO	84 /* half16	(sym+add)@got@tlsld@l */
-+#define R_PPC_GOT_TLSLD16_HI	85 /* half16	(sym+add)@got@tlsld@h */
-+#define R_PPC_GOT_TLSLD16_HA	86 /* half16	(sym+add)@got@tlsld@ha */
-+#define R_PPC_GOT_TPREL16	87 /* half16*	(sym+add)@got@tprel */
-+#define R_PPC_GOT_TPREL16_LO	88 /* half16	(sym+add)@got@tprel@l */
-+#define R_PPC_GOT_TPREL16_HI	89 /* half16	(sym+add)@got@tprel@h */
-+#define R_PPC_GOT_TPREL16_HA	90 /* half16	(sym+add)@got@tprel@ha */
-+#define R_PPC_GOT_DTPREL16	91 /* half16*	(sym+add)@got@dtprel */
-+#define R_PPC_GOT_DTPREL16_LO	92 /* half16*	(sym+add)@got@dtprel@l */
-+#define R_PPC_GOT_DTPREL16_HI	93 /* half16*	(sym+add)@got@dtprel@h */
-+#define R_PPC_GOT_DTPREL16_HA	94 /* half16*	(sym+add)@got@dtprel@ha */
-+
-+/* Keep this the last entry.  */
-+#define R_PPC_NUM		95
-+
-+/* The remaining relocs are from the Embedded ELF ABI, and are not
-+   in the SVR4 ELF ABI.  */
-+#define R_PPC_EMB_NADDR32	101
-+#define R_PPC_EMB_NADDR16	102
-+#define R_PPC_EMB_NADDR16_LO	103
-+#define R_PPC_EMB_NADDR16_HI	104
-+#define R_PPC_EMB_NADDR16_HA	105
-+#define R_PPC_EMB_SDAI16	106
-+#define R_PPC_EMB_SDA2I16	107
-+#define R_PPC_EMB_SDA2REL	108
-+#define R_PPC_EMB_SDA21		109	/* 16 bit offset in SDA */
-+#define R_PPC_EMB_MRKREF	110
-+#define R_PPC_EMB_RELSEC16	111
-+#define R_PPC_EMB_RELST_LO	112
-+#define R_PPC_EMB_RELST_HI	113
-+#define R_PPC_EMB_RELST_HA	114
-+#define R_PPC_EMB_BIT_FLD	115
-+#define R_PPC_EMB_RELSDA	116	/* 16 bit relative offset in SDA */
-+
-+/* Diab tool relocations.  */
-+#define R_PPC_DIAB_SDA21_LO	180	/* like EMB_SDA21, but lower 16 bit */
-+#define R_PPC_DIAB_SDA21_HI	181	/* like EMB_SDA21, but high 16 bit */
-+#define R_PPC_DIAB_SDA21_HA	182	/* like EMB_SDA21, adjusted high 16 */
-+#define R_PPC_DIAB_RELSDA_LO	183	/* like EMB_RELSDA, but lower 16 bit */
-+#define R_PPC_DIAB_RELSDA_HI	184	/* like EMB_RELSDA, but high 16 bit */
-+#define R_PPC_DIAB_RELSDA_HA	185	/* like EMB_RELSDA, adjusted high 16 */
-+
-+/* This is a phony reloc to handle any old fashioned TOC16 references
-+   that may still be in object files.  */
-+#define R_PPC_TOC16		255
-+
-+#endif
-+
- #endif /* PRELINK_H */
diff --git a/sys-devel/prelink/files/prelink-20030505-no-undosyslibs-test.patch b/sys-devel/prelink/files/prelink-20030505-no-undosyslibs-test.patch
deleted file mode 100644
index d8c02cbf5252..000000000000
--- a/sys-devel/prelink/files/prelink-20030505-no-undosyslibs-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- prelink/testsuite/Makefile.in.jj	2003-03-07 20:51:14.000000000 +0000
-+++ prelink/testsuite/Makefile.in	2003-03-07 20:51:31.000000000 +0000
-@@ -97,8 +97,8 @@
- 	reloc1.sh reloc2.sh reloc3.sh reloc4.sh reloc5.sh reloc6.sh \
- 	reloc7.sh reloc8.sh reloc9.sh reloc10.sh reloc11.sh \
- 	shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \
--	layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh \
--	undosyslibs.sh
-+	layout1.sh layout2.sh tls1.sh tls2.sh tls3.sh tls4.sh 
-+#	undosyslibs.sh
- 
- TESTS_ENVIRONMENT = \
- 	PRELINK="../src/prelink -c ./prelink.conf -C ./prelink.cache --ld-library-path=. --dynamic-linker=`echo ./ld*.so.*[0-9]`" \
diff --git a/sys-devel/prelink/files/prelink-no-undosyslibs-test.patch b/sys-devel/prelink/files/prelink-no-undosyslibs-test.patch
deleted file mode 100644
index f074b34fc27e..000000000000
--- a/sys-devel/prelink/files/prelink-no-undosyslibs-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- prelink/testsuite/Makefile.in.orig	2002-12-05 00:08:03.000000000 +0200
-+++ prelink/testsuite/Makefile.in	2002-12-05 00:08:16.000000000 +0200
-@@ -88,8 +88,8 @@
- 	reloc1.sh reloc2.sh reloc3.sh reloc4.sh reloc5.sh reloc6.sh \
- 	reloc7.sh reloc8.sh reloc9.sh \
- 	shuffle1.sh shuffle2.sh shuffle3.sh shuffle4.sh shuffle5.sh \
--	layout1.sh layout2.sh \
--	undosyslibs.sh
-+	layout1.sh layout2.sh 
-+#	undosyslibs.sh
- 
- TESTS_ENVIRONMENT = \
- 	PRELINK="../src/prelink -c ./prelink.conf -C ./prelink.cache --ld-library-path=. --dynamic-linker=`echo ./ld*.so.*[0-9]`" \
diff --git a/sys-devel/prelink/prelink-20030217.ebuild b/sys-devel/prelink/prelink-20030217.ebuild
deleted file mode 100644
index 678de246300b..000000000000
--- a/sys-devel/prelink/prelink-20030217.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20030217.ebuild,v 1.8 2003/09/06 08:06:52 msterret Exp $
-
-IUSE=""
-
-inherit eutils
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Modifies executables so runtime libraries load faster"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="ftp://people.redhat.com/jakub/prelink"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha"
-
-DEPEND=">=dev-libs/elfutils-0.72
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.3.1
-	>=sys-devel/binutils-2.13.90.0.10"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-no-undosyslibs-test.patch
-	epatch ${FILESDIR}/${P}-glibc231.patch
-}
-
-src_compile() {
-
-	econf || die "Configure failed"
-
-	emake || die "Make Failed"
-}
-
-src_install() {
-	einstall || die "Install Failed"
-
-	dodoc INSTALL TODO ChangeLog THANKS COPYING README AUTHORS NEWS
-
-	insinto /etc
-	doins ${S}/doc/prelink.conf
-}
-
diff --git a/sys-devel/prelink/prelink-20030505.ebuild b/sys-devel/prelink/prelink-20030505.ebuild
deleted file mode 100644
index 345c9a90c840..000000000000
--- a/sys-devel/prelink/prelink-20030505.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20030505.ebuild,v 1.3 2003/09/06 08:06:52 msterret Exp $
-
-IUSE=""
-
-inherit eutils
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Modifies executables so runtime libraries load faster"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="ftp://people.redhat.com/jakub/prelink"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha"
-
-DEPEND=">=dev-libs/elfutils-0.72
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.3.1
-	>=sys-devel/binutils-2.13.90.0.10"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-no-undosyslibs-test.patch
-	epatch ${FILESDIR}/${P}-glibc231.patch
-}
-
-src_compile() {
-
-	econf || die "Configure failed"
-
-	emake || die "Make Failed"
-}
-
-src_install() {
-	einstall || die "Install Failed"
-
-	dodoc INSTALL TODO ChangeLog THANKS COPYING README AUTHORS NEWS
-
-	insinto /etc
-	doins ${S}/doc/prelink.conf
-}
-
diff --git a/sys-devel/prelink/prelink-20030811.ebuild b/sys-devel/prelink/prelink-20030811.ebuild
deleted file mode 100644
index e3fdbf888765..000000000000
--- a/sys-devel/prelink/prelink-20030811.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20030811.ebuild,v 1.2 2003/08/27 17:04:03 cretin Exp $
-
-IUSE=""
-
-inherit eutils
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Modifies executables so runtime libraries load faster"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="ftp://people.redhat.com/jakub/prelink"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~alpha"
-
-DEPEND=">=dev-libs/elfutils-0.72
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.3.1
-	>=sys-devel/binutils-2.13.90.0.10"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-20030505-glibc231.patch
-}
-
-src_compile() {
-
-	econf || die "Configure failed"
-
-	emake || die "Make Failed"
-}
-
-src_install() {
-	einstall || die "Install Failed"
-
-	dodoc INSTALL TODO ChangeLog THANKS COPYING README AUTHORS NEWS
-
-	insinto /etc
-	doins ${S}/doc/prelink.conf
-}
-
diff --git a/sys-devel/prelink/prelink-20030902.ebuild b/sys-devel/prelink/prelink-20030902.ebuild
deleted file mode 100644
index 2e0441705d1b..000000000000
--- a/sys-devel/prelink/prelink-20030902.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20030902.ebuild,v 1.1 2003/09/24 16:26:23 cretin Exp $
-
-IUSE=""
-
-inherit eutils
-
-S="${WORKDIR}/${PN}"
-DESCRIPTION="Modifies executables so runtime libraries load faster"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="ftp://people.redhat.com/jakub/prelink"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha"
-
-DEPEND=">=dev-libs/elfutils-0.84
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.3.1
-	>=sys-devel/binutils-2.13.90.0.10"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-20030505-glibc231.patch
-}
-
-src_compile() {
-
-	econf || die "Configure failed"
-
-	emake || die "Make Failed"
-}
-
-src_install() {
-	einstall || die "Install Failed"
-
-	dodoc INSTALL TODO ChangeLog THANKS COPYING README AUTHORS NEWS
-
-	insinto /etc
-	doins ${S}/doc/prelink.conf
-}
-
diff --git a/sys-devel/prelink/prelink-20031012.ebuild b/sys-devel/prelink/prelink-20031012.ebuild
deleted file mode 100644
index 7abd2b200da7..000000000000
--- a/sys-devel/prelink/prelink-20031012.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20031012.ebuild,v 1.2 2004/02/06 17:57:39 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Modifies executables so runtime libraries load faster"
-HOMEPAGE="ftp://people.redhat.com/jakub/prelink"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64"
-
-DEPEND=">=dev-libs/elfutils-0.84
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.3.1
-	>=sys-devel/binutils-2.13.90.0.10"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-20030505-glibc231.patch
-}
-
-src_compile() {
-	econf || die "Configure failed"
-	emake || die "Make Failed"
-}
-
-src_install() {
-	einstall || die "Install Failed"
-
-	dodoc INSTALL TODO ChangeLog THANKS COPYING README AUTHORS NEWS
-
-	insinto /etc
-	doins ${S}/doc/prelink.conf
-}
diff --git a/sys-devel/prelink/prelink-20040216.ebuild b/sys-devel/prelink/prelink-20040216.ebuild
deleted file mode 100644
index 9728b3615f93..000000000000
--- a/sys-devel/prelink/prelink-20040216.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20040216.ebuild,v 1.2 2004/03/21 19:09:40 jhuebel Exp $
-
-inherit eutils
-
-DESCRIPTION="Modifies executables so runtime libraries load faster"
-HOMEPAGE="ftp://people.redhat.com/jakub/prelink"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=dev-libs/elfutils-0.84
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.3.1
-	>=sys-devel/binutils-2.13.90.0.10"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	econf || die "Configure failed"
-	emake || die "Make Failed"
-}
-
-src_install() {
-	einstall || die "Install Failed"
-
-	dodoc INSTALL TODO ChangeLog THANKS COPYING README AUTHORS NEWS
-
-	insinto /etc
-	doins ${S}/doc/prelink.conf
-}
diff --git a/sys-devel/prelink/prelink-20040317.ebuild b/sys-devel/prelink/prelink-20040317.ebuild
index 0cbb1ec5f5fc..8031f1f45f52 100644
--- a/sys-devel/prelink/prelink-20040317.ebuild
+++ b/sys-devel/prelink/prelink-20040317.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20040317.ebuild,v 1.2 2004/04/08 15:43:09 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20040317.ebuild,v 1.3 2004/04/11 11:29:02 cretin Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="x86 amd64 ppc alpha"
 
 DEPEND=">=dev-libs/elfutils-0.84
 	!dev-libs/libelf