From 2b4fe427eee32108f9d984675c5993788ffde1ed Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 21 Dec 2014 14:25:39 +0000
Subject: Use sys-apps/gentoo-functions, bug #504388.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
---
 app-arch/makeself/ChangeLog                |  9 ++++++++-
 app-arch/makeself/files/makeself-unpack    |  2 +-
 app-arch/makeself/makeself-2.1.5-r2.ebuild | 25 ++++++++++++++++++++++++
 app-arch/makeself/makeself-2.2.0-r1.ebuild | 31 ++++++++++++++++++++++++++++++
 app-arch/makeself/makeself-2.2.0.ebuild    | 29 ----------------------------
 5 files changed, 65 insertions(+), 31 deletions(-)
 create mode 100644 app-arch/makeself/makeself-2.1.5-r2.ebuild
 create mode 100644 app-arch/makeself/makeself-2.2.0-r1.ebuild
 delete mode 100644 app-arch/makeself/makeself-2.2.0.ebuild

(limited to 'app-arch')

diff --git a/app-arch/makeself/ChangeLog b/app-arch/makeself/ChangeLog
index 8b1b0b3cf06f..47625974ac03 100644
--- a/app-arch/makeself/ChangeLog
+++ b/app-arch/makeself/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/makeself
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/ChangeLog,v 1.32 2014/02/18 06:18:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/ChangeLog,v 1.33 2014/12/21 14:25:39 mgorny Exp $
+
+*makeself-2.2.0-r1 (21 Dec 2014)
+*makeself-2.1.5-r2 (21 Dec 2014)
+
+  21 Dec 2014; Michał Górny <mgorny@gentoo.org> +makeself-2.1.5-r2.ebuild,
+  +makeself-2.2.0-r1.ebuild, -makeself-2.2.0.ebuild, files/makeself-unpack:
+  Use sys-apps/gentoo-functions, bug #504388.
 
 *makeself-2.2.0 (18 Feb 2014)
 
diff --git a/app-arch/makeself/files/makeself-unpack b/app-arch/makeself/files/makeself-unpack
index d8f5e17d194c..90b98312c8b9 100755
--- a/app-arch/makeself/files/makeself-unpack
+++ b/app-arch/makeself/files/makeself-unpack
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Glue to keep unpack_makeself() unchanged
-source /etc/init.d/functions.sh
+source /lib/gentoo/functions.sh
 find_unpackable_file() { echo "$@"; }
 debug-print() { :; }
 emktemp() { mktemp "$@"; }
diff --git a/app-arch/makeself/makeself-2.1.5-r2.ebuild b/app-arch/makeself/makeself-2.1.5-r2.ebuild
new file mode 100644
index 000000000000..6dd500bf94af
--- /dev/null
+++ b/app-arch/makeself/makeself-2.1.5-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/makeself-2.1.5-r2.ebuild,v 1.1 2014/12/21 14:25:39 mgorny Exp $
+
+inherit unpacker
+
+DESCRIPTION="shell script that generates a self-extractible tar.gz"
+HOMEPAGE="http://www.megastep.org/makeself/"
+SRC_URI="http://www.megastep.org/makeself/${P}.run"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-apps/gentoo-functions"
+
+S=${WORKDIR}
+
+src_install() {
+	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack || die
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README TODO makeself.lsm
+}
diff --git a/app-arch/makeself/makeself-2.2.0-r1.ebuild b/app-arch/makeself/makeself-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..b2b2eb9e6b70
--- /dev/null
+++ b/app-arch/makeself/makeself-2.2.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/makeself-2.2.0-r1.ebuild,v 1.1 2014/12/21 14:25:39 mgorny Exp $
+
+EAPI="4"
+
+inherit unpacker eutils
+
+DESCRIPTION="shell script that generates a self-extractible tar.gz"
+HOMEPAGE="http://www.megastep.org/makeself/"
+SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-apps/gentoo-functions"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-help-header.patch
+}
+
+src_install() {
+	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README.md makeself.lsm
+}
diff --git a/app-arch/makeself/makeself-2.2.0.ebuild b/app-arch/makeself/makeself-2.2.0.ebuild
deleted file mode 100644
index 5a486145b708..000000000000
--- a/app-arch/makeself/makeself-2.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/makeself-2.2.0.ebuild,v 1.1 2014/02/18 06:18:50 vapier Exp $
-
-EAPI="4"
-
-inherit unpacker eutils
-
-DESCRIPTION="shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
-SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-help-header.patch
-}
-
-src_install() {
-	dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack
-	dosym makeself.sh /usr/bin/makeself
-	doman makeself.1
-	dodoc README.md makeself.lsm
-}
-- 
cgit v1.2.3-65-gdbad