1 |
darkside 10/11/24 16:18:39 |
2 |
|
3 |
Modified: ChangeLog tar-1.25.ebuild |
4 |
Log: |
5 |
Merge diffs from Gentoo Prefix tree. Keywords, EAPI3, use of EPREFIX/ED, modify rmt script. Signed off in bug 344807 |
6 |
|
7 |
(Portage version: 2.1.9.24/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.160 app-arch/tar/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/tar/ChangeLog?rev=1.160&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/tar/ChangeLog?rev=1.160&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/tar/ChangeLog?r1=1.159&r2=1.160 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v |
19 |
retrieving revision 1.159 |
20 |
retrieving revision 1.160 |
21 |
diff -u -r1.159 -r1.160 |
22 |
--- ChangeLog 8 Nov 2010 20:57:35 -0000 1.159 |
23 |
+++ ChangeLog 24 Nov 2010 16:18:39 -0000 1.160 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for app-arch/tar |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.159 2010/11/08 20:57:35 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.160 2010/11/24 16:18:39 darkside Exp $ |
29 |
+ |
30 |
+ 24 Nov 2010; Jeremy Olexa <darkside@g.o> tar-1.25.ebuild, |
31 |
+ files/rmt: |
32 |
+ Merge diffs from Gentoo Prefix tree. Keywords, EAPI3, use of EPREFIX/ED, |
33 |
+ modify rmt script. Signed off in bug 344807 |
34 |
|
35 |
*tar-1.25 (08 Nov 2010) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 app-arch/tar/tar-1.25.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/tar/tar-1.25.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/tar/tar-1.25.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/tar/tar-1.25.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: tar-1.25.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- tar-1.25.ebuild 8 Nov 2010 20:57:35 -0000 1.1 |
53 |
+++ tar-1.25.ebuild 24 Nov 2010 16:18:39 -0000 1.2 |
54 |
@@ -1,8 +1,8 @@ |
55 |
# Copyright 1999-2010 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v 1.1 2010/11/08 20:57:35 ssuominen Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v 1.2 2010/11/24 16:18:39 darkside Exp $ |
59 |
|
60 |
-EAPI="2" |
61 |
+EAPI="3" |
62 |
|
63 |
inherit flag-o-matic |
64 |
|
65 |
@@ -14,7 +14,7 @@ |
66 |
|
67 |
LICENSE="GPL-3" |
68 |
SLOT="0" |
69 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
70 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
71 |
IUSE="nls static userland_GNU" |
72 |
|
73 |
RDEPEND="" |
74 |
@@ -39,8 +39,8 @@ |
75 |
FORCE_UNSAFE_CONFIGURE=1 \ |
76 |
econf \ |
77 |
--enable-backup-scripts \ |
78 |
- --bindir=/bin \ |
79 |
- --libexecdir=/usr/sbin \ |
80 |
+ --bindir="${EPREFIX}"/bin \ |
81 |
+ --libexecdir="${EPREFIX}"/usr/sbin \ |
82 |
$(use_enable nls) \ |
83 |
${myconf} |
84 |
} |
85 |
@@ -57,10 +57,16 @@ |
86 |
doexe "${FILESDIR}"/rmt || die |
87 |
fi |
88 |
|
89 |
+ # autoconf looks for gtar before tar (in configure scripts), hence |
90 |
+ # in Prefix it is important that it is there, otherwise, a gtar from |
91 |
+ # the host system (FreeBSD, Solaris, Darwin) will be found instead |
92 |
+ # of the Prefix provided (GNU) tar |
93 |
+ if use prefix ; then |
94 |
+ dosym tar /bin/gtar |
95 |
+ fi |
96 |
+ |
97 |
dodoc AUTHORS ChangeLog* NEWS README* THANKS |
98 |
newman "${FILESDIR}"/tar.1 ${p}tar.1 |
99 |
- mv "${D}"/usr/sbin/${p}backup{,-tar} |
100 |
- mv "${D}"/usr/sbin/${p}restore{,-tar} |
101 |
- |
102 |
- rm -f "${D}"/usr/$(get_libdir)/charset.alias |
103 |
+ mv "${ED}"/usr/sbin/${p}backup{,-tar} |
104 |
+ mv "${ED}"/usr/sbin/${p}restore{,-tar} |
105 |
} |