Version bump. Fixes bug #243528. Use LINKMODE switch to force dynamic linking to save one sed line. Remove old.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 35 insertions, 26 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 989914515fff..20efd862f7d4 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.235 2009/09/16 18:22:07 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.236 2009/10/13 19:26:08 billie Exp $
+
+*cdrtools-2.01.01_alpha66 (13 Oct 2009)
+
+  13 Oct 2009; Pielmeier Daniel <billie@gentoo.org>
+  -cdrtools-2.01.01_alpha64.ebuild, +cdrtools-2.01.01_alpha66.ebuild:
+  Version bump. Fixes bug #243528. Use LINKMODE switch to force dynamic
+  linking to save one sed line. Remove old.
 
 *cdrtools-2.01.01_alpha65 (16 Sep 2009)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 7864d5407689..7bfdec1a3b88 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -2,10 +2,10 @@ AUX cdrtools-2.01.01_alpha34-asneeded.patch 1407 RMD160 1d7f740ae9c895c0afa75115
 AUX cdrtools-2.01.01_alpha50-asneeded.patch 951 RMD160 e7b90692b14a350f78cd33981449d10bd8df76d1 SHA1 3a014efb3e23f5ab474be7d8e10f8d2782f6ea23 SHA256 f3e5dc8a4ad165848da1776ce949940f3b91378a7b5a54a8d7808014dffc921d
 AUX cdrtools-2.01.01a03-warnings.patch 853 RMD160 5ecadc359bfe6d914f2782b7ea8e7b0bb60e5c14 SHA1 35df7d6adeb1380d72c07fecdf65725b7e708fac SHA256 0d2ca432a854792c82ee89fe6a097c6b3c1621e38fcb6d16c7f88658e62a130d
 DIST cdrtools-2.01.01a57.tar.bz2 1779673 RMD160 d7e8ea512a1e8ecaf3be6a9c4a782ff16c1d5253 SHA1 e07ec85d42df24ecf5f15236bb0cc4968be47f98 SHA256 d393863ecbb595eb389360fedcf63f51e7897168175cd219b0dfd1ef3ac2ad35
-DIST cdrtools-2.01.01a64.tar.bz2 1836328 RMD160 d609abe707c41d1a66bec7bb1ff4ae7967e5b355 SHA1 2e4af9079527bd5683dc778d1400ef68b595fd36 SHA256 b3bd7ae55c29d8d8cf419e8b04c49606baf9f573a797f62075b80b5d60798733
 DIST cdrtools-2.01.01a65.tar.bz2 1837426 RMD160 c82fc9ef43a3ce99edafba3a8f815af119bf7e2b SHA1 20f8a43197e2223eda7ff6b41a8ea47808de7fef SHA256 1e5460a16487c10d63b75661ffbce7a63751e67854d96e01b6117f1cd1d96173
+DIST cdrtools-2.01.01a66.tar.bz2 1842467 RMD160 150461c3bd140ac00afafc5bd2359c571e5deb4f SHA1 caef4828b7cea14e68a11388d011dc97b70219a7 SHA256 b43c8f35973393772f21b052de66d7239ac3ea84ceb32b179fcca21792e4813d
 EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3741 RMD160 e33768607c3eb47dac4c0d0316404fcab34bad3e SHA1 3b34dde1f622724ba233b10a3b1d8947c11c2e45 SHA256 cc9c4ea9e7f580b91d4d6b19254a309bb8599d2ea1596a16a249101f6fd10943
-EBUILD cdrtools-2.01.01_alpha64.ebuild 3750 RMD160 ecf2cecd7b128acc6f58b3cf17330eff492ef801 SHA1 a2c3cedee767c9165f4b555f57d3f967016d7de9 SHA256 b8f8ce3e66963ef98ba278d36f26d3b40edee507171620e68bb69d48e7496356
 EBUILD cdrtools-2.01.01_alpha65.ebuild 3427 RMD160 c94162ef8fa472fe98cb2db5bd02d04beff5050e SHA1 dc273244606c68a8017fc3d83296c54d408979f5 SHA256 e2894644c04de4eadfb8ac478fe7dac11cda4a4053a1c1ee42d32d77eac74063
