Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/pegtl/, dev-libs/pegtl/files/
Date: Fri, 01 Oct 2021 07:24:49
Message-Id: 1633073067.03c4d12d640cff9d34811b25761dec6f8fb93b47.jsmolic@gentoo
1 commit: 03c4d12d640cff9d34811b25761dec6f8fb93b47
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 1 07:22:36 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 1 07:24:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c4d12d
7
8 dev-libs/pegtl: Remove old 3.2.0
9
10 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
11
12 dev-libs/pegtl/Manifest | 1 -
13 dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch | 56 ------------------------
14 dev-libs/pegtl/pegtl-3.2.0.ebuild | 29 ------------
15 3 files changed, 86 deletions(-)
16
17 diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
18 index 8fa741678e1..418d2b9e1c0 100644
19 --- a/dev-libs/pegtl/Manifest
20 +++ b/dev-libs/pegtl/Manifest
21 @@ -1,3 +1,2 @@
22 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
23 -DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
24 DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
25
26 diff --git a/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch b/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch
27 deleted file mode 100644
28 index 32bc4b5103e..00000000000
29 --- a/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch
30 +++ /dev/null
31 @@ -1,56 +0,0 @@
32 -https://bugs.gentoo.org/787854
33 -
34 -From b807854fc6573d59350551578375075fc61a21e1 Mon Sep 17 00:00:00 2001
35 -From: Sam James <sam@g.o>
36 -Date: Tue, 15 Jun 2021 01:31:40 +0000
37 -Subject: [PATCH] Drop -Werror
38 -
39 -Signed-off-by: Sam James <sam@g.o>
40 ----
41 - Makefile | 2 +-
42 - src/example/pegtl/CMakeLists.txt | 2 +-
43 - src/test/pegtl/CMakeLists.txt | 2 +-
44 - 3 files changed, 3 insertions(+), 3 deletions(-)
45 -
46 -diff --git a/Makefile b/Makefile
47 -index 3ecca07..2b8fa20 100644
48 ---- a/Makefile
49 -+++ b/Makefile
50 -@@ -30,7 +30,7 @@ endif
51 - # changed if desired.
52 -
53 - CPPFLAGS ?= -pedantic
54 --CXXFLAGS ?= -Wall -Wextra -Wshadow -Werror -O3 $(MINGW_CXXFLAGS)
55 -+CXXFLAGS ?= -Wall -Wextra -Wshadow $(MINGW_CXXFLAGS)
56 -
57 - HEADERS := $(shell find include -name '*.hpp')
58 - SOURCES := $(shell find src -name '*.cpp')
59 -diff --git a/src/example/pegtl/CMakeLists.txt b/src/example/pegtl/CMakeLists.txt
60 -index d416731..4d1a417 100644
61 ---- a/src/example/pegtl/CMakeLists.txt
62 -+++ b/src/example/pegtl/CMakeLists.txt
63 -@@ -60,7 +60,7 @@ foreach(examplesourcefile ${example_sources})
64 - if(MSVC)
65 - target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
66 - else()
67 -- target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
68 -+ target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
69 - endif()
70 - endforeach()
71 -
72 -diff --git a/src/test/pegtl/CMakeLists.txt b/src/test/pegtl/CMakeLists.txt
73 -index 577e310..84a8ab8 100644
74 ---- a/src/test/pegtl/CMakeLists.txt
75 -+++ b/src/test/pegtl/CMakeLists.txt
76 -@@ -146,7 +146,7 @@ foreach(testsourcefile ${test_sources})
77 - if(MSVC)
78 - target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
79 - else()
80 -- target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
81 -+ target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
82 - endif()
83 - if(ANDROID)
84 - add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} "-DANDROID_NDK=${ANDROID_NDK}" "-DTEST_RESOURCES_DIR=${CMAKE_SOURCE_DIR}" "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" "-DUNITTEST=${exename}" -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
85 ---
86 -2.32.0
87 -
88
89 diff --git a/dev-libs/pegtl/pegtl-3.2.0.ebuild b/dev-libs/pegtl/pegtl-3.2.0.ebuild
90 deleted file mode 100644
91 index 439aa90eed5..00000000000
92 --- a/dev-libs/pegtl/pegtl-3.2.0.ebuild
93 +++ /dev/null
94 @@ -1,29 +0,0 @@
95 -# Copyright 1999-2021 Gentoo Authors
96 -# Distributed under the terms of the GNU General Public License v2
97 -
98 -EAPI=7
99 -
100 -inherit cmake
101 -
102 -DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
103 -HOMEPAGE="https://github.com/taocpp/PEGTL"
104 -SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
105 -S="${WORKDIR}/${P^^}"
106 -
107 -LICENSE="MIT"
108 -SLOT="0"
109 -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
110 -IUSE="test"
111 -RESTRICT="!test? ( test )"
112 -
113 -PATCHES=(
114 - "${FILESDIR}"/${PN}-3.2.0-no-werror.patch
115 -)
116 -
117 -src_configure() {
118 - local mycmakeargs=(
119 - -DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
120 - -DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
121 - )
122 - cmake_src_configure
123 -}