[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/

[William Hubbs]

commit:     14d47fa7ebc291429c97a48af7682883a50f9c61
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 17:14:49 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 17:16:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d47fa7

dev-util/meson: remove old versions

Package-Manager: portage-2.3.3

 dev-util/meson/Manifest                         |  2 -
 dev-util/meson/files/meson-0.33.0-runpath.patch | 96 -------------------------
 dev-util/meson/meson-0.33.0.ebuild              | 36 ----------
 dev-util/meson/meson-0.35.0.ebuild              | 31 --------
 4 files changed, 165 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index fc09ec8..c59018f 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,5 +1,3 @@
-DIST meson-0.33.0.tar.gz 482221 SHA256 2417fd27cbb1e9b1006fe9e5a1f3896285d4c925ffffdf9478638b5fe3ea7fc5 SHA512 de4bdc40574dfbbc5a29861c32984dc1c97d28992e849c32f1ec0e314d3c69861768583c29eea2b9708ec6b734759d7eac60a53015fd321e29f1e9b1dbbffc22 WHIRLPOOL f12522765dcdf035f873625c3f8dca3d5800e7f12907ac80e65b76d6f7dd54469cd91060d5b89e16b1ca088c94808901706aa98a1d53ff65429bf1b733246dcf
-DIST meson-0.35.0.tar.gz 510855 SHA256 8316f1b24f2b4375673b0b7fcd88f0402567bf1ac77e5caad88cb352ac8a9b70 SHA512 285e3370307ee1e7b26af4ad0e50765dd19491fdcd85e3abb97c5892b02b57b3fa9537258d941711cb4a1012a326ae16c144f535079c8a4e427f9f0cf79cc45f WHIRLPOOL e4b6947aec49faa17c39b0c04f7bab6dc8ba64a77654f73afa283ca93e0645ba8893c76b913e6a3823e325ccd977047b3c8b83bfb3b94980a5694b254e727366
 DIST meson-0.36.0.tar.gz 459007 SHA256 17e3fb4ac697c2bd2ba7f555e5830ac13257b2250f4922e6bec504303b2830d5 SHA512 162c27fe0bf1e61422cefe3ff4397a9a426d9cabbadfe358c3c440ba746784d64c4d689c2dc22b0456e6c6631b2e92874a85ee597d58614ee45e932b9285c9f8 WHIRLPOOL 05bb5cafc919e73c02f0d6a484d439d79f94f2ff5367d33a277e0b07af668daa8871c6c140c6fcfd64b5a099a2f13597eb31946b044b64acf726f1fa4a8cd596
 DIST meson-0.37.1.tar.gz 487233 SHA256 32515e2bdbd9c5774941f74f7c87513bcdc08a6b1e5307eac1e2ae5aa6966b91 SHA512 6d112736bb485e6a0206143f38b83afae1e3e709e3a8f42415621b956cf313cc52a7a21dc52d099ccf746ebcc097f0ba3addc0141f0e90ee4df399f8745c95bf WHIRLPOOL 87a2e7902aa0f5dc12266095275cd7f3d86da774a1a918050f43975e4ef40a8b88608ede2d0e525e8f2c865f5ca1c78e7d5a0e7f7474b6dad537563c52a0666a
 DIST meson-0.38.0.tar.gz 514051 SHA256 462ee047c48102a83ed9c3a48e3b9b29ec5da4c4a92b517cac2bffb87caf4455 SHA512 c9907ac018c0ec7c047a6deabedb376b39cac494773a17387f8465616a9b52d977bf4f5271db3f9fba412e6dcf015cdab677ab9fb8d874ef431c79d83adcd1e1 WHIRLPOOL c01d01403a327e96f321e3d180a4f65e03017e3a52238b8b1f31d3ae42cc52171d2b677641d2d56f56cd4f7984bcb296d39293726451c956c05aa4ef56c372f6

diff --git a/dev-util/meson/files/meson-0.33.0-runpath.patch b/dev-util/meson/files/meson-0.33.0-runpath.patch
deleted file mode 100644
index 2081cd3..00000000
--- a/dev-util/meson/files/meson-0.33.0-runpath.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From b42c0555ca35ebf6e97438ef414a3de62eaa2ced Mon Sep 17 00:00:00 2001
-From: Jussi Pakkanen <jpakkane@×××××.com>
-Date: Tue, 2 Aug 2016 21:45:45 +0300
-Subject: [PATCH] Handle both DT_RPATH as well as DT_RUNPATH when fixing rpath
- settings.
-
----
- mesonbuild/scripts/depfixer.py | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
-index 8ff0dd1..cb136f4 100644
---- a/mesonbuild/scripts/depfixer.py
-+++ b/mesonbuild/scripts/depfixer.py
-@@ -20,6 +20,7 @@
- SHT_STRTAB = 3
- DT_NEEDED = 1
- DT_RPATH = 15
-+DT_RUNPATH = 29
- DT_STRTAB = 5
- DT_SONAME = 14
- 
-@@ -211,21 +212,29 @@ def print_soname(self):
-         self.bf.seek(strtab.val + soname.val)
-         print(self.read_str())
- 
--    def get_rpath_offset(self):
-+    def get_entry_offset(self, entrynum):
-         sec = self.find_section(b'.dynstr')
-         for i in self.dynamic:
--            if i.d_tag == DT_RPATH:
-+            if i.d_tag == entrynum:
-                 return sec.sh_offset + i.val
-         return None
- 
-     def print_rpath(self):
--        offset = self.get_rpath_offset()
-+        offset = self.get_entry_offset(DT_RPATH)
-         if offset is None:
-             print("This file does not have an rpath.")
-         else:
-             self.bf.seek(offset)
-             print(self.read_str())
- 
-+    def print_runpath(self):
-+        offset = self.get_entry_offset(DT_RUNPATH)
-+        if offset is None:
-+            print("This file does not have a runpath.")
-+        else:
-+            self.bf.seek(offset)
-+            print(self.read_str())
-+
-     def print_deps(self):
-         sec = self.find_section(b'.dynstr')
-         deps = []
-@@ -257,9 +266,15 @@ def fix_deps(self, prefix):
-                 self.bf.write(newname)
- 
-     def fix_rpath(self, new_rpath):
-+        # The path to search for can be either rpath or runpath.
-+        # Fix both of them to be sure.
-+        self.fix_rpathtype_entry(new_rpath, DT_RPATH)
-+        self.fix_rpathtype_entry(new_rpath, DT_RUNPATH)
-+
-+    def fix_rpathtype_entry(self, new_rpath, entrynum):
-         if isinstance(new_rpath, str):
-             new_rpath = new_rpath.encode('utf8')
--        rp_off = self.get_rpath_offset()
-+        rp_off = self.get_entry_offset(entrynum)
-         if rp_off is None:
-             if self.verbose:
-                 print('File does not have rpath. It should be a fully static executable.')
-@@ -272,12 +287,12 @@ def fix_rpath(self, new_rpath):
-         self.bf.write(new_rpath)
-         self.bf.write(b'\0'*(len(old_rpath) - len(new_rpath) + 1))
-         if len(new_rpath) == 0:
--            self.remove_rpath_entry()
-+            self.remove_rpath_entry(entrynum)
- 
--    def remove_rpath_entry(self):
-+    def remove_rpath_entry(self, entrynum):
-         sec = self.find_section(b'.dynamic')
-         for (i, entry) in enumerate(self.dynamic):
--            if entry.d_tag == DT_RPATH:
-+            if entry.d_tag == entrynum:
-                 rpentry = self.dynamic[i]
-                 rpentry.d_tag = 0
-                 self.dynamic = self.dynamic[:i] + self.dynamic[i+1:] + [rpentry]
-@@ -296,6 +311,7 @@ def run(args):
-     e = Elf(args[0])
-     if len(args) == 1:
-         e.print_rpath()
-+        e.print_runpath()
-     else:
-         new_rpath = args[1]
-         e.fix_rpath(new_rpath)

diff --git a/dev-util/meson/meson-0.33.0.ebuild b/dev-util/meson/meson-0.33.0.ebuild
deleted file mode 100644
index f863b64..00000000
--- a/dev-util/meson/meson-0.33.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/ninja-1.6.0
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( authors.txt contributing.txt )
-
-PATCHES=(
-	# https://github.com/mesonbuild/meson/pull/663
-	"${FILESDIR}"/${P}-runpath.patch
-)
-
-src_install() {
-	distutils-r1_src_install
-	for i in mesonconf mesonintrospect meson wraptool; do
-		dosym "${i}.py" "/usr/bin/${i}"
-	done
-}

diff --git a/dev-util/meson/meson-0.35.0.ebuild b/dev-util/meson/meson-0.35.0.ebuild
deleted file mode 100644
index 44eeaec..00000000
--- a/dev-util/meson/meson-0.35.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/ninja-1.6.0
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( authors.txt contributing.txt )
-
-src_install() {
-	distutils-r1_src_install
-	for i in mesonconf mesonintrospect meson wraptool; do
-		dosym "${i}.py" "/usr/bin/${i}"
-	done
-}