summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2016-12-31 15:55:44 +0000
committerBertrand Jacquin <bertrand@jacquin.bzh>2016-12-31 15:55:44 +0000
commit014a32dba21ddde54c2fd56834c06e790fc71a01 (patch)
treed86be0f1528739338e2ea30bc7eb70852d953d3b
parentprofiles/enlightenment/build: Enable support for ruby24 (diff)
downloadportage-014a32dba21ddde54c2fd56834c06e790fc71a01.tar.xz
sys-devel/crossdev: Upstream is now using EAPI 6, move patches to
/etc/portage/patches
-rw-r--r--sys-devel/crossdev/Manifest6
-rw-r--r--sys-devel/crossdev/crossdev-20160602.ebuild44
-rw-r--r--sys-devel/crossdev/files/20160602-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch29
-rw-r--r--sys-devel/crossdev/files/20160602-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch45
-rw-r--r--sys-devel/crossdev/files/use-new-path-for-functions.sh.patch11
-rw-r--r--sys-devel/crossdev/metadata.xml15
6 files changed, 0 insertions, 150 deletions
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
deleted file mode 100644
index c4094fe8..00000000
--- a/sys-devel/crossdev/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 20160602-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch 944 SHA256 daaa17bcd3fafc7868a85100a56e93a0e0e43df549749caab6c140d31dbc2d67 WHIRLPOOL 0bae360cea6f7fd588d589164542811133ad2c88bcf4f2ae5ce3d4f2f5e8fb31c78590e53290c3fcb466b0c9fc25054b3dc4d8ff6cbd00fb2943a236ff6316aa
-AUX 20160602-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch 1617 SHA256 875389fa10ddf9c8c335b196ed808262d5d1ba046178e514db991dfa0f0b6144 WHIRLPOOL 9e891d06dd7b1979d0c56d821ce5dd6ecda31587d6ad71c704bd8f65707f7f13c6c8f06c880c2d2f14cc9125fd2db1a4a9d897315976f3991dd0797162f62ed6
-AUX use-new-path-for-functions.sh.patch 298 SHA256 f7b5752c70296552e5520aad107c0bd9543e1c2065622b354cf9064f5c6e99ca WHIRLPOOL 6d3a39f0c783c043775fdec49060f938d8c2b33ce53d91c0ecbfff571064be9278e98c621cfd7bed2136aadee585306b05ddca381f85297fd05b0ae47c0b46ff
-DIST crossdev-20160602.tar.xz 22292 SHA256 12dcbbdedc3f89a7b782c2b61c2956da050cfc95eef860a2f2701bfc89c77ce9 WHIRLPOOL 7ccc23cd01030e1b55266784448187ab30ded10b229b03886faf739fd5d1ed07d73c60fb950c1c28c81e7dd309324bd740d8439640113241f493973ba79b53cd
-EBUILD crossdev-20160602.ebuild 1159 SHA256 4d01a0c853c077b9249eab8422aed7daf87b2ee7fe5070fb41fc820145ed0d03 WHIRLPOOL 9e50469f842e53749666e8ec1b456b75dd9afa0a8303091c780c73ed398f513a72e9e44ef960d2320710c76042ce1daceb15d45e34638d86e5d95edcd4f1ac9c
-MISC metadata.xml 435 SHA256 e94c62eea9868ab7f11ef68b2fdc243334a74f084d11a2e5b609681942da9d60 WHIRLPOOL 9afc41289a89b15268286c92facf16009b84dd23a3b736d713febe1674586ca730fce2d3d4e9a603ca1132ea6c3e0ebdb0df3e9f8b817d2b4c1f9d97ffd1c425
diff --git a/sys-devel/crossdev/crossdev-20160602.ebuild b/sys-devel/crossdev/crossdev-20160602.ebuild
deleted file mode 100644
index 3c336b0c..00000000
--- a/sys-devel/crossdev/crossdev-20160602.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils
-
-if [[ ${PV} == "99999999" ]] ; then
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- SRC_URI="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
- >=app-portage/portage-utils-0.55
- app-shells/bash
- sys-apps/gentoo-functions
- !sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch"
- epatch "${FILESDIR}/${PV}-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch"
- epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-}
-
-src_install() {
- default
- if [[ "${PV}" == "99999999" ]] ; then
- sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
- fi
-}
diff --git a/sys-devel/crossdev/files/20160602-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch b/sys-devel/crossdev/files/20160602-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch
deleted file mode 100644
index 206bef19..00000000
--- a/sys-devel/crossdev/files/20160602-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 27f49510fed5132b062152437b1f90d90cd5a843 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Wed, 18 Jun 2014 19:23:38 +0200
-Subject: [PATCH 1/3] BUG/MEDIUM: cross-pkg-config: Do not unset
- PKG_CONFIG_PATH as can be used to define local .pc location
-
- From: Stefan Schmidt <s.schmidt@samsung.com>
- Subject: PKG_CONFIG_PATH on cross slaves
- Date: Wed, 18 Jun 2014 13:06:20 +0100
- Message-id: <012001cf8aed$b7943760$26bca620$%schmidt@samsung.com>
----
- wrappers/cross-pkg-config | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config
-index 6b68fa7..ff75ccc 100755
---- a/wrappers/cross-pkg-config
-+++ b/wrappers/cross-pkg-config
-@@ -72,7 +72,6 @@ fi
- # Some distributions pollute the pkg-config environment.
- # Time to pull a captain planet on them.
- #
--unset PKG_CONFIG_PATH
- unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
- unset PKG_CONFIG_ALLOW_SYSTEM_LIBS
-
---
-2.4.10
-
diff --git a/sys-devel/crossdev/files/20160602-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch b/sys-devel/crossdev/files/20160602-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch
deleted file mode 100644
index 62040314..00000000
--- a/sys-devel/crossdev/files/20160602-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 73c0fb1e177ab80126a471bcad2e2a8bbb4bed16 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Wed, 18 Jun 2014 20:22:40 +0200
-Subject: [PATCH 3/3] MAJOR: cross-pkg-config: Sanity check should include
- PKG_CONFIG_PATH as SYSROOT
-
-This is a dirty hack done for POSIX sh
----
- wrappers/cross-pkg-config | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config
-index ff75ccc..ba6cb6d 100755
---- a/wrappers/cross-pkg-config
-+++ b/wrappers/cross-pkg-config
-@@ -107,13 +107,25 @@ export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}"
- output=$(pkg-config "$@")
- ret=$?
-
-+# Find all things outside the SYSROOT.
-+grep_opt="-e ${SYSROOT}"
-+
-+# Find all things outside the PKG_CONFIG_PATH (without leading
-+# /lib/pkgconfig).
-+if [ -n "${PKG_CONFIG_PATH}" ] ; then
-+ grep_opt="${grep_opt}
-+ $(echo "${PKG_CONFIG_PATH}" |
-+ tr -s ':' '\n' |
-+ sed -e 's:^:-e :' -e 's:/lib/pkgconfig$::')"
-+fi
-+
- # We turn the output into a newline separate string of options, then use grep
- # to look for bad -Is and -Ls. Bad -Is and -Ls are ones that point to things
- # outside the ${SYSROOT}.
- bad_lines=$(echo "${output}" | # Get the pkg-config output.
- tr -s ' ' '\n' | # Put each flags on its own line.
- grep '^-[LI]' | # Find all -I and -L lines.
-- grep -v -E "..${SYSROOT}" # Find all things outside the SYSROOT.
-+ grep -v -E ${grep_opt}
- )
- if [ -n "${bad_lines}" ] ; then
- warn "### falling down so here is a dump state ######"
---
-2.4.10
-
diff --git a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
deleted file mode 100644
index 8607fc13..00000000
--- a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crossdev.orig 2016-02-18 12:28:49.926442767 -0200
-+++ crossdev 2016-02-18 12:32:25.962433210 -0200
-@@ -15,7 +15,7 @@
-
- CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage"
-
--source /etc/init.d/functions.sh || exit 1
-+source /lib/gentoo/functions.sh || exit 1
- esyslog() { :; }
- die_logs() {
- echo
diff --git a/sys-devel/crossdev/metadata.xml b/sys-devel/crossdev/metadata.xml
deleted file mode 100644
index bc5c2580..00000000
--- a/sys-devel/crossdev/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>
-<maintainer type="person">
-<email>vapier@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-<email>embedded@gentoo.org</email>
-<name>Embedded Gentoo</name>
-</maintainer>
-<maintainer type="project">
-<email>toolchain@gentoo.org</email>
-<name>Gentoo Toolchain Project</name>
-</maintainer>
-</pkgmetadata>