diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-02-02 22:49:38 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-02-02 22:49:38 +0000 |
| commit | 235762f1d378c9304dbff6ce4f369ba9a77834ac (patch) | |
| tree | 0b869a110cb3b15176705ddfb9bfdb0549444444 /app-cdr/cdrtools | |
| parent | Fix compilation on fbsd, bug #256958. (diff) | |
| download | gentoo-2-235762f1d378c9304dbff6ce4f369ba9a77834ac.tar.gz gentoo-2-235762f1d378c9304dbff6ce4f369ba9a77834ac.tar.bz2 gentoo-2-235762f1d378c9304dbff6ce4f369ba9a77834ac.zip | |
Fix etc installation prefix. Thanks to billie for the report.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/cdrtools')
| -rw-r--r-- | app-cdr/cdrtools/ChangeLog | 8 | ||||
| -rw-r--r-- | app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild (renamed from app-cdr/cdrtools/cdrtools-2.01.01_alpha57.ebuild) | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog index 014f69f44846..4d157c58e910 100644 --- a/app-cdr/cdrtools/ChangeLog +++ b/app-cdr/cdrtools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-cdr/cdrtools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.221 2009/02/01 13:45:32 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.222 2009/02/02 22:49:38 loki_val Exp $ + +*cdrtools-2.01.01_alpha57-r1 (02 Feb 2009) + + 02 Feb 2009; Peter Alfredsen <loki_val@gentoo.org> + -cdrtools-2.01.01_alpha57.ebuild, +cdrtools-2.01.01_alpha57-r1.ebuild: + Fix etc installation prefix. Thanks to billie for the report. *cdrtools-2.01.01_alpha57 (01 Feb 2009) diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha57.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild index 4340387447af..daf47798e53e 100644 --- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha57.ebuild +++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha57.ebuild,v 1.1 2009/02/01 13:45:32 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild,v 1.1 2009/02/02 22:49:38 loki_val Exp $ EAPI=2 @@ -26,8 +26,7 @@ PROVIDE="virtual/cdrtools" S="${WORKDIR}/${PN}-2.01.01" src_prepare() { - #Adjust paths - + #"Adjust paths. Upstream is clearly on drugs, hardcoding paths into .c files. sed -i -e 's:opt/schily:usr:' \ $(grep -l --include='*.1' --include='*.8' -r 'opt/schily' .) \ $(grep -l --include='*.c' --include='*.h' -r 'opt/schily' .) \ @@ -37,18 +36,17 @@ src_prepare() { $(grep -l -r 'INSDIR.\+doc' .) \ || die "404 on doc sed" + # Upstream should be hanged from the yardarm, possibly keelhauled for + # not respecting libdir. sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \ $(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \ || die "404 on multilib-sed" - sed -i -e "s:\(^INSDIR=\t\t\)\(etc/default\):\1../\2:" \ - $(grep -l -r '^INSDIR.\+default' .) \ - || die "404 on etc sed" - + # See previous comment s/libdir/--disable-static/ sed -i -e 's:include\t\t.*rules.lib::' \ $(grep -l -r '^include.\+rules\.lib' .) \ || die "404 on rules sed" - #Remove profiled make files + #Remove profiled make files (wtf?) rm -f $(find . -name '*_p.mk') || die "rm failed" epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch @@ -98,7 +96,7 @@ src_compile() { } src_install() { - emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}/etc/default" install + emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}" install #These symlinks are for compat with cdrkit. dosym schily /usr/include/scsilib |