1 |
commit: fd6ece6eb963f42fa20676fd1b2da77a959f49f6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 17 08:39:09 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 17 08:39:09 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6ece6e |
7 |
|
8 |
dev-libs/libpcre2: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.63, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
dev-libs/libpcre2/Manifest | 1 - |
14 |
.../libpcre2/files/libpcre2-10.31-cygwin.patch | 16 ----- |
15 |
dev-libs/libpcre2/libpcre2-10.31.ebuild | 83 ---------------------- |
16 |
3 files changed, 100 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest |
19 |
index 7c4af4b5380..1928e83477a 100644 |
20 |
--- a/dev-libs/libpcre2/Manifest |
21 |
+++ b/dev-libs/libpcre2/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e |
24 |
-DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967 |
25 |
DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe |
26 |
DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f |
27 |
|
28 |
diff --git a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch |
29 |
deleted file mode 100644 |
30 |
index 3f3a33b366a..00000000000 |
31 |
--- a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch |
32 |
+++ /dev/null |
33 |
@@ -1,16 +0,0 @@ |
34 |
-https://bugs.exim.org/show_bug.cgi?id=2152#c14 |
35 |
-https://vcs.pcre.org/pcre2?view=revision&revision=939 |
36 |
- |
37 |
---- pcre2-10.31/src/pcre2grep.c |
38 |
-+++ pcre2-10.31/src/pcre2grep.c |
39 |
-@@ -64,8 +64,8 @@ |
40 |
- #endif |
41 |
- |
42 |
- /* Some cmake's define it still */ |
43 |
--#if defined(__CYGWIN__) && !defined(WIN32) |
44 |
--#define WIN32 |
45 |
-+#if defined(__CYGWIN__) && defined(WIN32) |
46 |
-+#undef WIN32 |
47 |
- #endif |
48 |
- |
49 |
- #ifdef WIN32 |
50 |
|
51 |
diff --git a/dev-libs/libpcre2/libpcre2-10.31.ebuild b/dev-libs/libpcre2/libpcre2-10.31.ebuild |
52 |
deleted file mode 100644 |
53 |
index 45e150f0b69..00000000000 |
54 |
--- a/dev-libs/libpcre2/libpcre2-10.31.ebuild |
55 |
+++ /dev/null |
56 |
@@ -1,83 +0,0 @@ |
57 |
-# Copyright 1999-2018 Gentoo Foundation |
58 |
-# Distributed under the terms of the GNU General Public License v2 |
59 |
- |
60 |
-EAPI=6 |
61 |
- |
62 |
-inherit flag-o-matic libtool ltprune multilib-minimal toolchain-funcs |
63 |
- |
64 |
-DESCRIPTION="Perl-compatible regular expression library" |
65 |
-HOMEPAGE="http://www.pcre.org/" |
66 |
-MY_P="pcre2-${PV/_rc/-RC}" |
67 |
-if [[ ${PV} != *_rc* ]] ; then |
68 |
- # Only the final releases are available here. |
69 |
- SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 |
70 |
- ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2" |
71 |
-else |
72 |
- SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2" |
73 |
-fi |
74 |
- |
75 |
-LICENSE="BSD" |
76 |
-SLOT="0" |
77 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
78 |
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" |
79 |
-REQUIRED_USE="?? ( libedit readline )" |
80 |
- |
81 |
-RDEPEND="bzip2? ( app-arch/bzip2 ) |
82 |
- zlib? ( sys-libs/zlib ) |
83 |
- libedit? ( dev-libs/libedit ) |
84 |
- readline? ( sys-libs/readline:0= )" |
85 |
-DEPEND="${RDEPEND} |
86 |
- virtual/pkgconfig |
87 |
- userland_GNU? ( >=sys-apps/findutils-4.4.0 )" |
88 |
- |
89 |
-PATCHES=( |
90 |
- "${FILESDIR}"/${P}-cygwin.patch #633612 |
91 |
-) |
92 |
- |
93 |
-S="${WORKDIR}/${MY_P}" |
94 |
- |
95 |
-MULTILIB_CHOST_TOOLS=( |
96 |
- /usr/bin/pcre2-config |
97 |
-) |
98 |
- |
99 |
-src_prepare() { |
100 |
- default |
101 |
- |
102 |
- elibtoolize |
103 |
-} |
104 |
- |
105 |
-multilib_src_configure() { |
106 |
- local myeconfargs=( |
107 |
- --enable-pcre2-8 |
108 |
- --enable-shared |
109 |
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
110 |
- --with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT) |
111 |
- $(multilib_native_use_enable bzip2 pcre2grep-libbz2) |
112 |
- $(multilib_native_use_enable libedit pcre2test-libedit) |
113 |
- $(multilib_native_use_enable readline pcre2test-libreadline) |
114 |
- $(multilib_native_use_enable zlib pcre2grep-libz) |
115 |
- $(use_enable jit) |
116 |
- $(use_enable jit pcre2grep-jit) |
117 |
- $(use_enable pcre16 pcre2-16) |
118 |
- $(use_enable pcre32 pcre2-32) |
119 |
- $(use_enable static-libs static) |
120 |
- $(use_enable unicode) |
121 |
- ) |
122 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
123 |
-} |
124 |
- |
125 |
-multilib_src_compile() { |
126 |
- emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") |
127 |
-} |
128 |
- |
129 |
-multilib_src_install() { |
130 |
- emake \ |
131 |
- DESTDIR="${D}" \ |
132 |
- $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ |
133 |
- install |
134 |
- multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix |
135 |
-} |
136 |
- |
137 |
-multilib_src_install_all() { |
138 |
- prune_libtool_files |
139 |
-} |