|
Line
Link Here
|
| 0 |
-- kde-base/kdesdk/kdesdk-3.5.6-r1.ebuild |
0 |
++ kde-base/kdesdk/kdesdk-3.5.6-r1.ebuild |
|
Lines 24-39
Link Here
|
| 24 |
|
24 |
|
| 25 |
pkg_setup() { |
25 |
pkg_setup() { |
| 26 |
if use subversion ; then |
26 |
if use subversion ; then |
| 27 |
if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] \ |
27 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \ |
| 28 |
&& ! has_version =dev-libs/apr-0* ; |
28 |
&& ! has_version =dev-libs/apr-0* ; |
| 29 |
then |
29 |
then |
| 30 |
eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed." |
30 |
eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed." |
| 31 |
die "Please rebuild dev-util/subversion." |
31 |
die "Please rebuild dev-util/subversion." |
| 32 |
fi |
32 |
fi |
| 33 |
if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-1)" ]] \ |
33 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \ |
| 34 |
&& ! has_version =dev-libs/apr-1* ; |
34 |
&& ! has_version =dev-libs/apr-1* ; |
| 35 |
then |
35 |
then |
| 36 |
eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed." |
36 |
eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed." |
| 37 |
die "Please rebuild dev-util/subversion." |
37 |
die "Please rebuild dev-util/subversion." |
| 38 |
fi |
38 |
fi |
| 39 |
fi |
39 |
fi |
|
Lines 51-59
Link Here
|
| 51 |
|
51 |
|
| 52 |
if use subversion ; then |
52 |
if use subversion ; then |
| 53 |
if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] ; then |
53 |
if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] ; then |
| 54 |
myconf="--with-apr-config=/usr/bin/apr-config" |
54 |
myconf="--with-apr-config=/usr/bin/apr-config --with-apu-config=/usr/bin/apu-config" |
| 55 |
else |
55 |
else |
| 56 |
myconf="--with-apr-config=/usr/bin/apr-1-config" |
56 |
myconf="--with-apr-config=/usr/bin/apr-1-config --with-apu-config=/usr/bin/apu-1-config" |
| 57 |
fi |
57 |
fi |
| 58 |
fi |
58 |
fi |
| 59 |
|
59 |
|
| 60 |
-- kde-base/kdesdk/kdesdk-3.5.7.ebuild |
60 |
++ kde-base/kdesdk/kdesdk-3.5.7.ebuild |
|
Lines 24-39
Link Here
|
| 24 |
|
24 |
|
| 25 |
pkg_setup() { |
25 |
pkg_setup() { |
| 26 |
if use subversion ; then |
26 |
if use subversion ; then |
| 27 |
if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] \ |
27 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \ |
| 28 |
&& ! has_version =dev-libs/apr-0* ; |
28 |
&& ! has_version =dev-libs/apr-0* ; |
| 29 |
then |
29 |
then |
| 30 |
eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed." |
30 |
eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed." |
| 31 |
die "Please rebuild dev-util/subversion." |
31 |
die "Please rebuild dev-util/subversion." |
| 32 |
fi |
32 |
fi |
| 33 |
if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-1)" ]] \ |
33 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \ |
| 34 |
&& ! has_version =dev-libs/apr-1* ; |
34 |
&& ! has_version =dev-libs/apr-1* ; |
| 35 |
then |
35 |
then |
| 36 |
eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed." |
36 |
eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed." |
| 37 |
die "Please rebuild dev-util/subversion." |
37 |
die "Please rebuild dev-util/subversion." |
| 38 |
fi |
38 |
fi |
| 39 |
fi |
39 |
fi |
|
Lines 51-59
Link Here
|
| 51 |
|
51 |
|
| 52 |
if use subversion ; then |
52 |
if use subversion ; then |
| 53 |
if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] ; then |
53 |
if [[ -n "$(svn-config --includes | grep -o /usr/include/apr-0)" ]] ; then |
| 54 |
myconf="--with-apr-config=/usr/bin/apr-config" |
54 |
myconf="--with-apr-config=/usr/bin/apr-config --with-apu-config=/usr/bin/apu-config" |
| 55 |
else |
55 |
else |
| 56 |
myconf="--with-apr-config=/usr/bin/apr-1-config" |
56 |
myconf="--with-apr-config=/usr/bin/apr-1-config --with-apu-config=/usr/bin/apu-1-config" |
| 57 |
fi |
57 |
fi |
| 58 |
fi |
58 |
fi |
| 59 |
|
59 |
|
| 60 |
-- kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild |
60 |
++ kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.6-r1.ebuild |
|
Lines 17-38
Link Here
|
| 17 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \ |
17 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \ |
| 18 |
&& ! has_version =dev-libs/apr-0* ; |
18 |
&& ! has_version =dev-libs/apr-0* ; |
| 19 |
then |
19 |
then |
| 20 |
eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed." |
20 |
eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed." |
| 21 |
die "Please rebuild dev-util/subversion." |
21 |
die "Please rebuild dev-util/subversion." |
| 22 |
fi |
22 |
fi |
| 23 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \ |
23 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \ |
| 24 |
&& ! has_version =dev-libs/apr-1* ; |
24 |
&& ! has_version =dev-libs/apr-1* ; |
| 25 |
then |
25 |
then |
| 26 |
eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed." |
26 |
eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed." |
| 27 |
die "Please rebuild dev-util/subversion." |
27 |
die "Please rebuild dev-util/subversion." |
| 28 |
fi |
28 |
fi |
| 29 |
} |
29 |
} |
| 30 |
|
30 |
|
| 31 |
src_compile() { |
31 |
src_compile() { |
| 32 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then |
32 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then |
| 33 |
myconf="--with-apr-config=/usr/bin/apr-config" |
33 |
myconf="--with-apr-config=/usr/bin/apr-config --with-apu-config=/usr/bin/apu-config" |
| 34 |
else |
34 |
else |
| 35 |
myconf="--with-apr-config=/usr/bin/apr-1-config" |
35 |
myconf="--with-apr-config=/usr/bin/apr-1-config --with-apu-config=/usr/bin/apu-1-config" |
| 36 |
fi |
36 |
fi |
| 37 |
kde-meta_src_compile |
37 |
kde-meta_src_compile |
| 38 |
} |
38 |
} |
| 39 |
-- kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.ebuild |
39 |
++ kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.7.ebuild |
|
Lines 17-38
Link Here
|
| 17 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \ |
17 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] \ |
| 18 |
&& ! has_version =dev-libs/apr-0* ; |
18 |
&& ! has_version =dev-libs/apr-0* ; |
| 19 |
then |
19 |
then |
| 20 |
eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed." |
20 |
eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed." |
| 21 |
die "Please rebuild dev-util/subversion." |
21 |
die "Please rebuild dev-util/subversion." |
| 22 |
fi |
22 |
fi |
| 23 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \ |
23 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-1)" ]] \ |
| 24 |
&& ! has_version =dev-libs/apr-1* ; |
24 |
&& ! has_version =dev-libs/apr-1* ; |
| 25 |
then |
25 |
then |
| 26 |
eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed." |
26 |
eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed." |
| 27 |
die "Please rebuild dev-util/subversion." |
27 |
die "Please rebuild dev-util/subversion." |
| 28 |
fi |
28 |
fi |
| 29 |
} |
29 |
} |
| 30 |
|
30 |
|
| 31 |
src_compile() { |
31 |
src_compile() { |
| 32 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then |
32 |
if [[ -n "$(ldd /usr/bin/svn | grep -o libapr-0)" ]] ; then |
| 33 |
myconf="--with-apr-config=/usr/bin/apr-config" |
33 |
myconf="--with-apr-config=/usr/bin/apr-config --with-apu-config=/usr/bin/apu-config" |
| 34 |
else |
34 |
else |
| 35 |
myconf="--with-apr-config=/usr/bin/apr-1-config" |
35 |
myconf="--with-apr-config=/usr/bin/apr-1-config --with-apu-config=/usr/bin/apu-1-config" |
| 36 |
fi |
36 |
fi |
| 37 |
kde-meta_src_compile |
37 |
kde-meta_src_compile |
| 38 |
} |
38 |
} |
