1 |
billie 09/12/02 18:54:01 |
2 |
|
3 |
Modified: ChangeLog cdrtools-2.01.01_alpha69.ebuild |
4 |
Log: |
5 |
Cleanup ebuild. |
6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.242 app-cdr/cdrtools/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?rev=1.242&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?rev=1.242&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?r1=1.241&r2=1.242 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v |
18 |
retrieving revision 1.241 |
19 |
retrieving revision 1.242 |
20 |
diff -u -r1.241 -r1.242 |
21 |
--- ChangeLog 1 Dec 2009 20:18:22 -0000 1.241 |
22 |
+++ ChangeLog 2 Dec 2009 18:54:00 -0000 1.242 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for app-cdr/cdrtools |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.241 2009/12/01 20:18:22 billie Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.242 2009/12/02 18:54:00 billie Exp $ |
28 |
+ |
29 |
+ 02 Dec 2009; Daniel Pielmeier <billie@g.o> |
30 |
+ cdrtools-2.01.01_alpha69.ebuild: |
31 |
+ Cleanup ebuild. |
32 |
|
33 |
*cdrtools-2.01.01_alpha69 (01 Dec 2009) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.2 app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: cdrtools-2.01.01_alpha69.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha69.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- cdrtools-2.01.01_alpha69.ebuild 1 Dec 2009 20:18:22 -0000 1.1 |
51 |
+++ cdrtools-2.01.01_alpha69.ebuild 2 Dec 2009 18:54:00 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2009 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $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 $ |
56 |
+# $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 $ |
57 |
|
58 |
EAPI=2 |
59 |
|
60 |
@@ -23,6 +23,11 @@ |
61 |
S=${WORKDIR}/${PN}-2.01.01 |
62 |
|
63 |
src_prepare() { |
64 |
+ epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch |
65 |
+ |
66 |
+ # Remove profiled make files. |
67 |
+ rm -f $(find . -name '*_p.mk') || die "rm failed" |
68 |
+ |
69 |
# Adjusting hardcoded paths. |
70 |
sed -i -e 's:opt/schily:usr:' \ |
71 |
$(grep -l --include='*.1' --include='*.8' -r 'opt/schily' .) \ |
72 |
@@ -38,27 +43,12 @@ |
73 |
$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \ |
74 |
|| die "404 on multilib-sed" |
75 |
|
76 |
- # See previous comment s/libdir/--disable-static/. |
77 |
sed -i -e 's:include\t\t.*rules.lib::' \ |
78 |
$(grep -l -r '^include.\+rules\.lib' .) \ |
79 |
|| die "404 on rules sed" |
80 |
|
81 |
- # Remove profiled make files. |
82 |
- rm -f $(find . -name '*_p.mk') || die "rm failed" |
83 |
- |
84 |
- epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch |
85 |
- |
86 |
- # Schily make setup. |
87 |
- cd "${S}"/DEFAULTS |
88 |
- local MYARCH="linux" |
89 |
- |
90 |
- sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH} || die "sed schily-opt failed" |
91 |
- sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH} || die "sed linux-include failed" |
92 |
- sed -i "/RUNPATH/ c\RUNPATH= " Defaults.${MYARCH} || die "sed RUNPATH failed" |
93 |
- |
94 |
+ # Respect CC/CXX variables. |
95 |
cd "${S}"/RULES |
96 |
- |
97 |
- # Respect CC/CXX variables |
98 |
local tcCC=$(tc-getCC) |
99 |
local tcCXX=$(tc-getCXX) |
100 |
sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ |
101 |
@@ -71,10 +61,21 @@ |
102 |
|
103 |
# Create additional symlinks needed for some archs. |
104 |
local t |
105 |
- for t in ppc64 sh4 s390x ; do |
106 |
+ for t in ppc64 s390x ; do |
107 |
ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die |
108 |
ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die |
109 |
done |
110 |
+ |
111 |
+ # Schily make setup. |
112 |
+ cd "${S}"/DEFAULTS |
113 |
+ local MYARCH="linux" |
114 |
+ |
115 |
+ sed -i \ |
116 |
+ -e "s:/opt/schily:/usr:g" \ |
117 |
+ -e "s:/usr/src/linux/include::g" \ |
118 |
+ -e "/RUNPATH/ c\RUNPATH= " \ |
119 |
+ -e "s:bin:root:g" \ |
120 |
+ Defaults.${MYARCH} || die "sed Schily make setup failed" |
121 |
} |
122 |
|
123 |
src_configure() { : ; } |