Fix manpages and docs not being installed to the right place. Fixup mulilib sed. Sincerest thanks to Daniel Pielmeyer (billie on IRC) daniel.pielmeier@googlemail.com for noticing these things and proposing solutions.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25.8 i686

3 files changed, 37 insertions, 9 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 226bf403d666..c0f84300394c 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.208 2008/09/28 06:42:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.209 2008/09/28 13:47:01 loki_val Exp $
+
+*cdrtools-2.01.01_alpha50-r1 (28 Sep 2008)
+
+  28 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -cdrtools-2.01.01_alpha50.ebuild, +cdrtools-2.01.01_alpha50-r1.ebuild:
+  Fix manpages and docs not being installed to the right place. Fixup
+  mulilib sed. Sincerest thanks to Daniel Pielmeyer (billie on IRC)
+  daniel.pielmeier@googlemail.com for noticing these things and proposing
+  solutions.
 
   28 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
   cdrtools-2.01.01_alpha50.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 338eefe64ec2..ea0378b93830 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -8,6 +8,6 @@ DIST cdrtools-2.01.01a50.tar.bz2 1698339 RMD160 2c6c7e99e97635d1b7443596edf8c3af
 EBUILD cdrtools-2.01.01_alpha34.ebuild 3283 RMD160 d7a7088ce7a8b6de2df25276c7635ea5e85850fd SHA1 754c2540fd8496d5d4ab32e2205f6cbcd9055530 SHA256 6affcfa4d74884f1f84511edd7832627837630a210de103d13a373fb6f2a1bc8
 EBUILD cdrtools-2.01.01_alpha41.ebuild 3323 RMD160 e12adfdd53b00290a946306599a121f63c0a7249 SHA1 ee1747f6f430980bd03c3ed533cff504d6a84e16 SHA256 c177e7cf4154600dd39878a9ac7233c696c68d2767bd4f669365b2f31d97f35d
 EBUILD cdrtools-2.01.01_alpha42.ebuild 3324 RMD160 acb08049b7f3a096d24638a0d5cf8ac0826a1a37 SHA1 ea2e14dbb6f7617e9034d3dbcdb8a50f75367567 SHA256 0563a81a026e28b455550c112c921f65a32204f305229ff517db08b66c464b43
-EBUILD cdrtools-2.01.01_alpha50.ebuild 2618 RMD160 466f57e945cd040aa045c3a6607f0fe3f093d443 SHA1 3844cab485f1e0bb4f216107c4dc98099ac65832 SHA256 924519d685c01d35d6089cee3b1ec5381f05057668d7a9cf330655aab60d44ce
-MISC ChangeLog 31571 RMD160 8ab5cd9b81991a729ff1f385956443ba5547fa3b SHA1 e067249ea5b926e9192f7da8aa5aaebd734410ec SHA256 27a776b454f819576edc184609db52ac9de6a35860c804cfc9ed7e6cb3648004
+EBUILD cdrtools-2.01.01_alpha50-r1.ebuild 3078 RMD160 16d52e2c50b14dc8fb5c0f465a2bb85a8689c8a1 SHA1 5af42d0836650f5288f99cd16d3339cac4d519b0 SHA256 b645f2cbcebb60876a2c1f8b533f416a55ff338f87e662eb28ce09edac25ae59
+MISC ChangeLog 31967 RMD160 0005d24809290f1000e8219433cc20077f0d5e50 SHA1 b5b4e3be8a487f97e82153dfd571ddcb7c466d8a SHA256 128dd44a047e23f464522031bdfaff258e5348593850a14684ecb7aebd517a59
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha50.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r1.ebuild
index 75e0c617e516..f3d80c601ada 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha50.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_alpha50.ebuild,v 1.4 2008/09/28 06:42:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r1.ebuild,v 1.1 2008/09/28 13:47:01 loki_val Exp $
 
 inherit multilib eutils toolchain-funcs flag-o-matic
 
@@ -25,20 +25,29 @@ S="${WORKDIR}/${PN}-2.01.01"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e "/INSDIR/ s/lib/$(get_libdir)/" \
-		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
-		|| die "404 on multilib-sed"
+
+	#Adjust paths
 
 	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' .) \
 		|| die "404 on opt-schily sed"
 
+	sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
+		$(grep -l -r 'INSDIR.\+doc' .) \
+		|| die "404 on doc sed"
+
+	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
+		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
+		|| die "404 on multilib-sed"
+
+	#Remove profiled make files
 	rm -f $(find . -name '*_p.mk')
 
 	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
 	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
 
+	#Schily make setup
 	cd "${S}"/DEFAULTS
 	local MYARCH="linux"
 
@@ -68,15 +77,25 @@ src_compile() {
 			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
 		fi
 	fi
-	#Parallel make bug
+
+	#Watch out for an elusive parallel make bug, that may yet occur.
+
 	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
 }
 
 src_install() {
-	emake INS_BASE="${D}/usr/" install
+	emake MANDIR="share/man" INS_BASE="${D}/usr/" install
+
 	#These symlinks are for compat with cdrkit.
 	dosym schily /usr/include/scsilib
 	dosym ../scg /usr/include/schily/scg
+
+	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux || die "dodoc cdrtools"
+
+	cd "${S}"/cdda2wav
+	docinto cdda2wav
+	dodoc FAQ Frontends HOWTOUSE TODO || die "dodoc cdda2wav"
+
 }
 
 pkg_postinst() {