gentoo resync : 14.07.2018

5 files changed, 104 insertions, 0 deletions

diff --git a/dev-util/bdelta/Manifest b/dev-util/bdelta/Manifest
new file mode 100644
index 000000000000..921465903c78
--- /dev/null
+++ b/dev-util/bdelta/Manifest
@@ -0,0 +1,5 @@
+AUX bdelta-0.3.1-gcc-6.patch 876 BLAKE2B 9530a66a10a72d5553b3c9013d4bab31df5a5764d5b6c8e963eb871bb81985e2242f8ceab7529b106fbab0e6edb7b8cea6d63551186684d062a9a6e952ff1082 SHA512 d6b152bdfff022dc7edb0f234d1cece02518335a22b366a633e2288ac8bacd0a8b435935da4640b9888418aaf6ccadc937607b32ff8368034eb9426872279714
+AUX bdelta-0.3.1-soname.patch 722 BLAKE2B c729dd83f5d9243b0f6591abcb370b59a8e4d5310176de39f48bf5f03c6edc1f94a8dd5081cfdbb4eecbb946bac3ba42705c449826903fd0a9a8e5cbd16d7e53 SHA512 2b70edefae1fe811e905b74a4ddbdedd0d51889b888f7d26c65b428634dd89e189c9a25ccb90cd74cd0ba2d2069f6fb4be9980db14d6799735c352b971e86e0c
+DIST bdelta-0.3.1.tar.gz 14476 BLAKE2B 6086b692551c5dd5e6868b064277a4d79d6ba2200a260d4ce2f13debcc62652cbb448b1e56f3244750d50cf450dcc9da60d0c4ca46d5b5c12d887d3662eaca5a SHA512 914e5c38297a273c446cddc17fc4cf312b4f54e6fe332e4ef0474104af559a6dca327cfb069f2d224b7cf63b8c81ae1cc4b384371b8fcc8c01cedc199ee871be
+EBUILD bdelta-0.3.1-r1.ebuild 957 BLAKE2B b4914b70de9b3c9b29aa9bd5036f44a1fb73c73baa3791872e3ccd5a257d04bc593028ad8fdcb91bf16dce49191267723236d14ddb691eac270ebfc32b018d33 SHA512 1226e66278741c8b31eeb61fd2a5ff07d200701b27da7b61ecb9517ddfd17162df5e4ed9af3f475975e17f08f0adadeba40732caa422b65c151bd6abf521ee6b
+MISC metadata.xml 475 BLAKE2B 4c6bd1ac719098de30df8d1cf7bccf6a7d5ed3506120082978c612e41cd322c7dcdc1859928bcc4660a01185b06d76e22984e4e47db97ff32561cb611563920f SHA512 e1476972d1d04e3ee8b5cf5fccefe7df50c8fb816594b9405ea9a4bd37a9837be03385ca57adda55bf8a3ad8853b7eeee65b7b84fd857a5c1a08a95ddcb24f47
diff --git a/dev-util/bdelta/bdelta-0.3.1-r1.ebuild b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..9bbc378a96af
--- /dev/null
+++ b/dev-util/bdelta/bdelta-0.3.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jjwhitney/BDelta.git"
+	UNPACKER_ECLASS="git-2"
+	LIVE_EBUILD=yes
+else
+	UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit toolchain-funcs ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+	SRC_URI="https://github.com/jjwhitney/BDelta/tarball/v${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Binary Delta - Efficient difference algorithm and format"
+HOMEPAGE="https://github.com/jjwhitney/BDelta"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-soname.patch
+	"${FILESDIR}"/${P}-gcc-6.patch
+)
+
+src_compile() {
+	emake -C src \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake -C src install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	dodoc README
+}
diff --git a/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch b/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch
new file mode 100644
index 000000000000..9c998de37c3e
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch
@@ -0,0 +1,18 @@
+diff --git a/src/libbdelta.cpp b/src/libbdelta.cpp
+index b11bb2b..d769b0d 100644
+--- a/src/libbdelta.cpp
++++ b/src/libbdelta.cpp
+@@ -117,7 +117,3 @@ unsigned match_backward(BDelta_Instance *b, unsigned p1, unsigned p2, unsigned b
+ // Iterator helper function
+-template <class T>
+-inline T prior(T i) {return --i;}
+-template <class T>
+-inline T next(T i) {return ++i;}
+-
++template <class T> inline T bdelta_next(T i) {return ++i;}
+ 
+@@ -423,3 +419,3 @@ void bdelta_pass(BDelta_Instance *b, unsigned blocksize, unsigned minMatchSize,
+ 				if (! maxHoleSize || (u1.num <= maxHoleSize && u2.num <= maxHoleSize))
+-					if (! (flags & BDELTA_SIDES_ORDERED) || (next(u1.ml) == u1.mr && next(u2.ml) == u2.mr))
++					if (! (flags & BDELTA_SIDES_ORDERED) || (bdelta_next(u1.ml) == u1.mr && bdelta_next(u2.ml) == u2.mr))
+ 						bdelta_pass_2(b, blocksize, minMatchSize, &u1, 1, &u2, 1);
diff --git a/dev-util/bdelta/files/bdelta-0.3.1-soname.patch b/dev-util/bdelta/files/bdelta-0.3.1-soname.patch
new file mode 100644
index 000000000000..360a16d7c0da
--- /dev/null
+++ b/dev-util/bdelta/files/bdelta-0.3.1-soname.patch
@@ -0,0 +1,21 @@
+diff --git a/src/Makefile b/src/Makefile
+index 65fb88d..3b4a261 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,6 +3,7 @@ PREFIX   ?= /usr
+ BINDIR   ?= $(PREFIX)/bin
+ LIBDIR   ?= ${PREFIX}/lib
+ CXXFLAGS += -O2
++DYLIB_LDFLAGS ?= -Wl,-soname,libbdelta.so
+ 
+ ifeq ($(shell uname -s),Darwin)
+ 	SHAREDLIB := libbdelta.dylib
+@@ -19,7 +20,7 @@ libbdelta.a: libbdelta.cpp compatibility.h checksum.h file.h
+ 	$(AR) rs $@ $<.o
+ 
+ libbdelta.so: libbdelta.cpp compatibility.h checksum.h file.h
+-	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $< -o $@
++	$(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $(DYLIB_LDFLAGS) $< -o $@
+ 
+ libbdelta.dylib: libbdelta.cpp compatibility.h checksum.h file.h
+ 	$(CXX) -dynamiclib $(CXXFLAGS) $< -o $@
diff --git a/dev-util/bdelta/metadata.xml b/dev-util/bdelta/metadata.xml
new file mode 100644
index 000000000000..85db5a5c5266
--- /dev/null
+++ b/dev-util/bdelta/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jjwhitney/BDelta</remote-id>
+  </upstream>
+</pkgmetadata>