-MISC ChangeLog 36692 RMD160 e8830dcc0ea2771e790ca2e8640764f58d35c613 SHA1 37e69e9147462cbba2ea2134252fc34d0dc5affb SHA256 26a30bd030e03024ca6c6e03c1c5a3cd1ad2acfdbe39edc9f94349df47625381
+EBUILD cdrtools-2.01.01_alpha66.ebuild 3829 RMD160 31fa919c2c01f664e0445f56ae83405b0ad29ddf SHA1 9482c8a850e2f63023575913c1ca1a814f8b0504 SHA256 2a98ec8150cd68929cc3796dabe3c3109006bafd923834c3e814951de6073e05
+MISC ChangeLog 36972 RMD160 5c3da8576bd3ebd1d0478cf8bdcb998cb2a46e2d SHA1 ce12a5d3f97734e34c85300d4275359686899c93 SHA256 db8e7b53540a2423d8787453bb81547c0838ca326786ee41999be02277906018
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha64.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha66.ebuild
index b743cf3f22a1..c685fb92c230 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha64.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha66.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_alpha64.ebuild,v 1.1 2009/09/04 16:22:05 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha66.ebuild,v 1.1 2009/10/13 19:26:08 billie Exp $
 
 EAPI=2
 
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${PN}-2.01.01
 
 src_prepare() {
-	#"Adjust paths. Upstream is clearly on drugs, hardcoding paths into .c files.
+	# Adjusting hardcoded 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' .) \
@@ -33,22 +33,22 @@ 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.
+	# Respect libdir.
 	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
 		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
 		|| die "404 on multilib-sed"
 
-	# See previous comment s/libdir/--disable-static/
+	# 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 (wtf?)
+
+	# Remove profiled make files.
 	rm -f $(find . -name '*_p.mk') || die "rm failed"
 
 	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
 
-	#Schily make setup
+	# Schily make setup.
 	cd "${S}"/DEFAULTS
 	local MYARCH="linux"
 
@@ -56,11 +56,20 @@ src_prepare() {
 	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH} || die "sed linux-include failed"
 	sed -i "/RUNPATH/ c\RUNPATH= " Defaults.${MYARCH} || die "sed RUNPATH failed"
 
-	# For dynamic linking:
-	sed -i "s:static:dynamic:" Defaults.${MYARCH} || die "sed static-remove failed"
-
-	# lame symlinks that all point to the same thing
+	# Create additional symlinks needed for some archs.
 	cd "${S}"/RULES
+
+	# Respect CC/CXX variables
+	local tcCC=$(tc-getCC)
+	local tcCXX=$(tc-getCXX)
+	sed -i -e "/cc-config.sh/s/\$(C_ARCH:%64=%) \$(CCOM_DEF)/${tcCC} ${tcCC}/" \
+		rules1.top || die "sed rules1.top failed"
+	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s/gcc/${tcCC}/" \
+		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s/g++/${tcCXX}/" \
+		cc-gcc.rul || die "sed cc-gcc.rul failed"
+	sed -i -e "s/^#CONFFLAGS +=\t-cc=\$(XCC_COM)$/CONFFLAGS +=\t-cc=${tcCC}/g" \
+		rules.cnf || die "sed rules.cnf failed"
+
 	local t
 	for t in ppc64 sh4 s390x ; do
 		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
@@ -87,17 +96,18 @@ src_compile() {
 		CFLAGS="${CFLAGS} -DNO_ACL"
 		ACL=""
 	fi
-	#If not built with -j1, "sometimes" cdda2wav will not be built. Nasty bug.
+	# If not built with -j1, "sometimes" cdda2wav will not be built. Bug?
 	emake -j1 CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" \
 		LIB_ACL_TEST="${ACL}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" \
 		GMAKE_NOWARN="true" || die "emake failed"
 }
 
 src_install() {
+	# If not built with -j1, "sometimes" manpages are not installed. Bug?
 	emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}" \
-		GMAKE_NOWARN="true" install
+		LINKMODE="dynamic" GMAKE_NOWARN="true" install
 
-	#These symlinks are for compat with cdrkit.
+	# These symlinks are for compat with cdrkit.
 	dosym schily /usr/include/scsilib
 	dosym ../scg /usr/include/schily/scg
 
@@ -106,12 +116,4 @@ src_install() {
 	cd "${S}"/cdda2wav
 	docinto cdda2wav
 	dodoc FAQ Frontends HOWTOUSE TODO || die "dodoc cdda2wav"
-
-}
-
-pkg_postinst() {
-	echo
-	einfo "The command line option 'dev=/dev/hdX' (X is the name of your drive)"
-	einfo "should be used for IDE CD writers.  And make sure that the permissions"
-	einfo "on this device are set properly and your user is in the correct group."
 }