1 |
ulm 15/05/30 08:28:18 |
2 |
|
3 |
Modified: ubin-wrappers-0.ebuild ChangeLog |
4 |
Log: |
5 |
[QA] Do not rely on executable script in files/, do not call Portage internal functions, bug 550540. |
6 |
|
7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: ubin-wrappers-0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- ubin-wrappers-0.ebuild 8 Dec 2012 09:06:05 -0000 1.2 |
23 |
+++ ubin-wrappers-0.ebuild 30 May 2015 08:28:18 -0000 1.3 |
24 |
@@ -1,8 +1,8 @@ |
25 |
-# Copyright 1999-2012 Gentoo Foundation |
26 |
+# Copyright 1999-2015 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild,v 1.2 2012/12/08 09:06:05 ulm Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild,v 1.3 2015/05/30 08:28:18 ulm Exp $ |
30 |
|
31 |
-EAPI=4 |
32 |
+EAPI=5 |
33 |
|
34 |
DESCRIPTION="/usr/bin wrapper scripts for FreeBSD script compatibility" |
35 |
HOMEPAGE="http://www.gentoo.org" |
36 |
@@ -18,12 +18,20 @@ |
37 |
|
38 |
S="${WORKDIR}" |
39 |
|
40 |
-src_install() |
41 |
-{ |
42 |
- |
43 |
- into /usr/bin |
44 |
- "${FILESDIR}/dowrap" "${EPREFIX}/bin/"{bunzip2,bzcat,cpio,egrep,fgrep,grep,gunzip,gzip,zcat} |
45 |
- use userland_BSD && "${FILESDIR}/dowrap" "${EPREFIX}/bin/sort" |
46 |
- use userland_GNU && "${FILESDIR}/dowrap" "${EPREFIX}/bin/"{fuser,sed,uncompress} |
47 |
+dowrap() { |
48 |
+ local x |
49 |
+ for x do |
50 |
+ [[ -e ${x} ]] || die "${x} does not exist" |
51 |
+ newbin - "$(basename "${x}")" <<-EOF |
52 |
+ #!/bin/sh |
53 |
+ exec ${x} \${1:+"\$@"} |
54 |
+ EOF |
55 |
+ done |
56 |
+} |
57 |
|
58 |
+src_install() { |
59 |
+ dowrap \ |
60 |
+ "${EPREFIX}"/bin/{bunzip2,bzcat,cpio,egrep,fgrep,grep,gunzip,gzip,zcat} |
61 |
+ use userland_BSD && dowrap "${EPREFIX}"/bin/sort |
62 |
+ use userland_GNU && dowrap "${EPREFIX}"/bin/{fuser,sed,uncompress} |
63 |
} |
64 |
|
65 |
|
66 |
|
67 |
1.3 sys-freebsd/ubin-wrappers/ChangeLog |
68 |
|
69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/ubin-wrappers/ChangeLog?rev=1.3&view=markup |
70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/ubin-wrappers/ChangeLog?rev=1.3&content-type=text/plain |
71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/ubin-wrappers/ChangeLog?r1=1.2&r2=1.3 |
72 |
|
73 |
Index: ChangeLog |
74 |
=================================================================== |
75 |
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ChangeLog,v |
76 |
retrieving revision 1.2 |
77 |
retrieving revision 1.3 |
78 |
diff -u -r1.2 -r1.3 |
79 |
--- ChangeLog 8 Dec 2012 09:06:05 -0000 1.2 |
80 |
+++ ChangeLog 30 May 2015 08:28:18 -0000 1.3 |
81 |
@@ -1,6 +1,11 @@ |
82 |
# ChangeLog for sys-freebsd/ubin-wrappers |
83 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
84 |
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ChangeLog,v 1.2 2012/12/08 09:06:05 ulm Exp $ |
85 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
86 |
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/ubin-wrappers/ChangeLog,v 1.3 2015/05/30 08:28:18 ulm Exp $ |
87 |
+ |
88 |
+ 30 May 2015; Ulrich Müller <ulm@g.o> ubin-wrappers-0.ebuild, |
89 |
+ -files/dowrap: |
90 |
+ [QA] Do not rely on executable script in files/, do not call Portage internal |
91 |
+ functions, bug 550540. |
92 |
|
93 |
08 Dec 2012; Ulrich Müller <ulm@g.o> ubin-wrappers-0.ebuild: |
94 |
Change LICENSE to public-domain, bug 441832. |