4 files changed, 107 insertions, 5 deletions
diff --git a/dev-util/patchelf/ChangeLog b/dev-util/patchelf/ChangeLog
index 4b4efc018c0f..c99ea00bfca2 100644
--- a/dev-util/patchelf/ChangeLog
+++ b/dev-util/patchelf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/patchelf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/patchelf/ChangeLog,v 1.5 2013/01/30 16:01:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/patchelf/ChangeLog,v 1.6 2013/02/04 15:59:31 jlec Exp $
+
+*patchelf-0.6-r1 (04 Feb 2013)
+
+  04 Feb 2013; Justin Lecher <jlec@gentoo.org> +patchelf-0.6-r1.ebuild,
+  +files/patchelf-0.6-test-build.patch:
+  Use system header, thanks fedora; respect CC, CFLAGS and LDFLAGS in test
+  binaries
 
   30 Jan 2013; Justin Lecher <jlec@gentoo.org> -patchelf-0.5.ebuild,
   metadata.xml:
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 134b8e32dc88..4b589dd1d57c 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX patchelf-0.6-test-build.patch 2247 SHA256 e8ce84d93a59f6cb43037defa6c24b275ed84bcea90e8ca5c2188aa85662a217 SHA512 9f4286bf34a2aed2a347f9cb1d0943c7205d8e552f008ea40abfa4e83d467d7226f18e1b8fcad494e78e7f9174ba8a35be73c79f80b6cdb9e1e5f6a21de6ceba WHIRLPOOL e8d14b1ba66b92f535ec2bc16182a07bc5fee7c64b9335871b0d475f99f6bee996796b45c7eb79d0dda84deffc298a6c631f81b7c03d61bb3a0c72065c01e78a
 DIST patchelf-0.6.tar.bz2 113860 SHA256 fc7e7fa95f282fc37a591a802629e0e1ed07bc2a8bf162228d9a69dd76127c01 SHA512 0b228c7058b1d32104648a77b37720fd942cd53942d542dccc5662f6012b8d4487d5d1512a68319e73fda05640330611c9ea41ed7d94a0d109056f471a79dfc6 WHIRLPOOL f29cd868f31a5884f04a74273bf6ef9da312cb0fe1c2707ef320098108d0d17fb33ada058d4f8169eef2dee79ef40fabaaba5490a7fae536fb6ffeb2793bebe4
+EBUILD patchelf-0.6-r1.ebuild 892 SHA256 09ed2f951d7d9d93d30e332a43223e9d2d43d58f2eb84135aac6d38f1b69e75f SHA512 60027cb29589162386365ad69cbeb54eefa27cb0ad3c79cda6ba53dc2ae1e780f948df8365056eff9fdbf53badf312b96b60ca28b48f95d0889a99f93de30c5d WHIRLPOOL dc74f91dbd5fb6c34d00d848a6067249ad8f40dc5163960b2ac29de97e4776daefe0dd65a9d073f9970c2fc59759dc75af5062d293490a6d4fcddb5d7a4dbef7
 EBUILD patchelf-0.6.ebuild 598 SHA256 d44ad5be2c7db2dfc75045472e9f754be1348072ceee311414ed03e028e4e2e5 SHA512 97fc4d2b15b27dad735055b8af3ef501ed67acc12c98d05bc2d512bfdeb6a3e994347a713538183e0c12d5f163d2d37966703e87c1a8d83606abc40fd6a7fd8a WHIRLPOOL 34e20c55e7abeae721639caf3a76f9186aa907de6998e69d0d546b2272432ac718764018ed473ceabfabaeb0d42b228782a10e031f545c662bf9b1974c5a8edc
-MISC ChangeLog 948 SHA256 df89deed8e1d9e8cf201dd7dad8860f723f71a5171e935a0846a71d3a458121a SHA512 8495e92c6e9f601a3419594f153d093ed7e70ea413299c9c0fa9059ebcacedda8958a75b7a189877c484a06bf7e268d7024edd547c458a3b0e8109c1f081850f WHIRLPOOL 719a3806eb74af4c9741722adfe7262f120e0452a4a2d397930aca471a79605160de37d7d7ee2a8bdd1747efaab1c07b7d376fac44028e405afb4fd1f3665f40
+MISC ChangeLog 1179 SHA256 cb5f5768f30ee36f46db07646c4c5441d71c8240b55b5b81702383b1b7af9410 SHA512 95f390ff9e7523536b18b4729edd39ef61d239069aadc2a8de8939854deb28579664cc6d37a8f035ea0292311e88bf0ef03b18a9cc931be8284dd26b8688f9a0 WHIRLPOOL 19f0f229fdf6f8a3d67e2b21ce6e69004b19321c03e7cf21031e63821a085d2583a12f84475e18c4c8b6ad9b43bd0c47bcc5f2e24a92689c397c9851e90e7090
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEJQ8EACgkQgAnW8HDreRZkDwCZAamuGiAso0EQPUxzBK6nL5+N
-9eQAoIR9gO53fIEg3BPzT+tm9pdUtRhs
-=6j8k
+iEYEAREIAAYFAlEP2uQACgkQgAnW8HDreRbcCwCdGlHgsJsdZtXXd7abygAsrF0M
+15kAn3Ug/AInSt4pU0RuB8uJBX4hOipC
+=Yut/
 -----END PGP SIGNATURE-----
