Use sys-apps/gentoo-functions, bug #504388.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

5 files changed, 57 insertions, 20 deletions

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/Manifest b/app-arch/makeself/Manifest
index 47d819660e81..3b1c0c98c9a2 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -2,27 +2,30 @@
 Hash: SHA256
 
 AUX makeself-2.2.0-help-header.patch 6728 SHA256 81a174702c496fc0624c6ed7c69a0cd7df8d1c673a411bba019d2d55cc4b4efc SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c WHIRLPOOL a2aa84ed6d7bb804b12073651bf2d4fcfc03176a0437a86aac04647dd9d5683fd701e3e5c3e9e9214039ecb00e31c374e24e852d7f3382fc127854390848b5e8
-AUX makeself-unpack 2814 SHA256 5cd5e71f6aa5f12f4ff1d8f54820ba7c049827ef8684af70d7b74a0764dbdfaf SHA512 dc2ffc94a2a48eefc667cb8cd77b7ea91da3b299572928412bc323c2cfe328775d3de0c6f7bc191cd6f785cee9c39a592201e17efa917a700f8ebec2ddc93527 WHIRLPOOL 0de03c49b182c2536ebb6104cfec61336acdc8f57347dff14e1e09030362e0d10c56c48f3f9ccfecd9d241e7d0965a5d6f5330c6c914ee44f119283fe358e35b
+AUX makeself-unpack 2814 SHA256 2dbeea9bf230e5beaeefc53cc436d0b7c91654780c1544eec51dad80e22ed90c SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3 WHIRLPOOL 8c98a70fdfb30625570637c4354135531ed6dc7b04b1aed6982c0782c8da113191d65c9ecc3c39d4299076408bf2a32aab0afde44f90375c3df6707acda291aa
 DIST makeself-2.1.5.run 38210 SHA256 8227668bb35c34d86e6f0fe69c7bf4bd2813f51edfcbfc227896b4787b0a1a4e SHA512 c556770deea504573c50bc7c15340ed91c65d372e93c47dfc10fd6e8265b2462842da12b36898d4291cbac9e954ec12f2f6972bcf40e97ed82dbd22af21d3a91 WHIRLPOOL 6e6be1c047238280f737611049af7daa0902b52e7d065033f7ead665614da809bc1f5903b6163c768f191bf7e0ced566ac6168ab6fc5604bc1d2fed8dac72e37
 DIST release-2.2.0.tar.gz 21640 SHA256 9c9d003e097d9c198433a05926e64d9b7cd330c7f10cb4e6048877d0a87de341 SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73 WHIRLPOOL ec9d7caa4ffed938e61e756636af04cf793158761c3a2b41e7ee4c18a415d6a41a4ed4499bd0b867dee930f281f901a80082bed75d9e9d7e237f3f85ad7ea590
 EBUILD makeself-2.1.5-r1.ebuild 692 SHA256 e10e16665083f57410bc744cf31a9086fd9eb43a2933afdc78ac5ba7710009fb SHA512 71446f3f761c27487480652110f518ce91fd4b088c18693ebddf089938f5c796c8e6e7e392cf5775698d3306f90dc9465326374f81b936e43b7ecece27cb9f1f WHIRLPOOL d08cc76606166af1774d83b855cfd52eaaeaf07b3372d31b4d5a344bb296073ceadaa8c206fa7661a77e54b9227d455eac360b5d1f53cf44661ae37b6bac8beb
