gentoo resync : 28.12.2017

3 files changed, 58 insertions, 74 deletions

diff --git a/dev-libs/libmelf/Manifest b/dev-libs/libmelf/Manifest
index dcac07954f61..8a18e046e0b8 100644
--- a/dev-libs/libmelf/Manifest
+++ b/dev-libs/libmelf/Manifest
@@ -1,5 +1,5 @@
-AUX libmelf-0.4.0-r1-gcc-makefile-cleanup.patch 3132 BLAKE2B 7c38137d36ff4d0d26b7b4ac376a38229a75759e99ea6d41ada8c82245d786a42a4fe7dee44873eb9a379f0dc36f8b3c5669eaa6f301f9aad2d1f9f1aa858a79 SHA512 c68e718e9e49c636be58028a03d53d81998e5cb9b8940c2c431f93acc77019be0a58486c0f7663241bd5d281f7638897a5baeca953e504c885c8dd6aea0c2fe4
+AUX libmelf-0.4.0-r1-gcc-makefile-cleanup.patch 1819 BLAKE2B bc8c9e09d56be3daca289cdfe4d2c740261f283453307f154f1c973a8589523beda7e33c95f0c6401b99d2574e23d10e1d13066bd6a57952554d463c006ee3e7 SHA512 7fe79182f35906104bd9f7bad3590e0fdfa4fbe93f0d0548063169b7385a962b36eda39e435b8fde31a7ed0bdae6300989c869dc2bf32d817597190582c72584
 AUX libmelf-0.4.1-unfinal-release.patch 5246 BLAKE2B 67cf2513222d11edcb03afd7210f62a1a8b7510c1f986f0499785a2bb55e929c2a85d21624d9878bd4240ea7b5ddbf7e277a42e4dacacb4d0ac9cd5d704d5faf SHA512 4d828c626e7b9f9399bd0bfe6428970995d2b386cb60ebf80ba68be67dae23a1671ed4cf766675e17d72d5d4e4b9265ae99dd40c022c20cf233b237f88ab94ec
 DIST libmelf-0.4.0.tar.gz 163173 BLAKE2B 64627de126d941bc8fa05a0e6a44158c35483e85de0294837e0537e0923f49ff8c7d406f22094480a3cf6505227b80e3081597a161219aedf48064f43091b7d6 SHA512 c702c72026f494b0d3ee665d6734cbd302c002c904721c0b58f71850f20c3249e5cabca4fcc5ecfe0a4e114df2e31c6faed84634ad593ff61de2e5acffd70227
-EBUILD libmelf-0.4.0-r1.ebuild 938 BLAKE2B ab6fb9efc54238de466f35f027fb1e20e39e3e15a9d797b946b8a3be69e8cfa73fef28b00e305b682b48fba92ada247e2b726582059fee41c9926e9825e52b7b SHA512 200583eeca05cabb3b1b58390dffaeb8389e8938f908848ca17e84dbc8fbd56460e6ce7d32639cc50bc833dd21001b40634a3459999a031070967cfc0f7421fc
+EBUILD libmelf-0.4.0-r1.ebuild 1136 BLAKE2B 8841bbbed818c61813f7c7eb916c2b7f8272a3f8890c31b313b9d94f5509a0c368779ae5a4f2f2331445fcbccee8539ef19b871c5befd9e006474c32a372e08e SHA512 26eb64c6316d61297932c01b42954f315cedcebfd3ca726e951810c6e39b0caba49cc256b3e052a8071a8559a99a45b753e782d1f632318c7a2515f2d000dd64
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-libs/libmelf/files/libmelf-0.4.0-r1-gcc-makefile-cleanup.patch b/dev-libs/libmelf/files/libmelf-0.4.0-r1-gcc-makefile-cleanup.patch
index 384818f57630..10bda2a476a8 100644
--- a/dev-libs/libmelf/files/libmelf-0.4.0-r1-gcc-makefile-cleanup.patch
+++ b/dev-libs/libmelf/files/libmelf-0.4.0-r1-gcc-makefile-cleanup.patch
@@ -1,11 +1,9 @@
-diff -Nuar --exclude '*~' libmelf-0.4.0.orig/example/Makefile.in libmelf-0.4.0/example/Makefile.in
---- libmelf-0.4.0.orig/example/Makefile.in	2003-03-24 00:48:22.000000000 -0800
-+++ libmelf-0.4.0/example/Makefile.in	2010-05-31 19:56:43.546947560 -0700
-@@ -1,7 +1,13 @@
- cc=@CC@
+--- a/example/Makefile.in
++++ b/example/Makefile.in
+@@ -1,7 +1,11 @@
+-cc=@CC@
  DEFINES=@DEFINES@
