brotli: upgraded package to upstream
Upgraded app-arch/brotli to version 1.0.6 on amd64
Removed EAPI7 specific includes (eapi-ver7)
BUG=chromium:878728
TEST=sudo emerge brotli
CQ-DEPEND=CL:1272156
Change-Id: Ie1d2de3242601b6514fc0a8e1e809156da5b2e0e
Reviewed-on: https://chromium-review.googlesource.com/1238974
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 428ede2..6dfde12 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1 +1 @@
-DIST brotli-1.0.1.tar.gz 23731694 SHA256 6870f9c2c63ef58d7da36e5212a3e1358427572f6ac5a8b5a73a815cf3e0c4a6 SHA512 de6f787012243fdc5eafa559ffc765e1d69bf78cf337efdd743bb422706b5ae86b4966f07a8410165044b988b7ca2999065efc4693bda7111e53fe64917e24c0 WHIRLPOOL 58e8d87c1960e5a561cc2b9f3350f040772d976b64d53d04bfdf937f8e07d2f23452fd48d1dad48001fbecb8fe892f908eaf6b1f14e3b9c470f9dda4d1915c72
\ No newline at end of file
+DIST brotli-1.0.6.tar.gz 23827656 SHA256 ce94b7f48af5e8f444c3949ca93201c1b4bb40da633db084e900133ce87848db SHA512 b9847375471de3ae815ef4bb45a29653c343fad0a891a79d5132fcdee34c85caafd82289c8b413c3ef609049f2e8c4af9f9abd1736a2408ba44544c5fefc0010 WHIRLPOOL 18206ba453f3e560ef00a510a0ff5343c2c98949908b9530b304fe5a9e1e52025e3fcd635f61a728f94ceaf9fb59616b828dd314f8d13f486985411b5acb9a86
diff --git a/app-arch/brotli/brotli-1.0.1.ebuild b/app-arch/brotli/brotli-1.0.6.ebuild
similarity index 75%
rename from app-arch/brotli/brotli-1.0.1.ebuild
rename to app-arch/brotli/brotli-1.0.6.ebuild
index 725c65f..af36442 100644
--- a/app-arch/brotli/brotli-1.0.1.ebuild
+++ b/app-arch/brotli/brotli-1.0.6.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
DISTUTILS_OPTIONAL="1"
inherit cmake-utils distutils-r1
DESCRIPTION="Generic-purpose lossless compression algorithm"
HOMEPAGE="https://github.com/google/brotli"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0/${PV}"
-KEYWORDS="*"
RDEPEND="python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}"
@@ -25,8 +23,16 @@
DOCS=( README.md CONTRIBUTING.md )
+if [[ ${PV} == "9999" ]] ; then
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/google/${PN}.git"
+ inherit git-r3
+else
+ KEYWORDS="*"
+ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-no-rpath.patch
cmake-utils_src_prepare
use python && distutils-r1_src_prepare
}
diff --git a/app-arch/brotli/files/brotli-1.0.1-no-rpath.patch b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
similarity index 71%
rename from app-arch/brotli/files/brotli-1.0.1-no-rpath.patch
rename to app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
index 90ae089..779b5e6 100644
--- a/app-arch/brotli/files/brotli-1.0.1-no-rpath.patch
+++ b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
@@ -1,14 +1,5 @@
-From 2e473f5934708df899f0ce3d2cd27e85132dacc6 Mon Sep 17 00:00:00 2001
-From: Amin Hassani <ahassani@google.com>
-Date: Thu, 9 Nov 2017 12:00:27 -0800
-Subject: [PATCH] Do not set rpath on shared libs.
-
----
- CMakeLists.txt | 10 ----------
- 1 file changed, 10 deletions(-)
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcd0e96..9dd6eec 100644
+index ac55f6b3..2dc7232c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,16 +24,6 @@ mark_as_advanced(BROTLI_BUNDLED_MODE)
@@ -28,6 +19,3 @@
# Parse version information from common/version.h. Normally we would
# define these values here and write them out to configuration file(s)
# (i.e., config.h), but in this case we parse them from
---
-2.15.0.448.gf294e3d99a-goog
-
diff --git a/app-arch/brotli/metadata.xml b/app-arch/brotli/metadata.xml
index 0a0fddc..f2d6cea 100644
--- a/app-arch/brotli/metadata.xml
+++ b/app-arch/brotli/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>bicatali@gentoo.org</email>
- <name>Sébastien Fabbro</name>
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
</maintainer>
<longdescription>
Brotli is a generic-purpose lossless compression algorithm that
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.1 b/metadata/md5-cache/app-arch/brotli-1.0.1
deleted file mode 100644
index 1ef6b68..0000000
--- a/metadata/md5-cache/app-arch/brotli-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Generic-purpose lossless compression algorithm
-EAPI=5
-HOMEPAGE=https://github.com/google/brotli
-IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=*
-LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0/1.0.1
-SRC_URI=https://github.com/google/brotli/archive/v1.0.1.tar.gz -> brotli-1.0.1.tar.gz
-_eclasses_=cmake-utils 625ac0250848368bad285a1d1de242cf distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 9f6eda21d15d6a8f665d7996a4e0f4e3 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fffd1a7a7b08dba6e835bbd6e9dd9178
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.6 b/metadata/md5-cache/app-arch/brotli-1.0.6
new file mode 100644
index 0000000..519d1a2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/brotli-1.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Generic-purpose lossless compression algorithm
+EAPI=6
+HOMEPAGE=https://github.com/google/brotli
+IUSE=python test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=*
+LICENSE=MIT python? ( Apache-2.0 )
+RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0/1.0.6
+SRC_URI=https://github.com/google/brotli/archive/v1.0.6.tar.gz -> brotli-1.0.6.tar.gz
+_eclasses_=cmake-utils 625ac0250848368bad285a1d1de242cf distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 9f6eda21d15d6a8f665d7996a4e0f4e3 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=840185676f84c35282464723fec99003
