Cleanup ebuild.

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

3 files changed, 26 insertions, 21 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/Manifest b/app-cdr/cdrtools/Manifest
index c5fd7e201191..5abb1b5aeae0 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -6,6 +6,6 @@ DIST cdrtools-2.01.01a68.tar.bz2 1850334 RMD160 8c2530f8386d804f644dea4ec4f7d268
 DIST cdrtools-2.01.01a69.tar.bz2 1851038 RMD160 1006076aecdf0bc2f467a675b2116c5d51c3c59b SHA1 5da138f393b14b478e3df4f95324f3ea1b7a3cc2 SHA256 b85fa9de4729e428acb4611b1af361d341691d85519533d353ef42d0d2b30c87
 EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3741 RMD160 e33768607c3eb47dac4c0d0316404fcab34bad3e SHA1 3b34dde1f622724ba233b10a3b1d8947c11c2e45 SHA256 cc9c4ea9e7f580b91d4d6b19254a309bb8599d2ea1596a16a249101f6fd10943
 EBUILD cdrtools-2.01.01_alpha68.ebuild 3848 RMD160 b04fb9ee81036e292b0e22cafa045a8d7c47ba75 SHA1 647f555242a88e362a42038c8939c392674ce290 SHA256 6b220a0b34ed86560010f2e22a36019110ee3fede8fd86438c9001334b26f497
-EBUILD cdrtools-2.01.01_alpha69.ebuild 3848 RMD160 f2d3d95093c0ac81b03d6b613ec24a1691499f81 SHA1 faa3dc8d96f3ffd5f25febc3515d7589da1106db SHA256 a6c45f8b4cf782e9c6fac7c9bebd02d3fe66b289e6b4d61a5093d251a0bd7328
-MISC ChangeLog 38019 RMD160 1c44f2778eaaf51e166a4642696915a5a13f491e SHA1 bed41d2bcd2d693c2dd38138d06faba8b9dbca05 SHA256 17680a39107a8552f6d703cf336933986aa6339643a90be40b16d2116517a367
+EBUILD cdrtools-2.01.01_alpha69.ebuild 3731 RMD160 8d8aa1ed1613d42210fabd680b09f9c7ef954bf8 SHA1 4855bddab9a35c2e0c0b9ad47a73d1ee18cd9ddb SHA256 d8e5b1aa6935ccb9cc3b2ea22d868bdeb45814e905114b1360710769d5262861
+MISC ChangeLog 38125 RMD160 d918de60a3dc5a5c434174c157001043b1d62045 SHA1 7cc37f4060bb095c6dea049a54ca70ec56fdfe53 SHA256 95e9e9a6013a516d9e6c28c93de4a49419aa3866f4cd60fb52d7d77b9e435a2b
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
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() { : ; }