-+OPTFLAGS=-Wall -O3
-+CFLAGS=${DEFINES} ${OPTFLAGS} -I..
++CFLAGS=$(DEFINES) $(OPTFLAGS) -I..
 +BINS = sign test new
  
 -all:
@@ -13,25 +11,27 @@ diff -Nuar --exclude '*~' libmelf-0.4.0.orig/example/Makefile.in libmelf-0.4.0/e
 -	${CC} ${DEFINES} -I.. -Wall -O3 test.c -o test ../libmelf.a
 -	${CC} ${DEFINES} -I.. -Wall -O3 new.c -o new ../libmelf.a
 +%: %.c
-+	${CC} $(CFLAGS) $^ -o $@ -L.. -lmelf
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -L.. -lmelf
 +
 +all: $(BINS)
 +
 +clean:
 +	-rm -f $(BINS)
-diff -Nuar --exclude '*~' libmelf-0.4.0.orig/Makefile.in libmelf-0.4.0/Makefile.in
---- libmelf-0.4.0.orig/Makefile.in	2003-11-07 22:09:10.000000000 -0800
-+++ libmelf-0.4.0/Makefile.in	2010-05-31 19:58:12.172822406 -0700
-@@ -6,35 +6,43 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,25 +1,23 @@
+-CC=gcc
+-
+ STATICBIN=libmelf.a
+ DYNAMICBIN=libmelf.so
+ DEBUG=
  DEFINES=@DEFINES@ -DMELF_COMP
  INCLUDES=-I.
  PREFIX=@PREFIX@
 -CFLAGS=${DEBUG} ${DEFINES} ${INCLUDES} -Wall -O3 -fPIC
 -LFLAGS=${DEBUG} ${DEFINES} ${INCLUDES} -Wall -O3 -o
-+OPTFLAGS=-Wall -O3
 +CFLAGS=${DEBUG} ${DEFINES} ${INCLUDES} ${OPTFLAGS}
 +LFLAGS=${DEBUG} ${DEFINES} ${INCLUDES} ${OPTFLAGS} -o
-+LIBDIR=lib
  LIBS=
  OBJS=melf.o melf_dynamic.o melf_elf.o melf_list.o melf_note.o melf_program.o melf_reloc.o \
  	  melf_res.o melf_section.o melf_string.o melf_symbol.o melf_symbolTable.o
@@ -42,64 +42,32 @@ diff -Nuar --exclude '*~' libmelf-0.4.0.orig/Makefile.in libmelf-0.4.0/Makefile.
 -	cd example && make
 -	cd tools && make
 +all: ${STATICBIN} ${DYNAMICBIN}
-+	cd example && $(MAKE)
-+	cd tools && $(MAKE)
- 
- *.c.${O}:
- 	${CC} ${CFLAGS} $*.c
++	$(MAKE) -C example
++	$(MAKE) -C tools
  
+-*.c.${O}:
+-	${CC} ${CFLAGS} $*.c
 +${STATICBIN}: ${OBJS}
-+	ar rc ${STATICBIN} ${OBJS} && ranlib ${STATICBIN}
++	$(AR) rc ${STATICBIN} ${OBJS} && $(RANLIB) ${STATICBIN}
 +${DYNAMICBIN}: ${OBJS}
 +	@SHAREDEXEC@
-+
+ 
  clean:
  	rm -f *.o ${STATICBIN} ${DYNAMICBIN} example/test example/new example/sign tools/elfres config.*