-EBUILD makeself-2.2.0.ebuild 810 SHA256 de4a89b1e3ddf13f0ac97fbf85f62699ed347dff77085e649df5b737f1a7a021 SHA512 9ef2053d3f9656fa29c220465e19bb8b3b66fff4573785e21ba78c202bc656b5465a6588e2d250e93aac7d72c6f0f7c25dbc0237305732e20266f07fda5ace1f WHIRLPOOL 8c2cf0b4d30aa176167be1d72f971141ec3339a14ff76d653ad5ada900cb0396be85bf391cd64d13fdf4949be18e8da821b48624adcf26ba97eab7d57982c7e3
-MISC ChangeLog 3849 SHA256 f8b2a964730ee62bcac195b81d5cda7bdfad7b247e7191b118ac7ab260e2adf2 SHA512 52be1481f05e4b307f4fbe25d4e190fb8cb9b06e29af62cb812d37a5b884ad2eac89ee309402b0e46d96433ce482344313e5183970f87d72df3a2d02952a65f4 WHIRLPOOL 3c143ad341618ae2e7a1ecd8dd20a9f1e7d64d72fb726f766e8c8c268a782cb3fcfdfb001dd6ddb8bfff98a0d8b78c6f940382a0ecfbfb69777b4ebd48f2eeaa
+EBUILD makeself-2.1.5-r2.ebuild 732 SHA256 3559b591329b420bf28564f7a65b00af8efe05609424253575afeacfdbd68cbf SHA512 3b0abff9cc58a2ea1cf2daf9f3abb9f8c97fc58c901447aafcd4907f55f79461dbd2f3d0cd696d0efa8e69db8576d25aa253fca9d57c93766870333c3c019f63 WHIRLPOOL ec3c2ac0b7f0d036060d9f777f6a3a97ec0bd1569fb787d38e2e0a648456fbbee83fcd58fa82dca8de1d8607c2beadcd012def90b4966753f6deede7d6418dc4
+EBUILD makeself-2.2.0-r1.ebuild 850 SHA256 616803d3636ae643038fba01f6866de8258adbe86704e6b96ca4b26b547cb617 SHA512 8d16c602ad6c4be2b0454d3a65bfd0b8f1e2db9e420674b868c40be3b5e040f31a83bbf5880a3f4f246b24a86b5524baead549aff7e92db4b21dd29744868c54 WHIRLPOOL a7a7892023b06a9b9614616fe188144177cb99c11dc67259189ac0288692b9730557556c81a5c96d578ddd38a6e725f713a21ba0d831c3bf566e13563d4c19a6
+MISC ChangeLog 4116 SHA256 ecb77ab365261c1291a47c57fb30396d618a427ffffa92e327ce97e0703141f8 SHA512 be343c72fe96dac518502ec9d48e99f459511886faf6d9975faf845ef029b3303dddee9969c16030f1d1759759a43a1eae784214797d853f94b08140507fbdea WHIRLPOOL fa2ac0223a44cf3739144958b0e1dfd07ce219b6961239c9d5fcb10bb5a25d73d1c28cea849d7f054c44aebc2fb63880726a9b1b10159468ccf39a00b8b045ea
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTAvtSAAoJEPGu1DbS6WIAyY8P/26MkivYymUGsT4EEJWrW9ow
-wtmvBLpMX+6WW4ImO7a4VrVsQeEIpqYNfGus/iVjKKB1s4/r9DiJS3+jCVhaRHny
-5XRYYxrZ3lx+phT1lc0QWmktLKmeuB0XPrLhdx6jcEPGm9R3rDiAlEN1Eiq1eMmV
-ax0EH3MD0vAzkZK2dVUCxsoopGGF/vKcpUvd8FcS5Adbfij5FOPFx9NvgdBUBQDx
-CkD+Ng5eQA38GnrxN0FSa1u52O59DfKCrPCHFgjGCOvJQmycTbLXVgo8DPbvVjDQ
-xFiefPR23bnANJLrXmIuAODpSazypLUK8uY+RVyiAz6X9qH/xkxfM8BV8qpnce43
-j2qlny3DiqGlgxKK8RfRTtZDYxPAKch1aicyIqxW5bN1PbJ5FhLNLSjYKRWS3Dhb
-mHuN3AY+srkA6ejeDYY+5CsVjDS5W0BNd0HnzXvlJT+nV4HjUAawXwkqwaQpMVOh
-QV77T05v/nWsY1bkVKs60KH6wkZ744qtNyqIioexu307kuAsKPUVzedljtcAd/l0
-X3Pbx1zdxMeE5Ao+nrx9ksR+B7UNqOM4/2xgw5LQ9PTDd/7IkqH6O8N58cTrfJL/
-DkzbeHhRWB3vaNuO3j+Z/N6ZRGhZpSoPnFJilKo7Qr7SAuPwDdVGa8bkDUijoPAQ
-odd7ZvVAh6jq6C2WAfMd
-=Z4Du
+iQJ8BAEBCABmBQJUlthkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKhQQANWhPeCJ/O4q4NqWBVqIlhlx
++E1YR2YZ9kjX/O5AiY6JO29XaWXuPkeEGz87wfWCcU/iS4pPArZ9qje9etk4p+In
+YrimddznjKWiQ/9QHnl+buiNV4aEeLlT/s7u9yOswj7TzdtWAIuBdJQua9aHLf1X
+1UU0bZSpy9UE1AZs22r4m53GPgCZIXBoYqLzJJubLbEA5K/dpwxT/5JmyHPaKBll
+lC3HY0oIeijJdYd+A1bE5HH9ztCIazq4B9cktbLqLTqW8krziShcCYzASIt+qpWn
+qUIpx7HB5a+HK0bFRTHXfzjLM9nNwqXuJiaVDNJrboJsAYYTS2rN/U04KcEB/KRY
+5KeBCJIOc8dj6R9tnURF4KvECM256gMkkF8BnWqB1YpyABlRIP0ZzBiFfuxzbNHn
+iuj4FapTZI0uT/M1BGn6KRQjtnsYXO9xyIM6azljfbxFCALnrZEabvPTbSIikKNq
+HlGjawKynejEstsHCL8S2C0q1tM9Z4ui6oLAd9gD8sWxtqAc2brpL8V3JlKyIBz4
+OTlLgh4veonnMQX0RTMfOIuttMpNX4PgAeDj8zqnT9K4XXhjLci9a/WQEBz6mtSp
+oopkHefc41k5CL2eXBs3IPz7Dg5cUPbhrYy+GCnzO8Fn3/SuhSLh0yoSNZ0KX839
+TC+CcIbG2nlKUt3SDa3m
+=A2Ah
 -----END PGP SIGNATURE-----
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.ebuild b/app-arch/makeself/makeself-2.2.0-r1.ebuild
index 5a486145b708..b2b2eb9e6b70 100644
--- a/app-arch/makeself/makeself-2.2.0.ebuild
+++ b/app-arch/makeself/makeself-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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"
 
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
+RDEPEND="sys-apps/gentoo-functions"
+
 S="${WORKDIR}/${PN}-release-${PV}"
 
 src_prepare() {