Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 253753 Details for
Bug 344807
Please review EAPI3/Gentoo Prefix changes for =app-arch/tar-1.25
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
tar-1.2.5.diff
tar-1.2.5.diff (text/plain), 3.11 KB, created by
Jeremy Olexa (darkside) (RETIRED)
on 2010-11-09 15:30:48 UTC
(
hide
)
Description:
tar-1.2.5.diff
Filename:
MIME Type:
Creator:
Jeremy Olexa (darkside) (RETIRED)
Created:
2010-11-09 15:30:48 UTC
Size:
3.11 KB
patch
obsolete
>? tar-1.23-r4.ebuild.1 >Index: tar-1.25.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v >retrieving revision 1.1 >diff -u -r1.1 tar-1.25.ebuild >--- tar-1.25.ebuild 8 Nov 2010 20:57:35 -0000 1.1 >+++ tar-1.25.ebuild 9 Nov 2010 15:29:59 -0000 >@@ -2,9 +2,9 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v 1.1 2010/11/08 20:57:35 ssuominen Exp $ > >-EAPI="2" >+EAPI="3" > >-inherit flag-o-matic >+inherit flag-o-matic prefix > > DESCRIPTION="Use this to make tarballs :)" > HOMEPAGE="http://www.gnu.org/software/tar/" >@@ -14,7 +14,7 @@ > > LICENSE="GPL-3" > SLOT="0" >-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" >+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" > IUSE="nls static userland_GNU" > > RDEPEND="" >@@ -28,10 +28,15 @@ > scripts/{backup,dump-remind,restore}.in \ > || die "sed non-GNU" > fi >+ >+ cp "${FILESDIR}"/rmt "${T}" >+ eprefixify ${T}/rmt > } > > src_configure() { > local myconf >+ # hack around ld: duplicate symbol _argp_fmtstream_putc problem >+ [[ ${CHOST} == *-darwin* ]] && append-flags -U__OPTIMIZE__ > use static && append-ldflags -static > use userland_GNU || myconf="--program-prefix=g" > # Work around bug in sandbox #67051 >@@ -39,8 +44,8 @@ > FORCE_UNSAFE_CONFIGURE=1 \ > econf \ > --enable-backup-scripts \ >- --bindir=/bin \ >- --libexecdir=/usr/sbin \ >+ --bindir="${EPREFIX}"/bin \ >+ --libexecdir="${EPREFIX}"/usr/sbin \ > $(use_enable nls) \ > ${myconf} > } >@@ -54,13 +59,19 @@ > if [[ -z ${p} ]] ; then > # a nasty yet required piece of baggage > exeinto /etc >- doexe "${FILESDIR}"/rmt || die >+ doexe "${T}"/rmt || die >+ fi >+ >+ # autoconf looks for this, so in prefix, make sure it is there >+ if use prefix ; then >+ dodir /usr/bin >+ dosym /bin/tar /usr/bin/gtar > fi > > dodoc AUTHORS ChangeLog* NEWS README* THANKS > newman "${FILESDIR}"/tar.1 ${p}tar.1 >- mv "${D}"/usr/sbin/${p}backup{,-tar} >- mv "${D}"/usr/sbin/${p}restore{,-tar} >+ mv "${ED}"/usr/sbin/${p}backup{,-tar} >+ mv "${ED}"/usr/sbin/${p}restore{,-tar} > >- rm -f "${D}"/usr/$(get_libdir)/charset.alias >+ rm -f "${ED}"/usr/$(get_libdir)/charset.alias > } >Index: files/rmt >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/app-arch/tar/files/rmt,v >retrieving revision 1.2 >diff -u -r1.2 rmt >--- files/rmt 30 Dec 2006 18:18:16 -0000 1.2 >+++ files/rmt 9 Nov 2010 15:29:59 -0000 >@@ -1,8 +1,8 @@ >-#!/bin/sh >+#!@GENTOO_PORTAGE_EPREFIX@/bin/sh > # > # This is not a mistake. This shell script (/etc/rmt) has been provided > # for compatibility with other Unix-like systems, some of which have > # utilities that expect to find (and execute) rmt in the /etc directory > # on remote systems. > # >-exec /usr/sbin/rmt "$@" >+exec @GENTOO_PORTAGE_EPREFIX@/usr/sbin/rmt "$@"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 344807
:
253753
|
253897
|
253913
|
254401