Remove old.

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

7 files changed, 9 insertions, 499 deletions

diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index cce3465494e1..1d70286be2c0 100644
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/prelink
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.77 2010/08/13 13:39:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.78 2010/09/19 09:16:52 dirtyepic Exp $
+
+  19 Sep 2010; Ryan Hill <dirtyepic@gentoo.org>
+  -files/prelink-20040707-init.patch,
+  -files/prelink-20050314-amd64-gcc4.patch,
+  -files/prelink-20060213-symloop.patch,
+  -files/prelink-20060712-cache-segfault.patch, -prelink-20071009.ebuild,
+  -prelink-20100413.ebuild:
+  Remove old.
 
   13 Aug 2010; Joseph Jezak <josejx@gentoo.org> prelink-20100106.ebuild:
   Marked ppc/ppc64 stable for bug #321951.
diff --git a/sys-devel/prelink/files/prelink-20040707-init.patch b/sys-devel/prelink/files/prelink-20040707-init.patch
deleted file mode 100644
index 55bd8c88ac7e..000000000000
--- a/sys-devel/prelink/files/prelink-20040707-init.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- prelink-20040707/src/main.c.jj	2004-09-09 09:53:05.281838640 -0700
-+++ prelink-20040707/src/main.c	2004-09-09 10:31:09.029656200 -0700
-@@ -58,6 +58,8 @@
- const char *prelink_conf = PRELINK_CONF;
- const char *prelink_cache = PRELINK_CACHE;
- const char *undo_output;
-+int noreexecinit;
-+time_t initctime;
- 
- const char *argp_program_version = "prelink 1.0";
- 
-@@ -111,6 +113,7 @@
-   {"mmap-region-end",	OPT_MMAP_REG_END, "BASE_ADDRESS", OPTION_HIDDEN, "" },
-   {"seed",		OPT_SEED, "SEED", OPTION_HIDDEN, "" },
-   {"compute-checksum",	OPT_COMPUTE_CHECKSUM, 0, OPTION_HIDDEN, "" },
-+  {"init",		'i', 0, 0,  "Do not re-execute init" },
-   { 0 }
- };
- 
-@@ -222,12 +225,29 @@
-     case OPT_COMPUTE_CHECKSUM:
-       compute_checksum = 1;
-       break;
-+	case 'i':
-+	  noreexecinit=1;
-+	  break;
-     default:
-       return ARGP_ERR_UNKNOWN;
-     }
-   return 0;
- }
- 
-+time_t get_ctime(const char *file) {
-+  struct stat st;
-+  if(stat(file,&st) == 0)
-+    return st.st_ctime;
-+  return 0;
-+}
-+
-+void checkinit() {
-+    if(initctime != get_ctime("/sbin/init")) {
-+	  printf("Executing /sbin/init U\n");
-+      system("/sbin/init U");
-+	}
-+}
-+
- static struct argp argp = { options, parse_opt, "[FILES]", argp_doc };
- 
- int
-@@ -247,6 +267,11 @@
- 
-   argp_parse (&argp, argc, argv, 0, &remaining, 0);
- 
-+  if(!noreexecinit) {
-+    initctime = get_ctime("/sbin/init");
-+	atexit(checkinit);
-+  }
-+
-   if (ld_library_path == NULL)
-     ld_library_path = getenv ("LD_LIBRARY_PATH");
- 
diff --git a/sys-devel/prelink/files/prelink-20050314-amd64-gcc4.patch b/sys-devel/prelink/files/prelink-20050314-amd64-gcc4.patch
deleted file mode 100644
index 8cf4c53f5538..000000000000
--- a/sys-devel/prelink/files/prelink-20050314-amd64-gcc4.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-Rather dumb (Ok, so I was lazy) patch to fix:
-
-  exec.c: In function 'prelink_exec':
-  exec.c:119: error: jump into scope of identifier with variably modified type
-
-
---- prelink/src/exec.c	2005-05-20 00:38:15.000000000 +0200
-+++ prelink.az/src/exec.c	2005-05-20 00:43:02.000000000 +0200
-@@ -27,6 +27,13 @@
- #include "reloc.h"
- #include "space.h"
- 
-+#define goto_error_out \
-+	{ \
-+		free (liblist); \
-+		free (move); \
-+		return 1; \
-+	}
-+
- int
- update_dynamic_tags (DSO *dso, GElf_Shdr *shdr, GElf_Shdr *old_shdr,
- 		     struct section_move *move)
-@@ -116,7 +123,7 @@
-       Elf_Data *data;
- 
-       if (undo_sections (dso, undo, move, &rinfo, &ehdr, phdr, shdr))
--	goto error_out;
-+	goto_error_out
-       data = elf_getdata (dso->scn[undo], NULL);
-       assert (data->d_buf != NULL);
-       assert (data->d_off == 0);
-@@ -127,7 +134,7 @@
- 	{
- 	  error (0, ENOMEM, "%s: Could not create .gnu.prelink_undo section",
- 		 dso->filename);
--	  goto error_out;
-+	  goto_error_out
- 	}
-       memcpy (dso->undo.d_buf, data->d_buf, data->d_size);
-       ehdr.e_shstrndx = dso->ehdr.e_shstrndx;
-@@ -145,7 +152,7 @@
-   if (dynstrndx == dso->ehdr.e_shnum)
-     {
-       error (0, 0, "%s: Could not find .dynstr section", dso->filename);
--      goto error_out;
-+      goto_error_out
-     }
- 
-   dynstrndxnew = move->old_to_new[dynstrndx];
-@@ -159,7 +166,7 @@
- 	{
- 	  error (0, ENOMEM, "%s: Cannot build .gnu.liblist section",
- 		 dso->filename);
--	  goto error_out;
-+	  goto_error_out
- 	}
-     }
-   else
-@@ -342,7 +349,7 @@
-     {
-       new[i] = find_readonly_space (dso, add + i, &ehdr, phdr, shdr, &adjust);
-       if (new[i] == 0)
--	goto error_out;
-+	goto_error_out
-       add_section (move, new[i]);
-       ++adjust.newcount;
-       if (old[i])
-@@ -429,7 +436,7 @@
-   dso->ehdr = ehdr;
-   memcpy (dso->phdr, phdr, ehdr.e_phnum * sizeof (GElf_Phdr));
-   if (reopen_dso (dso, move, NULL))
--    goto error_out;
-+    goto_error_out
- 
-   assert (i == dso->ehdr.e_shnum);
- 
-@@ -471,7 +478,7 @@
- 		  {
- 		    error (0, ENOMEM, "%s: Could not convert NOBITS section into PROGBITS",
- 			   dso->filename);
--		    goto error_out;
-+		    goto_error_out
- 		  }
- 	      }
- 	    data->d_type = ELF_T_BYTE;
-@@ -500,7 +507,7 @@
- 		    {
- 		      error (0, 0, "%s: NOBITS section followed by non-NOBITS section in the same segment",
- 			     dso->filename);
--		      goto error_out;
-+		      goto_error_out
- 		    }
- 		  continue;
- 		}
-@@ -530,7 +537,7 @@
- 		      {
- 			error (0, ENOMEM, "%s: Could not convert NOBITS section into PROGBITS",
- 			       dso->filename);
--			goto error_out;
-+			goto_error_out
- 		      }
- 		  }
- 		memset (data->d_buf, 0, data->d_size);
-@@ -581,7 +588,7 @@
- 		{
- 		  error (0, 0, "%s: section spans beyond end of segment",
- 			 dso->filename);
--		  goto error_out;
-+		  goto_error_out
- 		}
- 	      else
- 		{
-@@ -615,7 +622,7 @@
- 	    if (adjust_dso_nonalloc (dso, last + 1,
- 				     dso->shdr[sfirst].sh_offset,
- 				     adj))
--	      goto error_out;
-+	      goto_error_out
- 	  }
-       }
- 
-@@ -638,7 +645,7 @@
- 	  dso->shdr[j].sh_size
- 	    = dso->shdr[j].sh_size / 3 * 2;
- 	  if (convert_rel_to_rela (dso, j))
--	    goto error_out;
-+	    goto_error_out
- 	  dso->shdr[j].sh_size = shdr[j].sh_size;
- 	}
-     }
-@@ -665,7 +672,7 @@
- 	  dso->shdr[rinfo.first].sh_size
- 	    = dso->shdr[rinfo.first].sh_size / 3 * 2;
- 	  if (convert_rel_to_rela (dso, rinfo.plt))
--	    goto error_out;
-+	    goto_error_out
- 	  dso->shdr[rinfo.plt].sh_size = shdr[rinfo.plt].sh_size;
- 	}
-       else if (rinfonew.rel_to_rela_plt)
-@@ -690,7 +697,7 @@
- 	{
- 	  error (0, ENOMEM, "%s: Could not append names needed for .gnu.liblist to .dynstr",
- 		 dso->filename);
--	  goto error_out;
-+	  goto_error_out
- 	}
-       ptr = data->d_buf + shdr_after_undo[dynstrndxnew].sh_size;
-       data->d_size = dso->shdr[i].sh_size;
-@@ -714,7 +721,7 @@
- 
- 	  dso->shdr[new_sdynbss].sh_name = shstrtabadd (dso, ".sdynbss");
- 	  if (dso->shdr[new_sdynbss].sh_name == 0)
--	    goto error_out;
-+	    goto_error_out
- 
- 	  dso->shdr[new_sdynbss].sh_size =
- 	    info->sdynbss_base + info->sdynbss_size
-@@ -738,7 +745,7 @@
- 	    {
- 	      error (0, 0, "%s: Copy relocs don't point into .sdynbss section",
- 		     dso->filename);
--	      goto error_out;
-+	      goto_error_out
- 	    }
- 	}
-       data = elf_getdata (dso->scn[new_sdynbss], NULL);
-@@ -781,7 +788,7 @@
- 	  else
- 	    dso->shdr[new_dynbss].sh_name = shstrtabadd (dso, ".dynbss");
- 	  if (dso->shdr[new_dynbss].sh_name == 0)
--	    goto error_out;
-+	    goto_error_out
- 
- 	  dso->shdr[new_dynbss].sh_size =
- 	    info->dynbss_base + info->dynbss_size
-@@ -815,7 +822,7 @@
- 		    {
- 		      error (0, 0, "%s: COPY relocs not present at start of first SHT_NOBITS section",
- 			     dso->filename);
--		      goto error_out;
-+		      goto_error_out
- 		    }
- 		}
- 
-@@ -885,7 +892,7 @@
- 	      if (adjust_dso_nonalloc (dso, new_dynbss + 2,
- 				       dso->shdr[new_dynbss].sh_offset,
- 				       adj))
--		goto error_out;
-+		goto_error_out
- 	    }
- 	}
-       else
-@@ -898,7 +905,7 @@
- 	    {
- 	      error (0, 0, "%s: Copy relocs don't point into .dynbss section",
- 		     dso->filename);
--	      goto error_out;
-+	      goto_error_out
- 	    }
- 	}
-       data = elf_getdata (dso->scn[new_dynbss], NULL);
-@@ -942,7 +949,7 @@
-   dso->shdr[i].sh_entsize = shdr[i].sh_entsize;
-   dso->shdr[i].sh_name = shstrtabadd (dso, ".gnu.liblist");
-   if (dso->shdr[i].sh_name == 0)
--    goto error_out;
-+    goto_error_out
-   else
-     {
-       Elf_Data *data;
-@@ -959,9 +966,9 @@
-       data->d_align = sizeof (GElf_Word);
-       data->d_version = EV_CURRENT;
-       if (set_dynamic (dso, DT_GNU_LIBLIST, dso->shdr[i].sh_addr, 1))
--	goto error_out;
-+	goto_error_out
-       if (set_dynamic (dso, DT_GNU_LIBLISTSZ, dso->shdr[i].sh_size, 1))
--	goto error_out;
-+	goto_error_out
-     }
- 
-   /* Create the conflict list if necessary.  */
-@@ -984,7 +991,7 @@
- 	    {
- 	      error (0, ENOMEM, "%s: Could not build .gnu.conflict section",
- 		     dso->filename);
--	      goto error_out;
-+	      goto_error_out
- 	    }
- 	}
-       else
-@@ -1007,11 +1014,11 @@
-       dso->shdr[i].sh_link = j;
-       dso->shdr[i].sh_name = shstrtabadd (dso, ".gnu.conflict");
-       if (dso->shdr[i].sh_name == 0)
--	goto error_out;
-+	goto_error_out
-       if (set_dynamic (dso, DT_GNU_CONFLICT, dso->shdr[i].sh_addr, 1))
--	goto error_out;
-+	goto_error_out
-       if (set_dynamic (dso, DT_GNU_CONFLICTSZ, dso->shdr[i].sh_size, 1))
--	goto error_out;
-+	goto_error_out
-     }
- 
-   if (undo != -1)
-@@ -1046,16 +1053,11 @@
-   recompute_nonalloc_offsets (dso);
- 
-   if (update_dynamic_tags (dso, dso->shdr, old_shdr, move))
--    goto error_out;
-+    goto_error_out
- 
-   if (update_dynamic_rel (dso, &rinfo))
--    goto error_out;
-+    goto_error_out
- 
-   free (move);
-   return 0;
--
--error_out:
--  free (liblist);
--  free (move);
--  return 1;
- }
diff --git a/sys-devel/prelink/files/prelink-20060213-symloop.patch b/sys-devel/prelink/files/prelink-20060213-symloop.patch
deleted file mode 100644
index 0345cebbc6fa..000000000000
--- a/sys-devel/prelink/files/prelink-20060213-symloop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- prelink/src/gather.c.jj	2005-06-10 06:21:09.000000000 -0700
-+++ prelink/src/gather.c	2006-04-10 19:42:15.000000000 -0700
-@@ -1003,6 +1003,10 @@
- 	return 0;
-       ++implicit;
-       ret = nftw64 (name, gather_func, 20, flags | FTW_ACTIONRETVAL);
-+      if(ret)
-+	{
-+	  error (0, errno, "Can't walk directory tree %s", name);
-+	}
-       --implicit;
- #ifndef HAVE_FTW_ACTIONRETVAL
-       free (blacklist_dir);
diff --git a/sys-devel/prelink/files/prelink-20060712-cache-segfault.patch b/sys-devel/prelink/files/prelink-20060712-cache-segfault.patch
deleted file mode 100644
index d73b9d418645..000000000000
--- a/sys-devel/prelink/files/prelink-20060712-cache-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=143753
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=197451
-
-diff -urN prelink-0.0.20060712.orig/src/cache.c prelink-0.0.20060712/src/cache.c
---- prelink-0.0.20060712.orig/src/cache.c       2006-08-15 23:36:13.000000000 +0000
-+++ prelink-0.0.20060712/src/cache.c    2006-08-15 23:36:34.000000000 +0000
-@@ -336,8 +336,8 @@
-   struct prelink_entry *a = * (struct prelink_entry **) A;
-   struct prelink_entry *b = * (struct prelink_entry **) B;
-
--  if (a == NULL && b != NULL)
--    return 1;
-+  if (a == NULL)
-+    return (b != NULL);
-   if (a != NULL && b == NULL)
-     return -1;
-
-
-
diff --git a/sys-devel/prelink/prelink-20071009.ebuild b/sys-devel/prelink/prelink-20071009.ebuild
deleted file mode 100644
index db1aa4f1e6cb..000000000000
--- a/sys-devel/prelink/prelink-20071009.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20071009.ebuild,v 1.9 2010/07/11 11:17:40 armin76 Exp $
-
-# the tar.bz2 was ripped from this rpm:
-# http://mirrors.kernel.org/fedora/development/source/SRPMS/prelink-0.4.0-1.src.rpm
-
-inherit eutils
-
-DESCRIPTION="modifies ELFs so they load faster at runtime"
-HOMEPAGE="http://people.redhat.com/jakub/prelink"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	ftp://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/elfutils-0.100
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.3.4"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.15.90.0.1"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
-	sed -i \
-		-e '/^CC=/s: : -Wl,--disable-new-dtags :' \
-		testsuite/functions.sh #100147
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Install Failed"
-
-	insinto /etc
-	doins doc/prelink.conf || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-
-	dodir /var/{lib/misc,log}
-	touch "${D}/var/lib/misc/prelink.full"
-	touch "${D}/var/lib/misc/prelink.quick"
-	touch "${D}/var/lib/misc/prelink.force"
-	touch "${D}/var/log/prelink.log"
-
-	dodoc INSTALL TODO ChangeLog THANKS README AUTHORS NEWS
-}
-
-pkg_postinst() {
-	echo
-	elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-	elog "found online at:"
-	elog "    http://www.gentoo.org/doc/en/prelink-howto.xml"
-	elog "Added cron job at /etc/cron.daily/prelink"
-	elog "Edit /etc/conf.d/prelink to enable / configure"
-	echo
-	touch "${ROOT}/var/lib/misc/prelink.force"
-}
diff --git a/sys-devel/prelink/prelink-20100413.ebuild b/sys-devel/prelink/prelink-20100413.ebuild
deleted file mode 100644
index 6e3d30457044..000000000000
--- a/sys-devel/prelink/prelink-20100413.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20100413.ebuild,v 1.5 2010/07/24 18:00:03 dirtyepic Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="http://people.redhat.com/jakub/prelink"
-#SRC_URI="http://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-# if not on http://people.redhat.com/jakub/prelink/, releases can usually be ripped from
-# http://mirrors.kernel.org/fedora/development/source/SRPMS/prelink-<blah>.src.rpm
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/elfutils-0.100
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch
-
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-	sed -i -e 's:-Wno-pointer-sign::' src/Makefile.in #325269
-	append-cflags -Wno-pointer-sign
-	strip-unsupported-flags
-}
-
-src_test() {
-	unset LD_AS_NEEDED # 303797
-	emake -j1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install Failed"
-
-	insinto /etc
-	doins doc/prelink.conf || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-
-	dodir /var/{lib/misc,log}
-	touch "${D}/var/lib/misc/prelink.full"
-	touch "${D}/var/lib/misc/prelink.quick"
-	touch "${D}/var/lib/misc/prelink.force"
-	touch "${D}/var/log/prelink.log"
-
-	dodoc TODO ChangeLog
-}
-
-pkg_postinst() {
-	echo
-	elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-	elog "found online at:"
-	elog
-	elog "    http://www.gentoo.org/doc/en/prelink-howto.xml"
-	elog
-	elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	echo
-	touch "${ROOT}/var/lib/misc/prelink.force"
-}