1 |
commit: 14d47fa7ebc291429c97a48af7682883a50f9c61 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 30 17:14:49 2017 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 30 17:16:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d47fa7 |
7 |
|
8 |
dev-util/meson: remove old versions |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
dev-util/meson/Manifest | 2 - |
13 |
dev-util/meson/files/meson-0.33.0-runpath.patch | 96 ------------------------- |
14 |
dev-util/meson/meson-0.33.0.ebuild | 36 ---------- |
15 |
dev-util/meson/meson-0.35.0.ebuild | 31 -------- |
16 |
4 files changed, 165 deletions(-) |
17 |
|
18 |
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest |
19 |
index fc09ec8..c59018f 100644 |
20 |
--- a/dev-util/meson/Manifest |
21 |
+++ b/dev-util/meson/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
-DIST meson-0.33.0.tar.gz 482221 SHA256 2417fd27cbb1e9b1006fe9e5a1f3896285d4c925ffffdf9478638b5fe3ea7fc5 SHA512 de4bdc40574dfbbc5a29861c32984dc1c97d28992e849c32f1ec0e314d3c69861768583c29eea2b9708ec6b734759d7eac60a53015fd321e29f1e9b1dbbffc22 WHIRLPOOL f12522765dcdf035f873625c3f8dca3d5800e7f12907ac80e65b76d6f7dd54469cd91060d5b89e16b1ca088c94808901706aa98a1d53ff65429bf1b733246dcf |
24 |
-DIST meson-0.35.0.tar.gz 510855 SHA256 8316f1b24f2b4375673b0b7fcd88f0402567bf1ac77e5caad88cb352ac8a9b70 SHA512 285e3370307ee1e7b26af4ad0e50765dd19491fdcd85e3abb97c5892b02b57b3fa9537258d941711cb4a1012a326ae16c144f535079c8a4e427f9f0cf79cc45f WHIRLPOOL e4b6947aec49faa17c39b0c04f7bab6dc8ba64a77654f73afa283ca93e0645ba8893c76b913e6a3823e325ccd977047b3c8b83bfb3b94980a5694b254e727366 |
25 |
DIST meson-0.36.0.tar.gz 459007 SHA256 17e3fb4ac697c2bd2ba7f555e5830ac13257b2250f4922e6bec504303b2830d5 SHA512 162c27fe0bf1e61422cefe3ff4397a9a426d9cabbadfe358c3c440ba746784d64c4d689c2dc22b0456e6c6631b2e92874a85ee597d58614ee45e932b9285c9f8 WHIRLPOOL 05bb5cafc919e73c02f0d6a484d439d79f94f2ff5367d33a277e0b07af668daa8871c6c140c6fcfd64b5a099a2f13597eb31946b044b64acf726f1fa4a8cd596 |
26 |
DIST meson-0.37.1.tar.gz 487233 SHA256 32515e2bdbd9c5774941f74f7c87513bcdc08a6b1e5307eac1e2ae5aa6966b91 SHA512 6d112736bb485e6a0206143f38b83afae1e3e709e3a8f42415621b956cf313cc52a7a21dc52d099ccf746ebcc097f0ba3addc0141f0e90ee4df399f8745c95bf WHIRLPOOL 87a2e7902aa0f5dc12266095275cd7f3d86da774a1a918050f43975e4ef40a8b88608ede2d0e525e8f2c865f5ca1c78e7d5a0e7f7474b6dad537563c52a0666a |
27 |
DIST meson-0.38.0.tar.gz 514051 SHA256 462ee047c48102a83ed9c3a48e3b9b29ec5da4c4a92b517cac2bffb87caf4455 SHA512 c9907ac018c0ec7c047a6deabedb376b39cac494773a17387f8465616a9b52d977bf4f5271db3f9fba412e6dcf015cdab677ab9fb8d874ef431c79d83adcd1e1 WHIRLPOOL c01d01403a327e96f321e3d180a4f65e03017e3a52238b8b1f31d3ae42cc52171d2b677641d2d56f56cd4f7984bcb296d39293726451c956c05aa4ef56c372f6 |
28 |
|
29 |
diff --git a/dev-util/meson/files/meson-0.33.0-runpath.patch b/dev-util/meson/files/meson-0.33.0-runpath.patch |
30 |
deleted file mode 100644 |
31 |
index 2081cd3..00000000 |
32 |
--- a/dev-util/meson/files/meson-0.33.0-runpath.patch |
33 |
+++ /dev/null |
34 |
@@ -1,96 +0,0 @@ |
35 |
-From b42c0555ca35ebf6e97438ef414a3de62eaa2ced Mon Sep 17 00:00:00 2001 |
36 |
-From: Jussi Pakkanen <jpakkane@×××××.com> |
37 |
-Date: Tue, 2 Aug 2016 21:45:45 +0300 |
38 |
-Subject: [PATCH] Handle both DT_RPATH as well as DT_RUNPATH when fixing rpath |
39 |
- settings. |
40 |
- |
41 |
---- |
42 |
- mesonbuild/scripts/depfixer.py | 30 +++++++++++++++++++++++------- |
43 |
- 1 file changed, 23 insertions(+), 7 deletions(-) |
44 |
- |
45 |
-diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py |
46 |
-index 8ff0dd1..cb136f4 100644 |
47 |
---- a/mesonbuild/scripts/depfixer.py |
48 |
-+++ b/mesonbuild/scripts/depfixer.py |
49 |
-@@ -20,6 +20,7 @@ |
50 |
- SHT_STRTAB = 3 |
51 |
- DT_NEEDED = 1 |
52 |
- DT_RPATH = 15 |
53 |
-+DT_RUNPATH = 29 |
54 |
- DT_STRTAB = 5 |
55 |
- DT_SONAME = 14 |
56 |
- |
57 |
-@@ -211,21 +212,29 @@ def print_soname(self): |
58 |
- self.bf.seek(strtab.val + soname.val) |
59 |
- print(self.read_str()) |
60 |
- |
61 |
-- def get_rpath_offset(self): |
62 |
-+ def get_entry_offset(self, entrynum): |
63 |
- sec = self.find_section(b'.dynstr') |
64 |
- for i in self.dynamic: |
65 |
-- if i.d_tag == DT_RPATH: |
66 |
-+ if i.d_tag == entrynum: |
67 |
- return sec.sh_offset + i.val |
68 |
- return None |
69 |
- |
70 |
- def print_rpath(self): |
71 |
-- offset = self.get_rpath_offset() |
72 |
-+ offset = self.get_entry_offset(DT_RPATH) |
73 |
- if offset is None: |
74 |
- print("This file does not have an rpath.") |
75 |
- else: |
76 |
- self.bf.seek(offset) |
77 |
- print(self.read_str()) |
78 |
- |
79 |
-+ def print_runpath(self): |
80 |
-+ offset = self.get_entry_offset(DT_RUNPATH) |
81 |
-+ if offset is None: |
82 |
-+ print("This file does not have a runpath.") |
83 |
-+ else: |
84 |
-+ self.bf.seek(offset) |
85 |
-+ print(self.read_str()) |
86 |
-+ |
87 |
- def print_deps(self): |
88 |
- sec = self.find_section(b'.dynstr') |
89 |
- deps = [] |
90 |
-@@ -257,9 +266,15 @@ def fix_deps(self, prefix): |
91 |
- self.bf.write(newname) |
92 |
- |
93 |
- def fix_rpath(self, new_rpath): |
94 |
-+ # The path to search for can be either rpath or runpath. |
95 |
-+ # Fix both of them to be sure. |
96 |
-+ self.fix_rpathtype_entry(new_rpath, DT_RPATH) |
97 |
-+ self.fix_rpathtype_entry(new_rpath, DT_RUNPATH) |
98 |
-+ |
99 |
-+ def fix_rpathtype_entry(self, new_rpath, entrynum): |
100 |
- if isinstance(new_rpath, str): |
101 |
- new_rpath = new_rpath.encode('utf8') |
102 |
-- rp_off = self.get_rpath_offset() |
103 |
-+ rp_off = self.get_entry_offset(entrynum) |
104 |
- if rp_off is None: |
105 |
- if self.verbose: |
106 |
- print('File does not have rpath. It should be a fully static executable.') |
107 |
-@@ -272,12 +287,12 @@ def fix_rpath(self, new_rpath): |
108 |
- self.bf.write(new_rpath) |
109 |
- self.bf.write(b'\0'*(len(old_rpath) - len(new_rpath) + 1)) |
110 |
- if len(new_rpath) == 0: |
111 |
-- self.remove_rpath_entry() |
112 |
-+ self.remove_rpath_entry(entrynum) |
113 |
- |
114 |
-- def remove_rpath_entry(self): |
115 |
-+ def remove_rpath_entry(self, entrynum): |
116 |
- sec = self.find_section(b'.dynamic') |
117 |
- for (i, entry) in enumerate(self.dynamic): |
118 |
-- if entry.d_tag == DT_RPATH: |
119 |
-+ if entry.d_tag == entrynum: |
120 |
- rpentry = self.dynamic[i] |
121 |
- rpentry.d_tag = 0 |
122 |
- self.dynamic = self.dynamic[:i] + self.dynamic[i+1:] + [rpentry] |
123 |
-@@ -296,6 +311,7 @@ def run(args): |
124 |
- e = Elf(args[0]) |
125 |
- if len(args) == 1: |
126 |
- e.print_rpath() |
127 |
-+ e.print_runpath() |
128 |
- else: |
129 |
- new_rpath = args[1] |
130 |
- e.fix_rpath(new_rpath) |
131 |
|
132 |
diff --git a/dev-util/meson/meson-0.33.0.ebuild b/dev-util/meson/meson-0.33.0.ebuild |
133 |
deleted file mode 100644 |
134 |
index f863b64..00000000 |
135 |
--- a/dev-util/meson/meson-0.33.0.ebuild |
136 |
+++ /dev/null |
137 |
@@ -1,36 +0,0 @@ |
138 |
-# Copyright 1999-2016 Gentoo Foundation |
139 |
-# Distributed under the terms of the GNU General Public License v2 |
140 |
-# $Id$ |
141 |
- |
142 |
-EAPI=6 |
143 |
-PYTHON_COMPAT=( python3_{4,5} ) |
144 |
- |
145 |
-inherit distutils-r1 |
146 |
- |
147 |
-DESCRIPTION="Open source build system" |
148 |
-HOMEPAGE="http://mesonbuild.com/" |
149 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
150 |
- |
151 |
-LICENSE="Apache-2.0" |
152 |
-SLOT="0" |
153 |
-KEYWORDS="amd64 x86" |
154 |
-IUSE="" |
155 |
- |
156 |
-DEPEND="${PYTHON_DEPS} |
157 |
- >=dev-util/ninja-1.6.0 |
158 |
-" |
159 |
-RDEPEND="${DEPEND}" |
160 |
- |
161 |
-DOCS=( authors.txt contributing.txt ) |
162 |
- |
163 |
-PATCHES=( |
164 |
- # https://github.com/mesonbuild/meson/pull/663 |
165 |
- "${FILESDIR}"/${P}-runpath.patch |
166 |
-) |
167 |
- |
168 |
-src_install() { |
169 |
- distutils-r1_src_install |
170 |
- for i in mesonconf mesonintrospect meson wraptool; do |
171 |
- dosym "${i}.py" "/usr/bin/${i}" |
172 |
- done |
173 |
-} |
174 |
|
175 |
diff --git a/dev-util/meson/meson-0.35.0.ebuild b/dev-util/meson/meson-0.35.0.ebuild |
176 |
deleted file mode 100644 |
177 |
index 44eeaec..00000000 |
178 |
--- a/dev-util/meson/meson-0.35.0.ebuild |
179 |
+++ /dev/null |
180 |
@@ -1,31 +0,0 @@ |
181 |
-# Copyright 1999-2016 Gentoo Foundation |
182 |
-# Distributed under the terms of the GNU General Public License v2 |
183 |
-# $Id$ |
184 |
- |
185 |
-EAPI=6 |
186 |
-PYTHON_COMPAT=( python3_{4,5} ) |
187 |
- |
188 |
-inherit distutils-r1 |
189 |
- |
190 |
-DESCRIPTION="Open source build system" |
191 |
-HOMEPAGE="http://mesonbuild.com/" |
192 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
193 |
- |
194 |
-LICENSE="Apache-2.0" |
195 |
-SLOT="0" |
196 |
-KEYWORDS="~amd64 ~x86" |
197 |
-IUSE="" |
198 |
- |
199 |
-DEPEND="${PYTHON_DEPS} |
200 |
- >=dev-util/ninja-1.6.0 |
201 |
-" |
202 |
-RDEPEND="${DEPEND}" |
203 |
- |
204 |
-DOCS=( authors.txt contributing.txt ) |
205 |
- |
206 |
-src_install() { |
207 |
- distutils-r1_src_install |
208 |
- for i in mesonconf mesonintrospect meson wraptool; do |
209 |
- dosym "${i}.py" "/usr/bin/${i}" |
210 |
- done |
211 |
-} |