* [gentoo-commits] repo/gentoo:master commit in: sys-devel/crossdev/files/, sys-devel/crossdev/
@ 2016-02-19 22:12 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2016-02-19 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 83ff3dd2c6eea0aeb079ccfcd57f0608d9572827
Author: Lara Maia <dev <AT> lara <DOT> click>
AuthorDate: Thu Feb 18 14:51:24 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 14:53:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ff3dd2
sys-devel/crossdev: Update crossdev to use new path for functions.sh
https://bugs.gentoo.org/show_bug.cgi?id=538656
...{crossdev-99999999.ebuild => crossdev-20151026-r1.ebuild} | 12 +++++++++---
sys-devel/crossdev/crossdev-99999999.ebuild | 12 +++++++++---
sys-devel/crossdev/files/use-new-path-for-functions.sh.patch | 11 +++++++++++
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
similarity index 80%
copy from sys-devel/crossdev/crossdev-99999999.ebuild
copy to sys-devel/crossdev/crossdev-20151026-r1.ebuild
index 3b816c2..eb84933 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
+inherit eutils
if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
@@ -26,7 +27,12 @@ RDEPEND=">=sys-apps/portage-2.1
>=app-portage/portage-utils-0.55
app-shells/bash
!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
+DEPEND="app-arch/xz-utils
+ sys-apps/gentoo-functions"
+
+src_prepare() {
+ epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+}
src_install() {
default
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index 3b816c2..eb84933 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
+inherit eutils
if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
@@ -26,7 +27,12 @@ RDEPEND=">=sys-apps/portage-2.1
>=app-portage/portage-utils-0.55
app-shells/bash
!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
+DEPEND="app-arch/xz-utils
+ sys-apps/gentoo-functions"
+
+src_prepare() {
+ epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
+}
src_install() {
default
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
new file mode 100644
index 0000000..8607fc1
--- /dev/null
+++ b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
@@ -0,0 +1,11 @@
+--- 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/crossdev/files/, sys-devel/crossdev/
@ 2018-01-07 14:47 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2018-01-07 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 242818caca1872ba322e68823e2ace129a80b6b0
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 14:46:57 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 14:47:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242818ca
sys-devel/crossdev: drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-devel/crossdev/Manifest | 3 --
sys-devel/crossdev/crossdev-20151026-r1.ebuild | 41 ----------------------
sys-devel/crossdev/crossdev-20171119.ebuild | 35 ------------------
sys-devel/crossdev/crossdev-20171227.ebuild | 35 ------------------
.../files/use-new-path-for-functions.sh.patch | 11 ------
5 files changed, 125 deletions(-)
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 4f79f2c7b8c..2f079df45e9 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,5 +1,2 @@
-DIST crossdev-20151026.tar.xz 22160 BLAKE2B 36cd292ffc9e8051d2684315a1546260ea3de9ff6c1324d8c0463501c1ab2671a998f176220220f8050d3d816bff48d1e263b35fcc50139e6149965d4d163b30 SHA512 f60efd4ad867efd0eb33de5fe327ccbfe73b574c97507bc0edd7ef141ad74c035ae2a0d446180e6a9eb5f43197f44933a452245feec849bacfb03fc07067edd0
-DIST crossdev-20171119.tar.xz 22596 BLAKE2B 4e606f63aad234684b6400203fc22a9ff7dbd9f14dca5e2f2055f08207e412a3a3352921109100b32b4f6fb51cc0836ada4e8db8011d781e9e7c990d6c92d3d1 SHA512 3b8d7b89adf06d5ffef169ed1015532220c997731e083fd73c27d80ea09a6a7efd456734104aa58ef386426f9a04fed3147f37aefe4106c378a0b865bfffb2f0
-DIST crossdev-20171227.tar.xz 22780 BLAKE2B 983dd5da66c1e467b622867c9d474c7e1b7befd4fb91e1e008f7d7d8416bb077bcd06274fe8145ec9338f652e780d2ddd3a501f79b46af280cb5dbb4c8324965 SHA512 bc91e95aa9a927416f2b97b989657de5a740707bb4f4cbfc3d9e0626c3977b3091040104a52205762ef9cc0d3cd7933fb527efa20086dedfd9b390dc2be167a0
DIST crossdev-20171230.tar.xz 23016 BLAKE2B 4661b3f9fac314b7346f0de7227d12ae2d6851e448f6d065471499df8ada5d699ef91c6b6bca285b2aefcbf67ab351fefbe9344c0884a7c0d33ff27215c8ed9c SHA512 bf8761a3018790501adb4bb173e3281d1d7628de8f65a1aa5df0b328a4af8088be466dbe8c185e7ed44aca31b078320a4f62c56351f4b7cbf832349184d9709f
DIST crossdev-20180105.tar.xz 23056 BLAKE2B 66618f312b6f9492b1ccbdc7142e6b38035bb52f864a53d5b6afed702f31dcad11d647af68239dd6cb1af06b7eee5046507cffb03aabb27f758d0513ae9aa888 SHA512 f10ac454a996268e0bf798e2e322961873f3666c032f0ea3a0bc88eabd0428d894726726b089ca180ff9b718b5041be136c28a572ffb31fde76b8ac58a8fc1f2
diff --git a/sys-devel/crossdev/crossdev-20151026-r1.ebuild b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
deleted file mode 100644
index e13edd3253a..00000000000
--- a/sys-devel/crossdev/crossdev-20151026-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}"/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/crossdev-20171119.ebuild b/sys-devel/crossdev/crossdev-20171119.ebuild
deleted file mode 100644
index 73d9c469006..00000000000
--- a/sys-devel/crossdev/crossdev-20171119.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
- SRC_URI="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~slyfox/distfiles/${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_install() {
- default
-
- if [[ "${PV}" == "99999999" ]] ; then
- sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
- fi
-}
diff --git a/sys-devel/crossdev/crossdev-20171227.ebuild b/sys-devel/crossdev/crossdev-20171227.ebuild
deleted file mode 100644
index 73d9c469006..00000000000
--- a/sys-devel/crossdev/crossdev-20171227.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
- SRC_URI="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~slyfox/distfiles/${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_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/use-new-path-for-functions.sh.patch b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
deleted file mode 100644
index 6d45575a7d9..00000000000
--- a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crossdev.orig 2016-02-18 12:28:49.926442767 -0200
-+++ b/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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-07 14:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-19 22:12 [gentoo-commits] repo/gentoo:master commit in: sys-devel/crossdev/files/, sys-devel/crossdev/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2018-01-07 14:47 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox