Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/, dev-libs/oniguruma/files/
Date: Wed, 13 Jun 2018 14:36:58
Message-Id: 1528900581.e9f9127443bd950b9ea3c3140f3dd0808eaf0691.floppym@gentoo
1 commit: e9f9127443bd950b9ea3c3140f3dd0808eaf0691
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Wed Jun 13 08:25:05 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 13 14:36:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9f91274
7
8 dev-libs/oniguruma: Delete old versions (<6.7.1).
9
10 dev-libs/oniguruma/Manifest | 2 --
11 .../oniguruma/files/oniguruma-6.6.1-build.patch | 25 -------------
12 dev-libs/oniguruma/oniguruma-6.6.1.ebuild | 42 ----------------------
13 dev-libs/oniguruma/oniguruma-6.7.0.ebuild | 33 -----------------
14 4 files changed, 102 deletions(-)
15
16 diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
17 index f1f35cc3702..b3814ed7f84 100644
18 --- a/dev-libs/oniguruma/Manifest
19 +++ b/dev-libs/oniguruma/Manifest
20 @@ -1,5 +1,3 @@
21 -DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc
22 -DIST onig-6.7.0.tar.gz 952950 BLAKE2B 7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844 SHA512 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30
23 DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
24 DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9044ac807444403ea0ca602aeaa7ab86f70b9835c2042a2b48a65531c355d1f32ba22294403dc5a3f3ce895 SHA512 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631
25 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
26
27 diff --git a/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch b/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch
28 deleted file mode 100644
29 index 452347c90ba..00000000000
30 --- a/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch
31 +++ /dev/null
32 @@ -1,25 +0,0 @@
33 -https://github.com/kkos/oniguruma/issues/68
34 -https://github.com/kkos/oniguruma/commit/1337755c2758a62057ef95f1cff1b9466f533301
35 -
36 ---- /sample/Makefile.am
37 -+++ /sample/Makefile.am
38 -@@ -4,7 +4,7 @@
39 - LDADD = $(lib_onig)
40 -
41 - AM_LDFLAGS = -L$(prefix)/lib
42 --AM_CPPFLAGS = -I../src -I$(includedir)
43 -+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
44 -
45 - TESTS = encode listcap names posix simple sql syntax user_property bug_fix
46 -
47 ---- /test/Makefile.am
48 -+++ /test/Makefile.am
49 -@@ -3,7 +3,7 @@
50 -
51 - AM_LDFLAGS = -L$(prefix)/lib
52 - AM_CFLAGS =
53 --AM_CPPFLAGS = -I../src -I$(includedir)
54 -+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
55 -
56 - TESTS = test_utf8 testc testp testcu
57 -
58
59 diff --git a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
60 deleted file mode 100644
61 index 40d5fd7170d..00000000000
62 --- a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
63 +++ /dev/null
64 @@ -1,42 +0,0 @@
65 -# Copyright 1999-2018 Gentoo Foundation
66 -# Distributed under the terms of the GNU General Public License v2
67 -
68 -EAPI="6"
69 -
70 -inherit autotools multilib-minimal
71 -
72 -MY_P="onig-${PV}"
73 -
74 -DESCRIPTION="Regular expression library for different character encodings"
75 -HOMEPAGE="https://github.com/kkos/oniguruma"
76 -SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
77 -
78 -LICENSE="BSD-2"
79 -SLOT="0/4"
80 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
81 -IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
82 -
83 -S="${WORKDIR}/${MY_P}"
84 -
85 -PATCHES=(
86 - "${FILESDIR}/${P}-build.patch"
87 -)
88 -
89 -DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
90 -
91 -src_prepare() {
92 - default
93 - eautoreconf
94 -}
95 -
96 -multilib_src_configure() {
97 - ECONF_SOURCE="${S}" econf \
98 - $(use_enable combination-explosion-check) \
99 - $(use_enable crnl-as-line-terminator) \
100 - $(use_enable static-libs static)
101 -}
102 -
103 -multilib_src_install_all() {
104 - einstalldocs
105 - find "${D}" -name "*.la" -delete || die
106 -}
107
108 diff --git a/dev-libs/oniguruma/oniguruma-6.7.0.ebuild b/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
109 deleted file mode 100644
110 index d040e1b6cb1..00000000000
111 --- a/dev-libs/oniguruma/oniguruma-6.7.0.ebuild
112 +++ /dev/null
113 @@ -1,33 +0,0 @@
114 -# Copyright 1999-2018 Gentoo Foundation
115 -# Distributed under the terms of the GNU General Public License v2
116 -
117 -EAPI="6"
118 -
119 -inherit multilib-minimal
120 -
121 -MY_P="onig-${PV}"
122 -
123 -DESCRIPTION="Regular expression library for different character encodings"
124 -HOMEPAGE="https://github.com/kkos/oniguruma"
125 -SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
126 -
127 -LICENSE="BSD-2"
128 -SLOT="0/4"
129 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
130 -IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
131 -
132 -S="${WORKDIR}/${MY_P}"
133 -
134 -DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
135 -
136 -multilib_src_configure() {
137 - ECONF_SOURCE="${S}" econf \
138 - $(use_enable combination-explosion-check) \
139 - $(use_enable crnl-as-line-terminator) \
140 - $(use_enable static-libs static)
141 -}
142 -
143 -multilib_src_install_all() {
144 - einstalldocs
145 - find "${D}" -name "*.la" -delete || die
146 -}