1 |
commit: 738937f1dd8819af159f52452fcd6fd93468f7da |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 10 05:05:33 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 10 05:06:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738937f1 |
7 |
|
8 |
dev-libs/libpcre: Removed old |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
dev-libs/libpcre/Manifest | 1 - |
14 |
...bpcre-8.41-sljit_mips-label-statement-fix.patch | 15 ---- |
15 |
dev-libs/libpcre/libpcre-8.41-r1.ebuild | 100 --------------------- |
16 |
3 files changed, 116 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest |
19 |
index 78c057db7ae..79a8a6acc0b 100644 |
20 |
--- a/dev-libs/libpcre/Manifest |
21 |
+++ b/dev-libs/libpcre/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 |
24 |
DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d |
25 |
DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 |
26 |
|
27 |
diff --git a/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch b/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch |
28 |
deleted file mode 100644 |
29 |
index 0494ccc25eb..00000000000 |
30 |
--- a/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch |
31 |
+++ /dev/null |
32 |
@@ -1,15 +0,0 @@ |
33 |
-diff -Naurp pcre-8.41.orig/sljit/sljitNativeMIPS_common.c pcre-8.41/sljit/sljitNativeMIPS_common.c |
34 |
---- pcre-8.41.orig/sljit/sljitNativeMIPS_common.c 2017-05-07 11:32:25.000000000 -0400 |
35 |
-+++ pcre-8.41/sljit/sljitNativeMIPS_common.c 2017-07-29 17:50:24.508909742 -0400 |
36 |
-@@ -503,9 +503,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit |
37 |
- #ifdef SLJIT_IS_FPU_AVAILABLE |
38 |
- return SLJIT_IS_FPU_AVAILABLE; |
39 |
- #elif defined(__GNUC__) |
40 |
-+ { |
41 |
- sljit_sw fir; |
42 |
- asm ("cfc1 %0, $0" : "=r"(fir)); |
43 |
- return (fir >> 22) & 0x1; |
44 |
-+ } |
45 |
- #else |
46 |
- #error "FIR check is not implemented for this architecture" |
47 |
- #endif |
48 |
|
49 |
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild |
50 |
deleted file mode 100644 |
51 |
index d6f935a21d8..00000000000 |
52 |
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild |
53 |
+++ /dev/null |
54 |
@@ -1,100 +0,0 @@ |
55 |
-# Copyright 1999-2018 Gentoo Foundation |
56 |
-# Distributed under the terms of the GNU General Public License v2 |
57 |
- |
58 |
-EAPI=5 |
59 |
- |
60 |
-inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal |
61 |
- |
62 |
-DESCRIPTION="Perl-compatible regular expression library" |
63 |
-HOMEPAGE="http://www.pcre.org/" |
64 |
-MY_P="pcre-${PV/_rc/-RC}" |
65 |
-if [[ ${PV} != *_rc* ]] ; then |
66 |
- # Only the final releases are available here. |
67 |
- SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 |
68 |
- ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2" |
69 |
-else |
70 |
- SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2" |
71 |
-fi |
72 |
- |
73 |
-LICENSE="BSD" |
74 |
-SLOT="3" |
75 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
76 |
-IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" |
77 |
-REQUIRED_USE="readline? ( !libedit ) |
78 |
- libedit? ( !readline )" |
79 |
- |
80 |
-RDEPEND=" |
81 |
- bzip2? ( app-arch/bzip2 ) |
82 |
- zlib? ( sys-libs/zlib ) |
83 |
- libedit? ( dev-libs/libedit ) |
84 |
- readline? ( sys-libs/readline:0= ) |
85 |
-" |
86 |
-DEPEND=" |
87 |
- ${RDEPEND} |
88 |
- virtual/pkgconfig |
89 |
-" |
90 |
-RDEPEND=" |
91 |
- ${RDEPEND} |
92 |
-" |
93 |
- |
94 |
-S="${WORKDIR}/${MY_P}" |
95 |
- |
96 |
-MULTILIB_CHOST_TOOLS=( |
97 |
- /usr/bin/pcre-config |
98 |
-) |
99 |
- |
100 |
-PATCHES=( |
101 |
- "${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch |
102 |
- "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch |
103 |
-) |
104 |
- |
105 |
-src_prepare() { |
106 |
- epatch "${PATCHES[@]}" |
107 |
- sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die |
108 |
- elibtoolize |
109 |
-} |
110 |
- |
111 |
-multilib_src_configure() { |
112 |
- local myeconfargs=( |
113 |
- --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) |
114 |
- $(multilib_native_use_enable bzip2 pcregrep-libbz2) |
115 |
- $(use_enable cxx cpp) |
116 |
- $(use_enable jit) $(use_enable jit pcregrep-jit) |
117 |
- $(use_enable pcre16) |
118 |
- $(use_enable pcre32) |
119 |
- $(multilib_native_use_enable libedit pcretest-libedit) |
120 |
- $(multilib_native_use_enable readline pcretest-libreadline) |
121 |
- $(use_enable static-libs static) |
122 |
- $(use_enable unicode utf) $(use_enable unicode unicode-properties) |
123 |
- $(multilib_native_use_enable zlib pcregrep-libz) |
124 |
- --enable-pcre8 |
125 |
- --enable-shared |
126 |
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
127 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} |
128 |
- ) |
129 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
130 |
-} |
131 |
- |
132 |
-multilib_src_compile() { |
133 |
- emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") |
134 |
-} |
135 |
- |
136 |
-multilib_src_install() { |
137 |
- emake \ |
138 |
- DESTDIR="${D}" \ |
139 |
- $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ |
140 |
- install |
141 |
- gen_usr_ldscript -a pcre |
142 |
-} |
143 |
- |
144 |
-multilib_src_install_all() { |
145 |
- prune_libtool_files |
146 |
-} |
147 |
- |
148 |
-pkg_preinst() { |
149 |
- preserve_old_lib /$(get_libdir)/libpcre.so.0 |
150 |
-} |
151 |
- |
152 |
-pkg_postinst() { |
153 |
- preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 |
154 |
-} |