1 |
billie 10/04/27 20:27:26 |
2 |
|
3 |
Modified: cdrtools-2.01.01_alpha77.ebuild ChangeLog |
4 |
cdrtools-2.01.01_alpha78.ebuild |
5 |
Log: |
6 |
Use virtual/acl to support x86-freebsd. Thanks to Alexis Ballier on irc. |
7 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: cdrtools-2.01.01_alpha77.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- cdrtools-2.01.01_alpha77.ebuild 16 Mar 2010 10:58:41 -0000 1.2 |
23 |
+++ cdrtools-2.01.01_alpha77.ebuild 27 Apr 2010 20:27:26 -0000 1.3 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild,v 1.2 2010/03/16 10:58:41 aballier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild,v 1.3 2010/04/27 20:27:26 billie Exp $ |
29 |
|
30 |
EAPI=2 |
31 |
|
32 |
@@ -8,7 +8,7 @@ |
33 |
|
34 |
DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" |
35 |
HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html" |
36 |
-if [[ ${PV%_alpha*} == ${PV} ]] ; then |
37 |
+if [[ ${PV%_alpha*} == ${PV} ]]; then |
38 |
SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/${P}.tar.bz2" |
39 |
else |
40 |
SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2" |
41 |
@@ -19,7 +19,7 @@ |
42 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
43 |
IUSE="acl unicode" |
44 |
|
45 |
-DEPEND="acl? ( sys-apps/acl ) |
46 |
+DEPEND="acl? ( virtual/acl ) |
47 |
!app-cdr/dvdrtools |
48 |
!app-cdr/cdrkit" |
49 |
RDEPEND="${DEPEND}" |
50 |
@@ -62,7 +62,7 @@ |
51 |
|
52 |
# Create additional symlinks needed for some archs. |
53 |
local t |
54 |
- for t in ppc64 s390x ; do |
55 |
+ for t in ppc64 s390x; do |
56 |
ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die |
57 |
ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die |
58 |
done |
59 |
@@ -92,16 +92,13 @@ |
60 |
fi |
61 |
fi |
62 |
|
63 |
- local acl="-lacl" |
64 |
- if ! use acl |
65 |
- then |
66 |
+ if ! use acl; then |
67 |
CFLAGS="${CFLAGS} -DNO_ACL" |
68 |
- acl="" |
69 |
fi |
70 |
|
71 |
# If not built with -j1, "sometimes" cdda2wav will not be built. Bug? |
72 |
emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ |
73 |
- LDOPTX="${LDFLAGS}" LINKMODE="dynamic" LIB_ACL_TEST="${acl}" \ |
74 |
+ LDOPTX="${LDFLAGS}" LINKMODE="dynamic" \ |
75 |
GMAKE_NOWARN="true" || die "emake" |
76 |
} |
77 |
|
78 |
|
79 |
|
80 |
|
81 |
1.258 app-cdr/cdrtools/ChangeLog |
82 |
|
83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?rev=1.258&view=markup |
84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?rev=1.258&content-type=text/plain |
85 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?r1=1.257&r2=1.258 |
86 |
|
87 |
Index: ChangeLog |
88 |
=================================================================== |
89 |
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v |
90 |
retrieving revision 1.257 |
91 |
retrieving revision 1.258 |
92 |
diff -u -r1.257 -r1.258 |
93 |
--- ChangeLog 27 Apr 2010 19:08:13 -0000 1.257 |
94 |
+++ ChangeLog 27 Apr 2010 20:27:26 -0000 1.258 |
95 |
@@ -1,6 +1,10 @@ |
96 |
# ChangeLog for app-cdr/cdrtools |
97 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
98 |
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.257 2010/04/27 19:08:13 billie Exp $ |
99 |
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.258 2010/04/27 20:27:26 billie Exp $ |
100 |
+ |
101 |
+ 27 Apr 2010; Daniel Pielmeier <billie@g.o> |
102 |
+ cdrtools-2.01.01_alpha77.ebuild, cdrtools-2.01.01_alpha78.ebuild: |
103 |
+ Use virtual/acl to support x86-freebsd. Thanks to Alexis Ballier on irc. |
104 |
|
105 |
27 Apr 2010; Daniel Pielmeier <billie@g.o> |
106 |
-cdrtools-2.01.01_alpha76.ebuild: |
107 |
|
108 |
|
109 |
|
110 |
1.2 app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild |
111 |
|
112 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild?rev=1.2&view=markup |
113 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild?rev=1.2&content-type=text/plain |
114 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild?r1=1.1&r2=1.2 |
115 |
|
116 |
Index: cdrtools-2.01.01_alpha78.ebuild |
117 |
=================================================================== |
118 |
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild,v |
119 |
retrieving revision 1.1 |
120 |
retrieving revision 1.2 |
121 |
diff -u -r1.1 -r1.2 |
122 |
--- cdrtools-2.01.01_alpha78.ebuild 27 Apr 2010 19:06:18 -0000 1.1 |
123 |
+++ cdrtools-2.01.01_alpha78.ebuild 27 Apr 2010 20:27:26 -0000 1.2 |
124 |
@@ -1,6 +1,6 @@ |
125 |
# Copyright 1999-2010 Gentoo Foundation |
126 |
# Distributed under the terms of the GNU General Public License v2 |
127 |
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild,v 1.1 2010/04/27 19:06:18 billie Exp $ |
128 |
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild,v 1.2 2010/04/27 20:27:26 billie Exp $ |
129 |
|
130 |
EAPI=2 |
131 |
|
132 |
@@ -8,7 +8,7 @@ |
133 |
|
134 |
DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" |
135 |
HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html" |
136 |
-if [[ ${PV%_alpha*} == ${PV} ]] ; then |
137 |
+if [[ ${PV%_alpha*} == ${PV} ]]; then |
138 |
SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/${P}.tar.bz2" |
139 |
else |
140 |
SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2" |
141 |
@@ -19,7 +19,7 @@ |
142 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
143 |
IUSE="acl unicode" |
144 |
|
145 |
-DEPEND="acl? ( sys-apps/acl ) |
146 |
+DEPEND="acl? ( virtual/acl ) |
147 |
!app-cdr/dvdrtools |
148 |
!app-cdr/cdrkit" |
149 |
RDEPEND="${DEPEND}" |
150 |
@@ -62,7 +62,7 @@ |
151 |
|
152 |
# Create additional symlinks needed for some archs. |
153 |
local t |
154 |
- for t in ppc64 s390x ; do |
155 |
+ for t in ppc64 s390x; do |
156 |
ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die |
157 |
ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die |
158 |
done |
159 |
@@ -92,16 +92,13 @@ |
160 |
fi |
161 |
fi |
162 |
|
163 |
- local acl="-lacl" |
164 |
- if ! use acl |
165 |
- then |
166 |
+ if ! use acl; then |
167 |
CFLAGS="${CFLAGS} -DNO_ACL" |
168 |
- acl="" |
169 |
fi |
170 |
|
171 |
# If not built with -j1, "sometimes" cdda2wav will not be built. Bug? |
172 |
emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ |
173 |
- LDOPTX="${LDFLAGS}" LINKMODE="dynamic" LIB_ACL_TEST="${acl}" \ |
174 |
+ LDOPTX="${LDFLAGS}" LINKMODE="dynamic" \ |
175 |
GMAKE_NOWARN="true" || die "emake" |
176 |
} |