reinit the tree, so we can have metadata

9 files changed, 397 insertions, 0 deletions

diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
new file mode 100644
index 000000000000..77146ccf5723
--- /dev/null
+++ b/dev-util/elfkickers/Manifest
@@ -0,0 +1,12 @@
+AUX add-freebsd-elf-defs.patch 1937 SHA256 76b5cf0d09247787e7f5e528007df967220629442c1d7109c31c2b062a054e2b SHA512 3f480926cc89ebf3a02bf0fbb8e304226e9b58bed2bc887854a8935915a444822093264e98856f55fb76e3c32127914e171e3da5ebfc05fed5a2d02931e970c2 WHIRLPOOL 64f905e40a16c33c65053c9b01514dddb74614c04fe344299f215d0253e9b8fc0a28718cc6c44758c3619b9df64e869204edd8ea059725d0f5fc80dafd6e6157
+AUX create-destdir-path.patch 472 SHA256 fab7f8335a545b62b2186bc900a69150a36432a7ff977a1bae6b8279c3ca9304 SHA512 d84f70310786a5f550164145c1983d826a8ccf6616bf691e19592f91aa7c6549e96fefe27e5622fbca6c4db1cfa75362a67ba7b8d6d4fb365b34cf527743a3cf WHIRLPOOL 753faf51f614115046ee3e494793d6c1956ac7c8d5315abe62b6527f3b920f6f017bb4f2fdae3b7763090d14894062df495fdc9e7eeb9320408253836d33349d
+AUX elfkickers-3.1-create-destdir-path.patch 620 SHA256 093271aaa02ffd1925623558cee1ac29babf83af3ea62519c5c6535b77678be1 SHA512 63805893f21f7b4688c4363fa0e9fdd721ad14a03e657ca73b80850726c7c3178fc538005d5e8a47746f0496aea2b9899a39b511dc73556231141a02cf46d281 WHIRLPOOL df261a18cb2a9445c097a28d3f5f7330118685ed0cf82225137284a34dfe77dc27d913f497ec459378266b6189a19e013ea17874970a1b8ef6ced5b8ce225d60
+AUX elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch 3246 SHA256 3b3e3dd52e167265c1c1f2c1b156957cb1a6347dcbf12e3d0aa081aad97f87c0 SHA512 fc44d407d1cab8e26af3a7011d82a8f236ef330d881308c28ecc0685e5e8e11b3477ed67c59284ed0905ddd5d62e76f88b99ee4b27dcfb2f5d188f0318ebc1ef WHIRLPOOL ababf3f4ffd35c78c5783fd08e7406d1b5c5bdd6c5e5831e720d43b41050af9703813617552bd0f62e49a455aeedd01bf5c9335c4efeaed01f8ff59fc0ffbc7d
+AUX respect-CFLAGS-LDFLAGS.patch 3237 SHA256 738b1cd1d32d10816a422031902cd946d446751df4592fe29bb5f1d8c4ee6e0f SHA512 85b1dd45111e7171701c4ef81e3aa23fbd5088c50cce890cf1d27c4de3560311f215bd43e3b0295e9c7917b07dca5c3431c2a705bbef80c0d90fd409ccebe664 WHIRLPOOL 0161f435f0c0128ea9c030d826f28225e31d6715c74f8bf64a898d6bcb3fc4e6817230e3893d8bc104c8c2f11fac78e74e43bf41f67f40cd19c785575d7e9f45
+DIST ELFkickers-3.0a.tar.gz 100112 SHA256 c3429957142169c21ff550e0c06bbb0d48bb76437c4ccbc67164bf56b6e9774f SHA512 c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c WHIRLPOOL 9ed47c5c64c79dca6bce891beb430502b33481b3bc14f19f46e26157b6772ca5d1e6bc00907337dd3dc07d163b6a0cc246fef7e4afd36a85547e210b7b4bd2ea
+DIST ELFkickers-3.1.tar.gz 101406 SHA256 6d663fb06dd723a078282937052368498e3860d3c42f0d765579d496e5f51a58 SHA512 a0b1ba6cdb23b12f41b81cac1960b15cc2a4418cef48923900b668fa5132ce428bab16b1780698864fdf0c374762d57f471fc124d231f8de143be172c757000b WHIRLPOOL 550df625744d0de9170623ae6aa849840309369085be65d7784b81147826109f8c2997d65cdc20359f728b468a94b212bc5c89d6236a0cb05c9f98fa8e3fec9d
+EBUILD elfkickers-3.0a.ebuild 864 SHA256 0ff544e536c043971229c55d178ad07fd4b2371c4dea031591a2159e9e998e0a SHA512 cda14dadbe6dadfeb44f9df4955c118c19ba9ccb66941e1653a95615ae812d22fecb8aaff8e7472fb8a246e194f238717b1512ff83aac1a7348bb684436b968c WHIRLPOOL 24f7119e000a20d64759e9e4f4fe95e6c41eafb364920a16b945958a2dad5d0f5fcd1aa54473171c990613b532fbb5e45403dc66c4666a5efb44cd5c6ae086ad
+EBUILD elfkickers-3.1.ebuild 891 SHA256 232607a84e4fcbbe6b0182ac35bc2ac61335f4ab536b9973048e82e1549607e8 SHA512 efccb8fb37470c1380db2f4f81f21bbe877bf9a4e026a3eedc3cc0c8eb8e7025f18a3297023abf1a69db7607ca4ec1aabdbec6d396050d11c25e94d6dd28966d WHIRLPOOL 1aca6159e92a5bd3ef0e8cb00e00b7c0f3327fd7e72e523cdf9bb3ec7f08717e709b000d80f65854d6892e76389557b6fdcbefe22ce0ee10076e7de5b58f06f8
+MISC ChangeLog 3108 SHA256 d9afbcd3108d9be5c4a3f1d834bb890183964be7ac9aaaf5f802ef278da35113 SHA512 d8cdd9010b91ae59e4a22dc30701040513ea9bb4029251d477e23cd2cd2887636cdc76fdac2cb2ef35db1456ef51a5eadbb89a123009ae6556688d09963ba81f WHIRLPOOL 802e870fde3dfceed245f646a15cc535cd049a1bb41230ae08e3190e9c3826f1a4be8b142ecbaa33e97ad55edfd84ac5527e59f6803b79381d03caac35fa67b7
+MISC ChangeLog-2015 7382 SHA256 7ba9b305e67a80eb673fae1954ef68e6afe8e242baf1a5e5b5632a2d44c933b7 SHA512 09daa032337721daab2a51f676959946b70ce6bc368a93435aeb9cd3a9a39cf4185836b5b2e2e75a7f319b09ebf656bab2bf11a412b5e5354ebbb7c5150745b8 WHIRLPOOL 8ea76b68ee2ec3a2e30d0eb2cfc44e4bad75ada3d5d8425e4b422e74bb47d752f275cdb974ae6249a26f1bbae1f2ade746f449617c50b172a8c3ddd3c8578408
+MISC metadata.xml 705 SHA256 f54880f2d987dc5e3db1eae4fc6264e9c746ea03a6a5e206ecc27da217083184 SHA512 d44670d8094e1e4a1926dc4d06cb1c94a99bf0598f3319b366d192ab7820a3812040df0500d1df2f4f69db4f25315ba3e66e55050bb88b1fdc763dfbd732a2f0 WHIRLPOOL 891220735ccf0484e917830d5f7e8d8b11ae9a69914e13b10acfd65615d9396708318855a4254a2fc55228b11bfc2f1092576091b501d345bcb6234d517598d6
diff --git a/dev-util/elfkickers/elfkickers-3.0a.ebuild b/dev-util/elfkickers/elfkickers-3.0a.ebuild
new file mode 100644
index 000000000000..7e9fab33ac24
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.0a.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~mips sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-CFLAGS-LDFLAGS.patch
+	epatch "${FILESDIR}"/create-destdir-path.patch
+	epatch "${FILESDIR}"/add-freebsd-elf-defs.patch
+	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) all
+}
diff --git a/dev-util/elfkickers/elfkickers-3.1.ebuild b/dev-util/elfkickers/elfkickers-3.1.ebuild
new file mode 100644
index 000000000000..57d7594f539c
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-CFLAGS-LDFLAGS.patch
+	epatch "${FILESDIR}"/${P}-create-destdir-path.patch
+	epatch "${FILESDIR}"/add-freebsd-elf-defs.patch
+	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
+		|| die "sed failed"
+	eapply_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) all
+}
diff --git a/dev-util/elfkickers/files/add-freebsd-elf-defs.patch b/dev-util/elfkickers/files/add-freebsd-elf-defs.patch
new file mode 100644
index 000000000000..792a91d6dfb2
--- /dev/null
+++ b/dev-util/elfkickers/files/add-freebsd-elf-defs.patch
@@ -0,0 +1,68 @@
+--- ./elfrw/elfrw.h.orig	2011-05-31 01:47:08.000000000 +0200
++++ ./elfrw/elfrw.h	2011-06-08 12:16:37.000000000 +0200
+@@ -10,6 +10,24 @@
+ #include <stdio.h>
+ #include <elf.h>
+ 
++#ifdef __FreeBSD__
++typedef uint16_t Elf64_Section;
++
++#define PT_GNU_STACK	0x6474e551
++#define PT_GNU_RELRO	0x6474e552
++
++#if  __FreeBSD_version < 700022
++#define SHT_GNU_HASH	0x6ffffff6
++#define EM_CRIS		76
++#define EM_M32R		88
++#define EM_MN10300	89
++#endif
++
++#define ELFCLASSNUM 3
++#define ELFDATANUM  3
++#define EV_NUM      2
++#endif
++
+ /*
+  * The initialization functions. Call one of these to set the flavor
+  * of ELF structures to translate to and from. The library can be
+--- ./elftoc/readelf.h.orig	2011-05-22 20:46:29.000000000 +0200
++++ ./elftoc/readelf.h	2011-06-08 12:16:37.000000000 +0200
+@@ -7,6 +7,12 @@
+ #ifndef	_readelf_h_
+ #define	_readelf_h_
+ 
++#ifdef __FreeBSD__
++#define ELFCLASSNUM 3
++#define ELFDATANUM  3
++#define EV_NUM      2
++#endif
++
+ /* Read all of the basic headers from the file image (namely the ELF
+  * header, the program segment header table, and the section header
+  * table). False is returned if the file could not be parsed as an ELF
+--- ./elftoc/pieces.c.orig	2011-05-26 03:25:14.000000000 +0200
++++ ./elftoc/pieces.c	2011-06-08 12:16:37.000000000 +0200
+@@ -16,6 +16,10 @@
+ #include "out.h"
+ #include "pieces.h"
+ 
++#ifdef __FreeBSD__
++typedef uint64_t Elf32_Xword;
++#endif
++
+ /* Flags used to insert warnings in the generated source code.
+  */
+ #define	PW_MISALIGNED	0x0001	/* piece misaligned for original type */
+--- ./elftoc/outbase.h.orig	2011-05-22 20:46:29.000000000 +0200
++++ ./elftoc/outbase.h	2011-06-08 12:16:37.000000000 +0200
+@@ -7,6 +7,10 @@
+ #ifndef _outbase_h_
+ #define _outbase_h_
+ 
++#ifdef __FreeBSD__
++#define NT_AUXV     6
++#endif
++
+ /* Set the current output file. Call this before calling any output
+  * functions. (The FILE* argument is given as a void* so as to not
+  * include stdio.h here.)
diff --git a/dev-util/elfkickers/files/create-destdir-path.patch b/dev-util/elfkickers/files/create-destdir-path.patch
new file mode 100644
index 000000000000..d279db0ad606
--- /dev/null
+++ b/dev-util/elfkickers/files/create-destdir-path.patch
@@ -0,0 +1,14 @@
+--- Makefile.orig	2011-05-30 16:37:41.000000000 -0400
++++ Makefile	2011-05-30 16:38:30.000000000 -0400
+@@ -22,8 +22,9 @@
+ infect: bin/infect doc/infect.1
+ 
+ install: $(PROGRAMS:%=bin/%)
+-	cp bin/* $(prefix)/bin/.
+-	cp doc/* $(prefix)/share/man/man1/.
++	install -d $(prefix)/usr/bin $(prefix)/usr/share/man/man1
++	install bin/* $(prefix)/usr/bin
++	install -m 644 doc/* $(prefix)/usr/share/man/man1
+ 
+ clean:
+ 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch b/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch
new file mode 100644
index 000000000000..1f0c3e94fe9b
--- /dev/null
+++ b/dev-util/elfkickers/files/elfkickers-3.1-create-destdir-path.patch
@@ -0,0 +1,17 @@
+diff -Naur ELFkickers-3.1.orig/Makefile ELFkickers-3.1/Makefile
+--- ELFkickers-3.1.orig/Makefile	2015-07-23 13:25:30.000000000 -0400
++++ ELFkickers-3.1/Makefile	2016-11-16 17:17:08.237039268 -0500
+@@ -24,10 +24,9 @@
+ infect: bin/infect doc/infect.1
+ 
+ install: $(PROGRAMS)
+-	mkdir -p $(prefix)/bin
+-	cp bin/* $(prefix)/bin/.
+-	mkdir -p $(prefix)/share/man/man1
+-	cp doc/* $(prefix)/share/man/man1/.
++	install -d $(prefix)/usr/bin $(prefix)/usr/share/man/man1
++	install bin/* $(prefix)/usr/bin
++	install -m 644 doc/* $(prefix)/usr/share/man/man1
+ 
+ clean:
+ 	for dir in elfrw $(PROGRAMS) ; do $(MAKE) -C$$dir clean ; done
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
new file mode 100644
index 000000000000..b285f3b2509c
--- /dev/null
+++ b/dev-util/elfkickers/files/elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,103 @@
+diff -Naur ELFkickers-3.1.orig/ebfc/Makefile ELFkickers-3.1/ebfc/Makefile
+--- ELFkickers-3.1.orig/ebfc/Makefile	2014-11-17 14:50:34.000000000 -0500
++++ ELFkickers-3.1/ebfc/Makefile	2016-11-16 17:13:53.297033908 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for ebfc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -Wno-missing-field-initializers
++CC ?= gcc
++CFLAGS += -Wno-missing-field-initializers
+ 
+ ebfc: ebfc.o brainfuck.o libelfparts.a
+ 
+diff -Naur ELFkickers-3.1.orig/elfls/Makefile ELFkickers-3.1/elfls/Makefile
+--- ELFkickers-3.1.orig/elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
++++ ELFkickers-3.1/elfls/Makefile	2016-11-16 17:12:48.885032137 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for elfls
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ elfls: elfls.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/elfrw/Makefile ELFkickers-3.1/elfrw/Makefile
+--- ELFkickers-3.1.orig/elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
++++ ELFkickers-3.1/elfrw/Makefile	2016-11-16 17:13:06.653032625 -0500
+@@ -1,7 +1,6 @@
+ #  Makefile for libelfrw.a
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -O3
++CC ?= gcc
+ 
+ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+diff -Naur ELFkickers-3.1.orig/elftoc/Makefile ELFkickers-3.1/elftoc/Makefile
+--- ELFkickers-3.1.orig/elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
++++ ELFkickers-3.1/elftoc/Makefile	2016-11-16 17:12:57.549032375 -0500
+@@ -1,8 +1,6 @@
+ #  Makefile for elftoc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \
+        pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o
+diff -Naur ELFkickers-3.1.orig/infect/Makefile ELFkickers-3.1/infect/Makefile
+--- ELFkickers-3.1.orig/infect/Makefile	2011-05-31 02:52:27.000000000 -0400
++++ ELFkickers-3.1/infect/Makefile	2016-11-16 17:12:30.617031634 -0500
+@@ -1,7 +1,6 @@
+ #  Makefile for infect
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ infect: infect.c
+ 
+diff -Naur ELFkickers-3.1.orig/objres/Makefile ELFkickers-3.1/objres/Makefile
+--- ELFkickers-3.1.orig/objres/Makefile	2016-11-14 16:46:24.000000000 -0500
++++ ELFkickers-3.1/objres/Makefile	2016-11-16 17:13:40.225033549 -0500
+@@ -1,8 +1,7 @@
+ #  Makefile for objres
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ objres: objres.o ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/rebind/Makefile ELFkickers-3.1/rebind/Makefile
+--- ELFkickers-3.1.orig/rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
++++ ELFkickers-3.1/rebind/Makefile	2016-11-16 17:13:17.373032920 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for rebind
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ rebind: rebind.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.1.orig/sstrip/Makefile ELFkickers-3.1/sstrip/Makefile
+--- ELFkickers-3.1.orig/sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
++++ ELFkickers-3.1/sstrip/Makefile	2016-11-16 17:14:05.949034256 -0500
+@@ -1,7 +1,7 @@
+ #  Makefile for sstrip
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ sstrip: sstrip.c ../elfrw/libelfrw.a
+ 
diff --git a/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
new file mode 100644
index 000000000000..6663ef8e79af
--- /dev/null
+++ b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,102 @@
+diff -Naur ELFkickers-3.0.orig//ebfc/Makefile ELFkickers-3.0/ebfc/Makefile
+--- ELFkickers-3.0.orig//ebfc/Makefile	2011-05-24 00:51:07.000000000 -0400
++++ ELFkickers-3.0/ebfc/Makefile	2011-06-02 23:05:30.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for ebfc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -Wno-missing-field-initializers
++CC ?= gcc
++CFLAGS += -Wno-missing-field-initializers
+ 
+ ebfc: ebfc.o brainfuck.o libelfparts.a
+ 
+diff -Naur ELFkickers-3.0.orig//elfls/Makefile ELFkickers-3.0/elfls/Makefile
+--- ELFkickers-3.0.orig//elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
++++ ELFkickers-3.0/elfls/Makefile	2011-06-02 23:04:15.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for elfls
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ elfls: elfls.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//elfrw/Makefile ELFkickers-3.0/elfrw/Makefile
+--- ELFkickers-3.0.orig//elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
++++ ELFkickers-3.0/elfrw/Makefile	2011-06-02 23:04:37.000000000 -0400
+@@ -1,7 +1,6 @@
+ #  Makefile for libelfrw.a
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -O3
++CC ?= gcc
+ 
+ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+diff -Naur ELFkickers-3.0.orig//elftoc/Makefile ELFkickers-3.0/elftoc/Makefile
+--- ELFkickers-3.0.orig//elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
++++ ELFkickers-3.0/elftoc/Makefile	2011-06-02 23:04:27.000000000 -0400
+@@ -1,8 +1,6 @@
+ #  Makefile for elftoc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \
+        pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o
+diff -Naur ELFkickers-3.0.orig//infect/Makefile ELFkickers-3.0/infect/Makefile
+--- ELFkickers-3.0.orig//infect/Makefile	2011-05-31 02:52:27.000000000 -0400
++++ ELFkickers-3.0/infect/Makefile	2011-06-02 23:04:01.000000000 -0400
+@@ -1,7 +1,6 @@
+ #  Makefile for infect
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ infect: infect.c
+ 
+diff -Naur ELFkickers-3.0.orig//objres/Makefile ELFkickers-3.0/objres/Makefile
+--- ELFkickers-3.0.orig//objres/Makefile	2011-05-23 23:29:39.000000000 -0400
++++ ELFkickers-3.0/objres/Makefile	2011-06-02 23:05:08.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for objres
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ objres: objres.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//rebind/Makefile ELFkickers-3.0/rebind/Makefile
+--- ELFkickers-3.0.orig//rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
++++ ELFkickers-3.0/rebind/Makefile	2011-06-02 23:04:57.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for rebind
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ rebind: rebind.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//sstrip/Makefile ELFkickers-3.0/sstrip/Makefile
+--- ELFkickers-3.0.orig//sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
++++ ELFkickers-3.0/sstrip/Makefile	2011-06-02 23:05:41.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for sstrip
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ sstrip: sstrip.c ../elfrw/libelfrw.a
+ 
diff --git a/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml
new file mode 100644
index 000000000000..6f812ad378ae
--- /dev/null
+++ b/dev-util/elfkickers/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
+	<longdescription>ELF kickers is a collection of programs that manipulate ELF files. The main purpose of these programs is to be illustrative and educational -- to help fellow programmers understand the ELF file format and something of how it works under the Linux platform.</longdescription>
+</pkgmetadata>