diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-03 19:17:21 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-03 19:17:21 +0000 |
commit | 81e4fbcb846ed1cabdad699c0029b166dd7273b7 (patch) | |
tree | 16f1236b7a386949c02a6e3c13d0fcd8298fa133 /app-arch/brotli | |
parent | a70f42c65202d88c203c40910fef8f96f333d1ee (diff) |
gentoo resync : 03.01.2018
Diffstat (limited to 'app-arch/brotli')
-rw-r--r-- | app-arch/brotli/Manifest | 9 | ||||
-rw-r--r-- | app-arch/brotli/brotli-1.0.2.ebuild | 67 | ||||
-rw-r--r-- | app-arch/brotli/brotli-9999.ebuild (renamed from app-arch/brotli/brotli-0.6.0.ebuild) | 13 | ||||
-rw-r--r-- | app-arch/brotli/files/brotli-0.6.0-no-rpath.patch | 32 | ||||
-rw-r--r-- | app-arch/brotli/files/brotli-1.0.2-no-rpath.patch | 21 | ||||
-rw-r--r-- | app-arch/brotli/metadata.xml | 4 |
6 files changed, 104 insertions, 42 deletions
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest index a975c5f5cc93..4984d4ee33d7 100644 --- a/app-arch/brotli/Manifest +++ b/app-arch/brotli/Manifest @@ -1,4 +1,5 @@ -AUX brotli-0.6.0-no-rpath.patch 1196 BLAKE2B 500af6b17e36f13b26d075b1fdc964e98e170ccfe4721ed274db56fd5229cc025a76b1cd1b333b87010c43036ec8404d35b5aeae9d1a17930b6535b0c2fd9c4d SHA512 8dddddc2d44bc9af9c4bbe277ece69ac22e6e77661d3982cc67b2a681ce01c03afb63e6796ae3a6c81cd6495bd39e64a0955c189dba1cc4bd43335ab3fc70123 -DIST brotli-0.6.0.tar.gz 19838761 BLAKE2B 0630e9afcb04ecfd7cc6ba8dcbbe10c5ff16d9a975e13f48bd9b519bcf006afdd672aed542768590e2c5481e808e4f49c520e8a0294ce15e72cb3810a576fdde SHA512 36caa277790efeb5bff0fdc090cdcf00fd9995c4e81a60ed31d36af2e13848ec1afe5d84e6926eebbee013525191e9404e112cb7fbede16097221c5bc3dfb5d5 -EBUILD brotli-0.6.0.ebuild 1259 BLAKE2B c2d7225ff86752110a1047e4c1449efe364dd9401185e90a8b6eb441bc25478b870eb4c09bba707036f3bb4e3339e1a591b2f567c2613742f745109e1883dd3b SHA512 e35ee2605f957fcca40cc892d097f1f80b361fb1b651c1e037fb3f50b6cb6a9ab294d3908066c9d6afdf5511244fed769faa8081a3b8023025059936d7612eda -MISC metadata.xml 690 BLAKE2B 889b23470c1fa169c073e0be3de4d9e64e5952b1fa118c030ffe1cf6504bba8ebf3db9ec40bacb95d8f31c9f306674b8107e161661a8fd71c5cbca5ef8c75e10 SHA512 8d98e22ce2ac4f69876e378773415f65ab8c5846e6d4952a6ce104b07343a5486abc9b88c49b54a3187bdedf880e0b2a3b6d06448fdd8c10f692718de6355dba +AUX brotli-1.0.2-no-rpath.patch 865 BLAKE2B 2c9720427c9751586b36580be629d3820757055dfb07b37f4933eacaf78973e14a7a861b0e7eb43a1980e889ee7c6988926fae9c31af90f962f502f17be416f6 SHA512 5da97caa16a910aebd4ce85e0805809dd97b6f36cd71636c72f284e6550bcff1a5f614a902d5363c35be2b46e8986dc74beb93f3fc6158a29f719e49d68a83c0 +DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9 +EBUILD brotli-1.0.2.ebuild 1383 BLAKE2B 23a1e700f140aaa030c30831b1218db65a436b53cdacc7bd804f9f0dba7955c0bb3483f0567cad0a2b44fb63abfdb0cad19da80aa1c759e356ae354fdb3d26dd SHA512 e86805ac0e5dc7101c82a88d727b50628bd1535d120eef6226dfef38c8a15ab16569d46b7242c38e04b525c01bacee55a2ade17187e1b1ed3194223b9be8e071 +EBUILD brotli-9999.ebuild 1336 BLAKE2B 920c9159f284dcbf0246e52d28048aad22c4803c0950a101093afeabf45bc7b109216ac8bd54676a27ec579cfa49e4ed791cb944c7a9d4ce9e376e85f22cdebc SHA512 2686041468cf95c7dafa9571c6c4997f5ddc9440593e35f6d8526af7df8a2cd249af9e5b0ddf04a272cc8f6497db5de77c628641d2867e47cce6b099e3b187af +MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc diff --git a/app-arch/brotli/brotli-1.0.2.ebuild b/app-arch/brotli/brotli-1.0.2.ebuild new file mode 100644 index 000000000000..b2991a9b89aa --- /dev/null +++ b/app-arch/brotli/brotli-1.0.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) +DISTUTILS_OPTIONAL="1" + +inherit cmake-utils distutils-r1 + +DESCRIPTION="Generic-purpose lossless compression algorithm" +HOMEPAGE="https://github.com/google/brotli" + +SLOT="0/${PV}" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" + +IUSE="python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +LICENSE="MIT python? ( Apache-2.0 )" + +DOCS=( README.md CONTRIBUTING.md ) + +if [[ ${PV} == "9999" ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/google/${PN}.git" + inherit git-r3 +else + PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch ) + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +src_prepare() { + cmake-utils_src_prepare + use python && distutils-r1_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DBUILD_TESTING="$(usex test)" + ) + cmake-utils_src_configure + use python && distutils-r1_src_configure +} + +src_compile() { + cmake-utils_src_compile + use python && distutils-r1_src_compile +} + +python_test(){ + esetup.py test || die +} + +src_test() { + cmake-utils_src_test + use python && distutils-r1_src_test +} + +src_install() { + cmake-utils_src_install + use python && distutils-r1_src_install +} diff --git a/app-arch/brotli/brotli-0.6.0.ebuild b/app-arch/brotli/brotli-9999.ebuild index 91daf8320a8c..5b876796ed3c 100644 --- a/app-arch/brotli/brotli-0.6.0.ebuild +++ b/app-arch/brotli/brotli-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,10 +10,8 @@ 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="~amd64 ~x86 ~amd64-linux ~x86-linux" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND}" @@ -25,7 +23,14 @@ LICENSE="MIT python? ( Apache-2.0 )" DOCS=( README.md CONTRIBUTING.md ) -PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch ) +if [[ ${PV} == "9999" ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/google/${PN}.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi src_prepare() { cmake-utils_src_prepare diff --git a/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch b/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch deleted file mode 100644 index 28e70d7acfe7..000000000000 --- a/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Tomasz Buchert <tomasz@debian.org> -Date: Sat, 24 Jun 2017 14:40:16 +0200 -Subject: Do not set rpath on shared libs. - ---- - CMakeLists.txt | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ca612d1..bf70d69 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,19 +27,6 @@ CMAKE_DEPENDENT_OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON "NOT BROTLI - - include(GNUInstallDirs) - --# When building shared libraries it is important to set the correct rpath. --# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH --if (BUILD_SHARED_LIBS) -- add_definitions(-DBROTLI_SHARED_COMPILATION) -- set(CMAKE_SKIP_BUILD_RPATH FALSE) -- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir) -- if ("${isSystemDir}" STREQUAL "-1") -- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}") -- endif() --endif() -- - # 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 diff --git a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch new file mode 100644 index 000000000000..779b5e66bd98 --- /dev/null +++ b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ac55f6b3..2dc7232c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,16 +24,6 @@ mark_as_advanced(BROTLI_BUNDLED_MODE) + + include(GNUInstallDirs) + +-# When building shared libraries it is important to set the correct rpath. +-# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH +-set(CMAKE_SKIP_BUILD_RPATH FALSE) +-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir) +-if ("${isSystemDir}" STREQUAL "-1") +- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}") +-endif() +- + # 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 diff --git a/app-arch/brotli/metadata.xml b/app-arch/brotli/metadata.xml index 0a0fddcd4ed6..f2d6ceadef4d 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 |