--	cd tools && make clean
-+	cd tools && $(MAKE) clean
- 
--distclean:
--	make clean
-+distclean: clean
- 	rm -f Makefile example/Makefile stdelf.h
--	cd tools && make distclean
-+	cd tools && $(MAKE) distclean
- 
- install: ${OBJS} ${STATICBIN}
--	cp libmelf.a ${PREFIX}/lib
--	cp libmelf.so ${PREFIX}/lib
-+	cp ${STATICBIN} ${PREFIX}/$(LIBDIR)
-+	cp ${DYNAMICBIN} ${PREFIX}/$(LIBDIR)
- 	cp melf.h ${PREFIX}/include
- 	cp stdelf.h ${PREFIX}/include
- 
- uninstall:
--	rm -f ${PREFIX}/lib/libmelf.a ${PREFIX}/lib/libmelf.so ${PREFIX}/include/melf.h ${PREFIX}/include/stdelf.h
-+	-rm -f \
-+		${PREFIX}/$(LIBDIR)/${STATICBIN} \
-+		${PREFIX}/$(LIBDIR)/${DYNAMICBIN} \
-+		${PREFIX}/include/melf.h \
-+		${PREFIX}/include/stdelf.h
-diff -Nuar --exclude '*~' libmelf-0.4.0.orig/tools/Makefile.in libmelf-0.4.0/tools/Makefile.in
---- libmelf-0.4.0.orig/tools/Makefile.in	2003-09-17 01:03:49.000000000 -0700
-+++ libmelf-0.4.0/tools/Makefile.in	2010-05-31 19:57:55.126198024 -0700
-@@ -1,11 +1,15 @@
- cc=@CC@
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
+@@ -1,8 +1,11 @@
+-cc=@CC@
  DEFINES=@DEFINES@
-+CFLAGS=${DEFINES} ${OPTFLAGS} -I..
++CFLAGS=$(DEFINES) $(OPTFLAGS) -I..
 +BINS=elfres
  
 -all:
 -	${CC} ${DEFINES} -I.. -Wall -O3 elfres.c -o elfres ../libmelf.a
 +%: %.c
-+	${CC} $(CFLAGS) $^ -o $@ -L.. -lmelf
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -L.. -lmelf
 +
 +all: $(BINS)
  
  clean:
--	rm -f elfres
-+	-rm -f $(BINS)
- 
- distclean:	
--	rm -f elfres Makefile
-+	-rm -f $(BINS) Makefile
+ 	rm -f elfres
diff --git a/dev-libs/libmelf/libmelf-0.4.0-r1.ebuild b/dev-libs/libmelf/libmelf-0.4.0-r1.ebuild
index ecc5ecc76d3a..be54175c6c62 100644
--- a/dev-libs/libmelf/libmelf-0.4.0-r1.ebuild
+++ b/dev-libs/libmelf/libmelf-0.4.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
-inherit eutils flag-o-matic toolchain-funcs
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="libmelf is a library interface for manipulating ELF object files"
 HOMEPAGE="http://www.hick.org/code/skape/libmelf/"
@@ -11,30 +12,45 @@ SRC_URI="http://www.hick.org/code/skape/${PN}/${P}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="static-libs"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_prepare() {
+PATCHES=(
 	# This patch was gained from the elfsign-0.2.2 release
-	epatch "${FILESDIR}"/${PN}-0.4.1-unfinal-release.patch
+	"${FILESDIR}"/${PN}-0.4.1-unfinal-release.patch
 	# Cleanup stuff
-	epatch "${FILESDIR}"/${PN}-0.4.0-r1-gcc-makefile-cleanup.patch
+	"${FILESDIR}"/${PN}-0.4.0-r1-gcc-makefile-cleanup.patch
+)
+
+src_prepare() {
+	default
+
+	# * QA Notice: The following shared libraries lack a SONAME
+	# * /usr/lib64/libmelf.so
+	sed 's/\(-shared -fPIC\)/\1 -Wl,-soname,libmelf.so/' -i configure || die
 }
 
-src_compile() {
+src_configure() {
+	tc-export CC AR RANLIB
 	append-flags -fPIC
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
+	default
+}
+
+src_compile() {
+	emake OPTFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	into /usr
 	dobin tools/elfres
-	dolib.a libmelf.a
+
 	dolib.so libmelf.so
+	use static-libs && dolib.a libmelf.a
+
 	insinto /usr/include
 	doins melf.h stdelf.h
-	dodoc ChangeLog README
-	dohtml -r docs/html
+
+	HTML_DOCS=( docs/html/. )
+	einstalldocs
 }