Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uchardet/, app-i18n/uchardet/files/
Date: Sat, 27 Feb 2021 17:51:03
Message-Id: 1614447894.cb12e0cf8b9d460522cfd9c6f8369a3da4253ea0.asturm@gentoo
1 commit: cb12e0cf8b9d460522cfd9c6f8369a3da4253ea0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 27 17:44:54 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 17:44:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb12e0cf
7
8 app-i18n/uchardet: Drop 0.0.6-r2
9
10 Package-Manager: Portage-3.0.16, Repoman-3.0.2
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-i18n/uchardet/Manifest | 1 -
14 ...det-0.0.6-enforce-IEEE-float-precision-r1.patch | 59 ----------------------
15 app-i18n/uchardet/uchardet-0.0.6-r2.ebuild | 32 ------------
16 3 files changed, 92 deletions(-)
17
18 diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
19 index 6d0131253a3..1b6998d1aad 100644
20 --- a/app-i18n/uchardet/Manifest
21 +++ b/app-i18n/uchardet/Manifest
22 @@ -1,2 +1 @@
23 -DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
24 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
25
26 diff --git a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch b/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
27 deleted file mode 100644
28 index 2bc4977a5f0..00000000000
29 --- a/app-i18n/uchardet/files/uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch
30 +++ /dev/null
31 @@ -1,59 +0,0 @@
32 -Add configuration option to enable SSE2.
33 -Add -ffloat-store flag on x86 without SSE2.
34 -
35 -Gentoo bug: https://bugs.gentoo.org/631852
36 -Gentoo bug: https://bugs.gentoo.org/641716
37 -Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=101033
38 -
39 -This patch is an aggregation of the following upstream commits:
40 -5996bbd995aed5045cc22e4d1fab08c989377983
41 -77bf71ea365a19ac55c59cf10399b566a02d82c1
42 -939482ab2b5a6585bdd2e5251f3f2f113d64686f
43 -cd617d181de03a7a13c2020e6c73cd14585e24b6
44 -f136d434f0809e064ac195b5bc4e0b50484a474c
45 -
46 -diff --git a/CMakeLists.txt b/CMakeLists.txt
47 -index e9a699e..d140a24 100644
48 ---- a/CMakeLists.txt
49 -+++ b/CMakeLists.txt
50 -@@ -1,5 +1,6 @@
51 - ######## Project settings
52 - cmake_minimum_required(VERSION 2.8.5)
53 -+include(CheckCCompilerFlag)
54 - set (PACKAGE_NAME uchardet)
55 - project (${PACKAGE_NAME} CXX C)
56 - enable_testing()
57 -@@ -33,13 +34,31 @@ include(GNUInstallDirs)
58 -
59 - ######## Configuration
60 -
61 --option(BUILD_BINARY "Build executable" ON)
62 --option(BUILD_SHARED_LIBS "Build shared library and link executable to it" ON)
63 -+option(BUILD_BINARY "Build the CLI tool." ON)
64 -+option(BUILD_SHARED_LIBS "Build shared library and link executable to it." ON)
65 -+option(CHECK_SSE2 "Check and enable SSE2 extensions if supported. Disabling SSE on platforms which support it may decrease performances." ON)
66 -+set(TARGET_ARCHITECTURE "" CACHE STRING "Target CPU architecture. It is autodetected if not specified.")
67 -
68 - if (BUILD_SHARED_LIBS)
69 - option(BUILD_STATIC "Build static library" ON)
70 - endif (BUILD_SHARED_LIBS)
71 -
72 -+if (TARGET_ARCHITECTURE STREQUAL "")
73 -+ string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} TARGET_ARCHITECTURE)
74 -+endif (TARGET_ARCHITECTURE STREQUAL "")
75 -+
76 -+if (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
77 -+ CHECK_C_COMPILER_FLAG(-msse2 SUPPORTS_CFLAG_SSE2)
78 -+ CHECK_C_COMPILER_FLAG(-mfpmath=sse SUPPORTS_CFLAG_SSE_MATH)
79 -+ if (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
80 -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
81 -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
82 -+ else (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
83 -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffloat-store")
84 -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
85 -+ endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH)
86 -+endif (TARGET_ARCHITECTURE MATCHES ".*(x86)|(amd).*")
87 -+
88 - configure_file(
89 - uchardet.pc.in
90 - uchardet.pc
91
92 diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
93 deleted file mode 100644
94 index da7d6a5567b..00000000000
95 --- a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild
96 +++ /dev/null
97 @@ -1,32 +0,0 @@
98 -# Copyright 1999-2020 Gentoo Authors
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=6
102 -
103 -inherit cmake-utils
104 -
105 -DESCRIPTION="An encoding detector library"
106 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
107 -SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
108 -
109 -LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
110 -SLOT="0"
111 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
112 -IUSE="cpu_flags_x86_sse2 static-libs test"
113 -RESTRICT="!test? ( test )"
114 -
115 -PATCHES=( "${FILESDIR}/${P}-enforce-IEEE-float-precision-r1.patch" )
116 -
117 -src_prepare() {
118 - cmake-utils_src_prepare
119 - use test || cmake_comment_add_subdirectory test
120 -}
121 -
122 -src_configure() {
123 - local mycmakeargs=(
124 - -DTARGET_ARCHITECTURE="${ARCH}"
125 - -DBUILD_STATIC=$(usex static-libs)
126 - -DCHECK_SSE2=$(usex cpu_flags_x86_sse2)
127 - )
128 - cmake-utils_src_configure
129 -}