diff --git a/dev-util/patchelf/files/patchelf-0.6-test-build.patch b/dev-util/patchelf/files/patchelf-0.6-test-build.patch
new file mode 100644
index 000000000000..0b4dc90b0082
--- /dev/null
+++ b/dev-util/patchelf/files/patchelf-0.6-test-build.patch
@@ -0,0 +1,55 @@
+ tests/Makefile.am | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 9d9b6bc..effde41 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -12,37 +12,37 @@ main_scoped_SOURCES =
+ 
+ 
+ main: main.o libfoo.so
+-	LD_LIBRARY_PATH=. gcc -Wl,--disable-new-dtags -o main main.o -L . -lfoo
++	$(CC) $(LDFLAGS) $(CFLAGS) -Wl,--disable-new-dtags -o main main.o -L . -lfoo
+ 
+ main-scoped: main.o libfoo-scoped.so
+-	LD_LIBRARY_PATH=. gcc -Wl,--enable-new-dtags -o main-scoped main.o -L . -lfoo-scoped
++	$(CC) $(LDFLAGS) $(CFLAGS) -Wl,--enable-new-dtags -o main-scoped main.o -L . -lfoo-scoped
+ 
+ main.o: main.c
+-	$(CC) -fpic -o main.o -c main.c
++	$(CC) $(CFLAGS) -fpic -o main.o -c main.c
+ 
+ libfoo.so: foo.o libbar.so
+-	NIX_DONT_SET_RPATH=1 $(CC) -Wl,--disable-new-dtags -shared -o libfoo.so foo.o -L . -lbar
++	NIX_DONT_SET_RPATH=1 $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--disable-new-dtags -shared -o libfoo.so foo.o -L . -lbar
+ 
+ libfoo-scoped.so: foo.o libbar-scoped.so
+-	NIX_DONT_SET_RPATH=1 $(CC) -Wl,--enable-new-dtags -shared -o libfoo-scoped.so foo.o -L . -lbar-scoped
++	NIX_DONT_SET_RPATH=1 $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--enable-new-dtags -shared -o libfoo-scoped.so foo.o -L . -lbar-scoped
+ 
+ foo.o: foo.c
+-	$(CC) -fpic -o foo.o -c foo.c
++	$(CC) $(CFLAGS) -fpic -o foo.o -c foo.c
+ 
+ libbar.so: bar.o
+-	NIX_DONT_SET_RPATH=1 $(CC) -Wl,--disable-new-dtags -shared -o libbar.so bar.o -L . -Wl,-rpath,`pwd`/no-such-path
++	NIX_DONT_SET_RPATH=1 $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--disable-new-dtags -shared -o libbar.so bar.o -L . -Wl,-rpath,`pwd`/no-such-path
+ 
+ libbar-scoped.so: bar.o
+-	NIX_DONT_SET_RPATH=1 $(CC) -Wl,--enable-new-dtags -shared -o libbar-scoped.so bar.o
++	NIX_DONT_SET_RPATH=1 $(CC) $(LDFLAGS) $(CFLAGS) -Wl,--enable-new-dtags -shared -o libbar-scoped.so bar.o
+ 
+ bar.o: bar.c
+-	$(CC) -fpic -o bar.o -c bar.c
++	$(CC) $(CFLAGS) -fpic -o bar.o -c bar.c
+ 
+ 
+ big_dynstr_SOURCES = big-dynstr.c
+ 
+ big-dynstr: big-dynstr.o libfoo.so
+-	LD_LIBRARY_PATH=. gcc -Wl,--disable-new-dtags -o big-dynstr big-dynstr.o -L . -lfoo
++	$(CC) $(LDFLAGS) $(CFLAGS) -Wl,--disable-new-dtags -o big-dynstr big-dynstr.o -L . -lfoo
+ 
+ big-dynstr.c: main.c
+ 	cat main.c > big-dynstr.c
diff --git a/dev-util/patchelf/patchelf-0.6-r1.ebuild b/dev-util/patchelf/patchelf-0.6-r1.ebuild
new file mode 100644
index 000000000000..09f376cb83ea
--- /dev/null
+++ b/dev-util/patchelf/patchelf-0.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/patchelf/patchelf-0.6-r1.ebuild,v 1.1 2013/02/04 15:59:31 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+NUMBER="1524660"
+
+DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables."
+HOMEPAGE="http://nixos.org/patchelf.html"
+SRC_URI="http://hydra.nixos.org/build/${NUMBER}/download/2/${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-test-build.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	rm src/elf.h || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
+	autotools-utils_src_configure
+}
+
+src_test() {
+	autotools-utils_src_test -j1
+}