Fix etc installation prefix. Thanks to billie for the report.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 16 insertions, 12 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/Manifest b/app-cdr/cdrtools/Manifest
index 8518a188c62f..01cff27469a4 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -8,6 +8,6 @@ DIST cdrtools-2.01.01a57.tar.bz2 1779673 RMD160 d7e8ea512a1e8ecaf3be6a9c4a782ff1
 EBUILD cdrtools-2.01.01_alpha34.ebuild 3283 RMD160 d7a7088ce7a8b6de2df25276c7635ea5e85850fd SHA1 754c2540fd8496d5d4ab32e2205f6cbcd9055530 SHA256 6affcfa4d74884f1f84511edd7832627837630a210de103d13a373fb6f2a1bc8
 EBUILD cdrtools-2.01.01_alpha51.ebuild 3199 RMD160 995a34c6e3769decea8fc4f98ea5cdf77cc8aa35 SHA1 d18ba43829a41a094227566dd95a21c8a69353aa SHA256 5462737a98fc09642b8f40430d95a94dba5ce7c0ccde016bb72b1c1e06412b9a
 EBUILD cdrtools-2.01.01_alpha53.ebuild 3212 RMD160 d08f9f1c6de1b5ff1354f6557048e8150352e11e SHA1 f87a638e071c44e70be78c487f875c7988fcd100 SHA256 f0076c0d10b5c8a5a60d79a65b5ff97029da09f8a898c86d0949740a1a03db41
-EBUILD cdrtools-2.01.01_alpha57.ebuild 3717 RMD160 7e55d615e46551111904417e78b3f8bd0434f44d SHA1 3707e10b7ca22bd2c95584e9af7aa5cdd1e05264 SHA256 6b14e139e1bc75a9ef6abb26b3ef3badceba160852da176060b8241465ca241b
-MISC ChangeLog 34057 RMD160 323a1f91e34bad4ee4424951291070daf6a40256 SHA1 9c1de0114405f23a22bee700aed76bc9c5ab3c4a SHA256 34bb86dd8ccec24f637b48301d5b752cb7383b708e2009eebf671f99049f42ee
+EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3801 RMD160 1c454b34c2f8bfee2aa0bb7da65acc08949e7048 SHA1 657d2cbcea97b7ea8d7cf18b5155bfc6b841f3b5 SHA256 6bf45c79725a6950376144e2adc22b9186f759824b6d017adc05573a3a80a0b9
+MISC ChangeLog 34292 RMD160 93713b8e46d2d57f904e3f3ad5759643411b3133 SHA1 43c0c6eaede70d4a1040e548329bcf8737c4c16d SHA256 6287e534688198a50ccdcd0cc8225a3426ca450fa2295019af00d990dd7d8cf3
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
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