| 1 |
commit: 747fdfc3170b5bbd2ddd0093c91c3770d14cb846 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 3 10:39:17 2018 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 3 10:40:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=747fdfc3 |
| 7 |
|
| 8 |
app-arch/brotli: remove 0.6.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-arch/brotli/Manifest | 1 - |
| 13 |
app-arch/brotli/brotli-0.6.0.ebuild | 61 ----------------------- |
| 14 |
app-arch/brotli/files/brotli-0.6.0-no-rpath.patch | 32 ------------ |
| 15 |
3 files changed, 94 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest |
| 18 |
index d83d5e4e658..8d9420c0611 100644 |
| 19 |
--- a/app-arch/brotli/Manifest |
| 20 |
+++ b/app-arch/brotli/Manifest |
| 21 |
@@ -1,2 +1 @@ |
| 22 |
-DIST brotli-0.6.0.tar.gz 19838761 BLAKE2B 0630e9afcb04ecfd7cc6ba8dcbbe10c5ff16d9a975e13f48bd9b519bcf006afdd672aed542768590e2c5481e808e4f49c520e8a0294ce15e72cb3810a576fdde SHA512 36caa277790efeb5bff0fdc090cdcf00fd9995c4e81a60ed31d36af2e13848ec1afe5d84e6926eebbee013525191e9404e112cb7fbede16097221c5bc3dfb5d5 |
| 23 |
DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9 |
| 24 |
|
| 25 |
diff --git a/app-arch/brotli/brotli-0.6.0.ebuild b/app-arch/brotli/brotli-0.6.0.ebuild |
| 26 |
deleted file mode 100644 |
| 27 |
index 91daf8320a8..00000000000 |
| 28 |
--- a/app-arch/brotli/brotli-0.6.0.ebuild |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,61 +0,0 @@ |
| 31 |
-# Copyright 1999-2017 Gentoo Foundation |
| 32 |
-# Distributed under the terms of the GNU General Public License v2 |
| 33 |
- |
| 34 |
-EAPI=6 |
| 35 |
- |
| 36 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) |
| 37 |
-DISTUTILS_OPTIONAL="1" |
| 38 |
- |
| 39 |
-inherit cmake-utils distutils-r1 |
| 40 |
- |
| 41 |
-DESCRIPTION="Generic-purpose lossless compression algorithm" |
| 42 |
-HOMEPAGE="https://github.com/google/brotli" |
| 43 |
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 44 |
- |
| 45 |
-SLOT="0/${PV}" |
| 46 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 47 |
- |
| 48 |
-RDEPEND="python? ( ${PYTHON_DEPS} )" |
| 49 |
-DEPEND="${RDEPEND}" |
| 50 |
- |
| 51 |
-IUSE="python test" |
| 52 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 53 |
- |
| 54 |
-LICENSE="MIT python? ( Apache-2.0 )" |
| 55 |
- |
| 56 |
-DOCS=( README.md CONTRIBUTING.md ) |
| 57 |
- |
| 58 |
-PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch ) |
| 59 |
- |
| 60 |
-src_prepare() { |
| 61 |
- cmake-utils_src_prepare |
| 62 |
- use python && distutils-r1_src_prepare |
| 63 |
-} |
| 64 |
- |
| 65 |
-src_configure() { |
| 66 |
- local mycmakeargs=( |
| 67 |
- -DBUILD_SHARED_LIBS=ON |
| 68 |
- -DBUILD_TESTING="$(usex test)" |
| 69 |
- ) |
| 70 |
- cmake-utils_src_configure |
| 71 |
- use python && distutils-r1_src_configure |
| 72 |
-} |
| 73 |
- |
| 74 |
-src_compile() { |
| 75 |
- cmake-utils_src_compile |
| 76 |
- use python && distutils-r1_src_compile |
| 77 |
-} |
| 78 |
- |
| 79 |
-python_test(){ |
| 80 |
- esetup.py test || die |
| 81 |
-} |
| 82 |
- |
| 83 |
-src_test() { |
| 84 |
- cmake-utils_src_test |
| 85 |
- use python && distutils-r1_src_test |
| 86 |
-} |
| 87 |
- |
| 88 |
-src_install() { |
| 89 |
- cmake-utils_src_install |
| 90 |
- use python && distutils-r1_src_install |
| 91 |
-} |
| 92 |
|
| 93 |
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 |
| 94 |
deleted file mode 100644 |
| 95 |
index 28e70d7acfe..00000000000 |
| 96 |
--- a/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch |
| 97 |
+++ /dev/null |
| 98 |
@@ -1,32 +0,0 @@ |
| 99 |
-From: Tomasz Buchert <tomasz@××××××.org> |
| 100 |
-Date: Sat, 24 Jun 2017 14:40:16 +0200 |
| 101 |
-Subject: Do not set rpath on shared libs. |
| 102 |
- |
| 103 |
---- |
| 104 |
- CMakeLists.txt | 13 ------------- |
| 105 |
- 1 file changed, 13 deletions(-) |
| 106 |
- |
| 107 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 108 |
-index ca612d1..bf70d69 100644 |
| 109 |
---- a/CMakeLists.txt |
| 110 |
-+++ b/CMakeLists.txt |
| 111 |
-@@ -27,19 +27,6 @@ CMAKE_DEPENDENT_OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON "NOT BROTLI |
| 112 |
- |
| 113 |
- include(GNUInstallDirs) |
| 114 |
- |
| 115 |
--# When building shared libraries it is important to set the correct rpath. |
| 116 |
--# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH |
| 117 |
--if (BUILD_SHARED_LIBS) |
| 118 |
-- add_definitions(-DBROTLI_SHARED_COMPILATION) |
| 119 |
-- set(CMAKE_SKIP_BUILD_RPATH FALSE) |
| 120 |
-- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) |
| 121 |
-- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) |
| 122 |
-- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir) |
| 123 |
-- if ("${isSystemDir}" STREQUAL "-1") |
| 124 |
-- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}") |
| 125 |
-- endif() |
| 126 |
--endif() |
| 127 |
-- |
| 128 |
- # Parse version information from common/version.h. Normally we would |
| 129 |
- # define these values here and write them out to configuration file(s) |
| 130 |
- # (i.e., config.h), but in this case we parse them from |
Archives