Cleanup ebuild.

(Portage version: 2.1.6.13/cvs/Linux i686)

2 files changed, 24 insertions, 19 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 33875fe7f178..36d1e34e6c97 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,10 @@
 # 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.241 2009/12/01 20:18:22 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.242 2009/12/02 18:54:00 billie Exp $
+
+  02 Dec 2009; Daniel Pielmeier <billie@gentoo.org>
+  cdrtools-2.01.01_alpha69.ebuild:
+  Cleanup ebuild.
 
 *cdrtools-2.01.01_alpha69 (01 Dec 2009)
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild
index ad30a8799c43..2f3009a03970 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.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_alpha69.ebuild,v 1.1 2009/12/01 20:18:22 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild,v 1.2 2009/12/02 18:54:00 billie Exp $
 
 EAPI=2
 
@@ -23,6 +23,11 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${PN}-2.01.01
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
+
+	# Remove profiled make files.
+	rm -f $(find . -name '*_p.mk') || die "rm failed"
+
 	# Adjusting hardcoded paths.
 	sed -i -e 's:opt/schily:usr:' \
 		$(grep -l --include='*.1' --include='*.8' -r 'opt/schily' .) \
@@ -38,27 +43,12 @@ src_prepare() {
 		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
 		|| die "404 on multilib-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.
-	rm -f $(find . -name '*_p.mk') || die "rm failed"
-
-	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS
-	local MYARCH="linux"
-
-	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH} || die "sed schily-opt failed"
-	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"
-
+	# Respect CC/CXX variables.
 	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}|" \
@@ -71,10 +61,21 @@ src_prepare() {
 
 	# Create additional symlinks needed for some archs.
 	local t
-	for t in ppc64 sh4 s390x ; do
+	for t in ppc64 s390x ; do
 		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
 		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
 	done
+
+	# Schily make setup.
+	cd "${S}"/DEFAULTS
+	local MYARCH="linux"
+
+	sed -i \
+		-e "s:/opt/schily:/usr:g" \
+		-e "s:/usr/src/linux/include::g" \
+		-e "/RUNPATH/ c\RUNPATH= " \
+		-e "s:bin:root:g" \
+		 Defaults.${MYARCH} || die "sed Schily make setup failed"
 }
 
 src_configure() { : ; }