From cbb2a8611966e4d40a66e8e7c775d69f63c5531b Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alonbl@gentoo.org>
Date: Sat, 11 Jun 2016 14:31:38 +0300
Subject: [PATCH] app-arch/deltarpm: version bump

Take ownership.
Add system-zlib USE flag for these who concerned of using the embedded one.

Bug: 585546
Bug: 585536

Package-Manager: portage-2.2.28
---
 app-arch/deltarpm/Manifest            |  1 +
 app-arch/deltarpm/deltarpm-3.6.ebuild | 52 +++++++++++++++++++++++++++
 app-arch/deltarpm/metadata.xml        | 14 ++++++--
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 app-arch/deltarpm/deltarpm-3.6.ebuild

diff --git a/app-arch/deltarpm/Manifest b/app-arch/deltarpm/Manifest
index 989530b1e289..1e960b78e817 100644
--- a/app-arch/deltarpm/Manifest
+++ b/app-arch/deltarpm/Manifest
@@ -1 +1,2 @@
+DIST deltarpm-3.6.tar.bz2 500420 SHA256 fcc35db53e9913f12cdc013bdf922614ac8ef6fd5e7187e75203be8809d177be SHA512 0ef89d8d3e7c9d3d9da06542f293b434e42d95e18616aae1de95a66a77a5937142060ff405356869454cbcf8a7bb52f64c462641e52af0fad985105af07351d9 WHIRLPOOL 1ae76d6120aadf8dcdc978b2d7ac328080e10b60737557b91009da2cb9ab4fab497f5798cf49624dc914f0e92965cf567204d3114c631d9f8b703b99e0f5753d
 DIST deltarpm-git-20110223.tar.bz2 499623 SHA256 e4d6cad74cece0c6e48d5c49929e00a23ba116ff88a09245ad1d7ac84610c089 SHA512 ca6b75d9be5fc74206c57d6d13fe207f92e5dd295a75aee9690d171bcff877f6b04fe4f52e3f919e7ef0045087c39a63a773886d6c79977a16fe2791052a549c WHIRLPOOL c9a7f114f872bd142545edc902cf38a0b23c945eaa8dadda037a10f06811db99ea7c74f4f236dbaf59542c02409e3ffec814bdc930120d9aa47dfeface6d09aa
diff --git a/app-arch/deltarpm/deltarpm-3.6.ebuild b/app-arch/deltarpm/deltarpm-3.6.ebuild
new file mode 100644
index 000000000000..b60b86380341
--- /dev/null
+++ b/app-arch/deltarpm/deltarpm-3.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs python-single-r1
+
+DESCRIPTION="tools to create and apply deltarpms"
+HOMEPAGE="http://gitorious.org/deltarpm/deltarpm"
+SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${P}.tar.bz2/2cc2690bd1088cfc3238c25e59aaaec1/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python system-zlib"
+
+RDEPEND="sys-libs/zlib
+	app-arch/xz-utils
+	app-arch/bzip2
+	<app-arch/rpm-5
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	MAKE_EXTRA_FLAGS=(
+		-j1
+		prefix=/usr
+		mandir=/usr/share/man
+		PYTHONS=$(use python && echo python)
+	)
+	use system-zlib && MAKE_EXTRA_FLAGS+=(
+		zlibbundled=
+		zlibcppflags=
+		zlibldflags=-lz
+	)
+}
+
+src_compile() {
+	emake "${MAKE_EXTRA_FLAGS[@]}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" all $(use python && echo python)
+}
+
+src_install() {
+	emake "${MAKE_EXTRA_FLAGS[@]}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" DESTDIR="${ED}" install
+	python_optimize
+}
diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
index 950e220c5d1a..8845ef2eb6c2 100644
--- a/app-arch/deltarpm/metadata.xml
+++ b/app-arch/deltarpm/metadata.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>A tool to create and apply deltarpms.</longdescription>
+  <maintainer type="person">
+      <email>alonbl@gentoo.org</email>
+      <name>Alon Bar-Lev</name>
+  </maintainer>
+  <longdescription>A tool to create and apply deltarpms.</longdescription>
+  <use>
+    <flag name="system-zlib">
+      Use system
+      <pkg>sys-libs/zlib</pkg>.
+      Do not enable features of rsync friendly.
+    </flag>
+  </use>
 </pkgmetadata>
-- 
2.26.2