aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/android-tools/Manifest12
-rw-r--r--dev-util/android-tools/android-tools-6.0.1_p79.ebuild94
-rw-r--r--dev-util/android-tools/android-tools-8.1.0_p1.ebuild128
-rw-r--r--dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch30
-rw-r--r--dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch42
-rw-r--r--dev-util/android-tools/files/android-tools-deffilemode.patch14
-rw-r--r--dev-util/android-tools/metadata.xml15
-rw-r--r--dev-util/systemtap/Manifest1
-rw-r--r--dev-util/systemtap/files/systemtap-2.9-musl.patch182
-rw-r--r--dev-util/systemtap/metadata.xml7
-rw-r--r--dev-util/systemtap/systemtap-2.9.ebuild79
11 files changed, 0 insertions, 604 deletions
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
deleted file mode 100644
index f7a9ade..0000000
--- a/dev-util/android-tools/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST android-tools-6.0.1_r79-arch.tar.gz 13466 BLAKE2B ddb064303659468b648a46ea24aae648968088de4aaea2b64e7b9d946d867daaf6ed1f4094cb7b29beb803387d2253580c85a46e9392bc1ccb2461186f2e52ef SHA512 90b8638d247897da33f6e861492c58df0e9877738650083c3307bd787d234d728e6c9097ac1401c254eb3daf4c6b18da4ee84dd16749acf6359fcb42781862fc
-DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508cb04293118d6e2ecc06e33d0d76ca81c536ea00a7818ebe4c4ccd30efef36aaaa1a9ec6ee3a57c00e2a82af28cbc49f4c973ab46be SHA512 a48f8c562305cbc951e008979920d9efe02e232c41997423457ff1e2f115e526b295c260a501d4050ce280ca7155793b95f7a60bad5cbc165ba80d6a225152f0
-DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
-DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
-DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
-DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B 65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6 SHA512 5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c
-DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82 SHA512 2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e
-DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7 SHA512 bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da
-DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
-DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
-DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
-DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
deleted file mode 100644
index 41f425f..0000000
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 eutils toolchain-funcs
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# Downloading git tarballs generated by android.googlesource.com
-# Archlinux package contains patches and build script generation mechanism.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-6a03c4736c9734f5ac3d6b5b912605690a6eaa5f.tar.gz -> ${MY_P}-arch.tar.gz
-https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-mirror://gentoo/${MY_P}-extras.tar.gz
-mirror://gentoo/${MY_P}-libselinux.tar.gz
-mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl"
-
-RDEPEND="sys-libs/zlib:=
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- dev-libs/libpcre"
-# dev-lang/ruby is necessary for build script generation.
-DEPEND="${RDEPEND}
- virtual/rubygems"
-
-PATCHES=( "${FILESDIR}/${PN}-deffilemode.patch" )
-
-S=${WORKDIR}
-
-src_unpack() {
- local dir filename
- for filename in ${A}; do
- if [[ ${filename} =~ ^${MY_P}-(.*)\.tar\.gz$ ]]; then
- dir=${BASH_REMATCH[1]}
- mkdir -p "${dir}" || die
- pushd "${dir}" >/dev/null
- unpack "${filename}"
- popd > /dev/null
- else
- die "unrecognized file in \${A}: ${filename}"
- fi
- done
-}
-
-src_prepare() {
- mv core/*/* core/ || die
- epatch arch/*/trunk/fix_build.patch
- cp arch/*/trunk/generate_build.rb ./ || die
- sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.cpp || die #616508
- default
-
- #580686
- find "${S}" -name '*.h' -exec \
- sed -e 's|^#include <sys/cdefs.h>$|/* \0 */|' \
- -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
- -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
- -i {} \; || die
- sed -e 's|^#include <sys/cdefs.h>$|/* \0 */|' \
- -i extras/ext4_utils/sha1.c || die
-}
-
-src_compile() {
- # Dynamically detect rubygems interpreter (bug 631398).
- local ruby_bin=$(type -P ruby) ruby_error_log=${T}/generate_build.rb.log success=
- for ruby_bin in "${ruby_bin}" "${ruby_bin}"[[:digit:]][[:digit:]]; do
- "${ruby_bin}" ./generate_build.rb 1> build.sh 2> "${ruby_error_log}" && \
- { success=1; break; }
- done
- if [[ -z ${success} ]]; then
- cat "${ruby_error_log}" >&2
- die "${ruby_bin} ./generate_build.rb failed"
- fi
- sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die
- chmod +x build.sh || die
- tc-export CC CXX
- bash -e ./build.sh || die
-}
-
-src_install() {
- dobin adb
- dobin fastboot
- dobin mkbootimg
- # Omitting, app-shells/bash-completion contains completion for adb
- #newbashcomp arch/*/trunk/bash_completion.adb adb
- newbashcomp arch/*/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
deleted file mode 100644
index cfd407c..0000000
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> ${MY_P}-arch.tar.gz
- https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
- https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
- mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz
- mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz
- mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz
- mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="python"
-
-DEPEND="sys-libs/zlib:=
- dev-libs/libpcre2:=
- virtual/libusb:1="
-RDEPEND="${DEPEND}
- python? ( ${PYTHON_DEPS} )"
-DEPEND+="
- dev-lang/go"
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
- local archive="$1"
- local dir="$2"
-
- mkdir -p "${dir}"
- pushd "${dir}" >/dev/null || die
- unpack "${archive}"
- if [[ ${dir} != ./* ]] ; then
- mv */* ./ || die
- fi
- popd >/dev/null
-}
-
-src_unpack() {
- unpack_into "${MY_P}-arch.tar.gz" arch
- unpack_into "${MY_P}-core.tar.gz" core
- unpack_into "${MY_P}-extras.tar.xz" extras
- unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
- unpack_into "${MY_P}-selinux.tar.xz" ./selinux
- unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
- unpack "${MY_P}.ninja.xz"
- mv "${MY_P}.ninja" "build.ninja" || die
-
- # Avoid depending on gtest just for its prod headers when boringssl bundles it.
- ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
- cd "${S}"/core
- eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
- eapply "${FILESDIR}"/${P}-build.patch
- eapply "${FILESDIR}"/${P}-musl.patch
- sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508
-
- cd "${S}"/selinux
- eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
- cd "${S}"
- #580686
- find "${S}" -name '*.h' -exec \
- sed -e 's|^#include <sys/cdefs.h>$|/* \0 */|' \
- -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
- -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
- -i {} \; || die
- sed -e 's|^#include <sys/cdefs.h>$|/* \0 */|' \
- -i extras/ext4_utils/sha1.c || die
-
- default
-
- # The pregenerated ninja file expects the build/ dir.
- BUILD_DIR="${CMAKE_USE_DIR}/build"
- cmake-utils_src_prepare
-}
-
-src_configure() {
- append-lfs-flags
-
- cmake-utils_src_configure
-
- sed -i \
- -e "s:@CC@:$(tc-getCC):g" \
- -e "s:@CXX@:$(tc-getCXX):g" \
- -e "s:@CFLAGS@:${CFLAGS}:g" \
- -e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
- -e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
- -e "s:@LDFLAGS@:${LDFLAGS}:g" \
- -e "s:@PV@:${PV}:g" \
- build.ninja || die
-}
-
-src_compile() {
- # We only need a few libs from boringssl.
- cmake-utils_src_compile libcrypto.a libssl.a
-
- eninja
-}
-
-src_install() {
- dobin adb fastboot
- dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
- use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
- newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
deleted file mode 100644
index f3d664e..0000000
--- a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/adb/sysdeps.h
-+++ b/adb/sysdeps.h
-@@ -66,6 +66,11 @@
- #endif
- #endif
-
-+#ifndef __clang__
-+#define _Nonnull
-+#define _Nullable
-+#endif
-+
- #ifdef _WIN32
-
- // Clang-only nullability specifiers
---- a/libcutils/include/cutils/trace.h
-+++ b/libcutils/include/cutils/trace.h
-@@ -18,7 +18,13 @@
- #define _LIBS_CUTILS_TRACE_H
-
- #include <inttypes.h>
-+// https://gcc.gnu.org/PR60932
-+#ifdef __cplusplus
-+#include <atomic>
-+using namespace std;
-+#else
- #include <stdatomic.h>
-+#endif
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch
deleted file mode 100644
index 4b25964..0000000
--- a/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/base/logging.cpp
-+++ b/base/logging.cpp
-@@ -28,7 +28,7 @@
- // For getprogname(3) or program_invocation_short_name.
- #if defined(__ANDROID__) || defined(__APPLE__)
- #include <stdlib.h>
--#elif defined(__GLIBC__)
-+#elif defined(__linux__)
- #include <errno.h>
- #endif
-
-@@ -90,7 +90,7 @@
- }
-
- namespace {
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- const char* getprogname() {
- return program_invocation_short_name;
- }
---- a/adb/diagnose_usb.cpp 2018-01-29 12:05:10.466834056 -0800
-+++ b/adb/diagnose_usb.cpp 2018-01-29 12:13:20.980825271 -0800
-@@ -33,7 +33,7 @@
- // Returns a message describing any potential problems we find with udev, or an empty string if we
- // can't find plugdev information (i.e. udev is not installed).
- static std::string GetUdevProblem() {
--#if defined(__linux__)
-+#if defined(__GLIBC__)
- errno = 0;
- group* plugdev_group = getgrnam("plugdev");
-
---- a/fastboot/socket.cpp 2018-01-29 12:05:10.493834055 -0800
-+++ b/fastboot/socket.cpp 2018-01-29 12:17:23.666820925 -0800
-@@ -28,6 +28,8 @@
-
- #include "socket.h"
-
-+#include <sys/select.h>
-+
- #include <android-base/errors.h>
- #include <android-base/stringprintf.h>
-
diff --git a/dev-util/android-tools/files/android-tools-deffilemode.patch b/dev-util/android-tools/files/android-tools-deffilemode.patch
deleted file mode 100644
index 12aa988..0000000
--- a/dev-util/android-tools/files/android-tools-deffilemode.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur android-tools.orig/core/include/utils/Compat.h android-tools/core/include/utils/Compat.h
---- android-tools.orig/core/include/utils/Compat.h 2017-04-24 11:27:39.697736014 -0700
-+++ android-tools/core/include/utils/Compat.h 2017-04-24 11:45:24.930908371 -0700
-@@ -41,6 +41,10 @@
- #define DEFFILEMODE 0666
- #endif /* _WIN32 */
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define DEFFILEMODE 0666
-+#endif
-+
- #if defined(_WIN32)
- #define ZD "%ld"
- #define ZD_TYPE long
diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
deleted file mode 100644
index 27a6743..0000000
--- a/dev-util/android-tools/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
- <bugs-to>https://code.google.com/p/android/issues/list</bugs-to>
- <changelog>https://android.googlesource.com/platform/system/core.git/+log/HEAD</changelog>
- <doc>https://android.googlesource.com/platform/system/core.git/+/master/adb/OVERVIEW.TXT</doc>
- <remote-id type="github">android/platform_system_core</remote-id>
- <remote-id type="launchpad">ubuntu</remote-id>
- </upstream>
- <maintainer type="person">
- <email>zmedico@gentoo.org</email>
- <name>Zac Medico</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
deleted file mode 100644
index d3d3aef..0000000
--- a/dev-util/systemtap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST systemtap-2.9.tar.gz 3258026 SHA256 04f2c607512f4867f345a3d173940e1023441c5d3560f2e580b4a82dfe4d6353 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc WHIRLPOOL fa8d3978f0768091c5cc3bd1cd4b13b6ff9643e2e37ee8e8b59c1801fd7ddcad7029d06e4a1207dc5add5faf423de9ccdb9df677b7db88a5199b1fde731fcb3a
diff --git a/dev-util/systemtap/files/systemtap-2.9-musl.patch b/dev-util/systemtap/files/systemtap-2.9-musl.patch
deleted file mode 100644
index c90804f..0000000
--- a/dev-util/systemtap/files/systemtap-2.9-musl.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -Naur systemtap-2.9.orig/buildrun.cxx systemtap-2.9/buildrun.cxx
---- systemtap-2.9.orig/buildrun.cxx 2017-02-24 10:47:12.478787249 -0800
-+++ systemtap-2.9/buildrun.cxx 2017-02-24 10:47:56.414162998 -0800
-@@ -788,13 +788,14 @@
- if (s.need_uprobes && !kernel_built_uprobes(s))
- {
- string opt_u = "-u";
-+ char *p = strchr(s.uprobes_path.c_str(), '/');
- if (!s.uprobes_path.empty() &&
- strverscmp("1.4", version.c_str()) <= 0)
- {
- if (remotedir.empty())
- opt_u.append(s.uprobes_path);
- else
-- opt_u.append(remotedir + "/" + basename(s.uprobes_path.c_str()));
-+ opt_u.append(remotedir + "/" + (p ? p + 1 : s.uprobes_path.c_str()));
- }
- staprun_cmd.push_back(opt_u);
- }
-diff -Naur systemtap-2.9.orig/configure.ac systemtap-2.9/configure.ac
---- systemtap-2.9.orig/configure.ac 2017-02-24 10:47:12.480787266 -0800
-+++ systemtap-2.9/configure.ac 2017-02-24 10:48:24.679405813 -0800
-@@ -443,6 +443,50 @@
- fi
- fi
-
-+dnl Check if we have argp available from our libc
-+AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [#include <argp.h>],
-+ [int argc=1; char *argv[]={"test"}, argp_parse(0,argc,argv,0,0,0); return 0;]
-+ )],
-+ [libc_has_argp="true"],
-+ [libc_has_argp="false"]
-+)
-+
-+dnl If our libc doesn't provide argp, then test for libargp
-+if test "$libc_has_argp" = "false" ; then
-+ AC_MSG_WARN("libc does not have argp")
-+ AC_CHECK_LIB([argp], [argp_parse], [have_obstack="true"], [have_obstack="false"])
-+
-+ if test "$have_argp" = "false"; then
-+ AC_MSG_ERROR("no libargp found")
-+ else
-+ stap_LIBS="$stap_LIBS -largp"
-+ fi
-+fi
-+
-+dnl Check if we have obstack available from our libc
-+AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [#include <obstack.h>],
-+ [_obstack_begin(0, 0, 0, 0, 0); return 0;]
-+ )],
-+ [libc_has_obstack="true", AC_DEFINE(HAVE_OBSTACK, 1)],
-+ [libc_has_obstack="false"]
-+)
-+
-+dnl If our libc doesn't provide obstack, then test for libobstack
-+if test "$libc_has_obstack" = "false" ; then
-+ AC_MSG_WARN("libc does not have obstack")
-+ AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], [have_obstack="false"])
-+
-+ if test "$have_obstack" = "false"; then
-+ AC_MSG_ERROR("no libobstack found")
-+ else
-+ stap_LIBS="$stap_LIBS -lobstack"
-+ fi
-+fi
-+
- AC_SUBST(stap_LIBS)
- AC_MSG_NOTICE([stap will link $stap_LIBS])
-
-diff -Naur systemtap-2.9.orig/csclient.cxx systemtap-2.9/csclient.cxx
---- systemtap-2.9.orig/csclient.cxx 2017-02-24 10:47:12.481787274 -0800
-+++ systemtap-2.9/csclient.cxx 2017-02-24 10:48:59.261702894 -0800
-@@ -75,6 +75,10 @@
-
- #define MOK_PUBLIC_CERT_NAME "signing_key.x509"
-
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- static PRIPv6Addr &copyAddress (PRIPv6Addr &PRin6, const in6_addr &in6);
- static PRNetAddr &copyNetAddr (PRNetAddr &x, const PRNetAddr &y);
- bool operator!= (const PRNetAddr &x, const PRNetAddr &y);
-@@ -1038,7 +1042,7 @@
-
- // Canonicalize the given path and remove the leading /.
- string rpath;
-- char *cpath = canonicalize_file_name (path.c_str ());
-+ char *cpath = realpath (path.c_str (), NULL);
- if (! cpath)
- {
- // It can not be canonicalized. Use the name relative to
-diff -Naur systemtap-2.9.orig/error.h systemtap-2.9/error.h
---- systemtap-2.9.orig/error.h 1969-12-31 16:00:00.000000000 -0800
-+++ systemtap-2.9/error.h 2017-02-24 10:49:03.823742085 -0800
-@@ -0,0 +1,27 @@
-+#ifndef _ERROR_H_
-+#define _ERROR_H_
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+static unsigned int error_message_count = 0;
-+
-+static inline void error(int status, int errnum, const char* format, ...)
-+{
-+ va_list ap;
-+ fprintf(stderr, "%s: ", program_invocation_name);
-+ va_start(ap, format);
-+ vfprintf(stderr, format, ap);
-+ va_end(ap);
-+ if (errnum)
-+ fprintf(stderr, ": %s", strerror(errnum));
-+ fprintf(stderr, "\n");
-+ error_message_count++;
-+ if (status)
-+ exit(status);
-+}
-+
-+#endif /* _ERROR_H_ */
-diff -Naur systemtap-2.9.orig/remote.cxx systemtap-2.9/remote.cxx
---- systemtap-2.9.orig/remote.cxx 2017-02-24 10:47:12.532787709 -0800
-+++ systemtap-2.9/remote.cxx 2017-02-24 10:49:25.245926113 -0800
-@@ -459,7 +459,8 @@
-
- if (!s->uprobes_path.empty())
- {
-- string remoteuprobes = basename(s->uprobes_path.c_str());
-+ char *p = strchr(s->uprobes_path.c_str(), '/');
-+ string remoteuprobes = p ? p + 1 : s->uprobes_path.c_str();
- if ((rc = send_file(s->uprobes_path, remoteuprobes)))
- return rc;
-
-diff -Naur systemtap-2.9.orig/sdt_types.h systemtap-2.9/sdt_types.h
---- systemtap-2.9.orig/sdt_types.h 2017-02-24 10:47:12.572788050 -0800
-+++ systemtap-2.9/sdt_types.h 2017-02-24 10:49:42.865077472 -0800
-@@ -10,6 +10,13 @@
- #define UPROBE2_TYPE 0x32425055 /* "UPB2" */
- #define UPROBE3_TYPE 0x33425055 /* "UPB3" */
-
-+#ifndef __uint32_t
-+#define __uint32_t uint32_t
-+#endif
-+#ifndef __uint64_t
-+#define __uint64_t uint64_t
-+#endif
-+
- typedef enum
- {
- uprobe1_type = UPROBE1_TYPE,
-diff -Naur systemtap-2.9.orig/session.cxx systemtap-2.9/session.cxx
---- systemtap-2.9.orig/session.cxx 2017-02-24 10:47:12.572788050 -0800
-+++ systemtap-2.9/session.cxx 2017-02-24 10:49:56.716196203 -0800
-@@ -1329,7 +1329,7 @@
- cerr << "ERROR: multiple --sysroot options not supported" << endl;
- return 1;
- } else {
-- char *spath = canonicalize_file_name (optarg);
-+ char *spath = realpath (optarg, NULL);
- if (spath == NULL) {
- cerr << _F("ERROR: %s is an invalid directory for --sysroot", optarg) << endl;
- return 1;
-diff -Naur systemtap-2.9.orig/staprun/staprun.h systemtap-2.9/staprun/staprun.h
---- systemtap-2.9.orig/staprun/staprun.h 2017-02-24 10:47:12.581788127 -0800
-+++ systemtap-2.9/staprun/staprun.h 2017-02-24 10:50:18.951386526 -0800
-@@ -47,6 +47,9 @@
- #include <locale.h>
- #endif
-
-+#ifndef __off_t
-+#define __off_t off_t
-+#endif
-
- /* define gettext options if NLS is set */
- #if ENABLE_NLS
diff --git a/dev-util/systemtap/metadata.xml b/dev-util/systemtap/metadata.xml
deleted file mode 100644
index 208c069..0000000
--- a/dev-util/systemtap/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>swegener@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild
deleted file mode 100644
index 4f60328..0000000
--- a/dev-util/systemtap/systemtap-2.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
- elibc_musl? (
- sys-libs/argp-standalone
- sys-libs/obstack-standalone
- )
- sys-libs/libcap
- ${PYTHON_DEPS}
- sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
- linux-info_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- python_fix_shebang .
-
- sed -i \
- -e 's:-Werror::g' \
- configure.ac \
- Makefile.am \
- staprun/Makefile.am \
- stapdyn/Makefile.am \
- buildrun.cxx \
- testsuite/systemtap.unprivileged/unprivileged_probes.exp \
- testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
- testsuite/systemtap.base/stmt_rel_user.exp \
- testsuite/systemtap.base/sdt_va_args.exp \
- testsuite/systemtap.base/sdt_misc.exp \
- testsuite/systemtap.base/sdt.exp \
- scripts/kprobes_test/gen_code.py \
- || die "Failed to clean up sources"
-
- epatch "${FILESDIR}"/${P}-musl.patch
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --without-rpm \
- --disable-server \
- --disable-docs \
- --disable-refdocs \
- --disable-grapher \
- $(use_enable sqlite)
-}