1 |
phajdan.jr 12/05/29 08:05:05 |
2 |
|
3 |
Modified: ChangeLog gnustep-2.eclass gnustep-base.eclass |
4 |
Log: |
5 |
Apply gnustep eclass changes wrt http://archives.gentoo.org/gentoo-dev/msg_eee22ea47f4d15e2fa2932583aa92db7.xml |
6 |
|
7 |
Revision Changes Path |
8 |
1.275 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.275&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.275&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.274&r2=1.275 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.274 |
18 |
retrieving revision 1.275 |
19 |
diff -u -r1.274 -r1.275 |
20 |
--- ChangeLog 28 May 2012 16:45:57 -0000 1.274 |
21 |
+++ ChangeLog 29 May 2012 08:05:05 -0000 1.275 |
22 |
@@ -1,6 +1,12 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.274 2012/05/28 16:45:57 phajdan.jr Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.275 2012/05/29 08:05:05 phajdan.jr Exp $ |
27 |
+ |
28 |
+ 29 May 2012; Pawel Hajdan jr <phajdan.jr@g.o> gnustep-2.eclass, |
29 |
+ gnustep-base.eclass: |
30 |
+ Apply gnustep eclass changes wrt |
31 |
+ http://archives.gentoo.org/gentoo-dev/msg_eee22ea47f4d15e2fa2932583aa92db7.xm |
32 |
+ l |
33 |
|
34 |
28 May 2012; Pawel Hajdan jr <phajdan.jr@g.o> eutils.eclass: |
35 |
Simplify preserve_old_lib ewarn messages, wrt |
36 |
|
37 |
|
38 |
|
39 |
1.7 eclass/gnustep-2.eclass |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-2.eclass?rev=1.7&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-2.eclass?rev=1.7&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-2.eclass?r1=1.6&r2=1.7 |
44 |
|
45 |
Index: gnustep-2.eclass |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v |
48 |
retrieving revision 1.6 |
49 |
retrieving revision 1.7 |
50 |
diff -u -r1.6 -r1.7 |
51 |
--- gnustep-2.eclass 27 Dec 2011 17:55:12 -0000 1.6 |
52 |
+++ gnustep-2.eclass 29 May 2012 08:05:05 -0000 1.7 |
53 |
@@ -1,6 +1,6 @@ |
54 |
-# Copyright 1999-2011 Gentoo Foundation |
55 |
+# Copyright 1999-2012 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.6 2011/12/27 17:55:12 fauli Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.7 2012/05/29 08:05:05 phajdan.jr Exp $ |
59 |
|
60 |
# @ECLASS: gnustep-2.eclass |
61 |
# @MAINTAINER: |
62 |
@@ -15,7 +15,7 @@ |
63 |
DEPEND=">=gnustep-base/gnustep-make-2.0 |
64 |
virtual/gnustep-back" |
65 |
RDEPEND="${DEPEND} |
66 |
- debug? ( >=sys-devel/gdb-6.0 )" |
67 |
+ debug? ( !<sys-devel/gdb-6.0 )" |
68 |
|
69 |
# The following gnustep-based EXPORT_FUNCTIONS are available: |
70 |
# * gnustep-base_pkg_setup |
71 |
|
72 |
|
73 |
|
74 |
1.25 eclass/gnustep-base.eclass |
75 |
|
76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.25&view=markup |
77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.25&content-type=text/plain |
78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?r1=1.24&r2=1.25 |
79 |
|
80 |
Index: gnustep-base.eclass |
81 |
=================================================================== |
82 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v |
83 |
retrieving revision 1.24 |
84 |
retrieving revision 1.25 |
85 |
diff -u -r1.24 -r1.25 |
86 |
--- gnustep-base.eclass 20 Feb 2012 10:14:44 -0000 1.24 |
87 |
+++ gnustep-base.eclass 29 May 2012 08:05:05 -0000 1.25 |
88 |
@@ -1,6 +1,6 @@ |
89 |
# Copyright 1999-2012 Gentoo Foundation |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.24 2012/02/20 10:14:44 voyageur Exp $ |
92 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.25 2012/05/29 08:05:05 phajdan.jr Exp $ |
93 |
|
94 |
# @ECLASS: gnustep-base.eclass |
95 |
# @MAINTAINER: |
96 |
@@ -193,14 +193,14 @@ |
97 |
|
98 |
# Make and install docs using GNUstep Makefiles |
99 |
egnustep_doc() { |
100 |
- if [[ -d ./Documentation ]] ; then |
101 |
+ if [[ -d "${S}"/Documentation ]] ; then |
102 |
# Check documentation presence |
103 |
- cd "${S}"/Documentation |
104 |
+ pushd "${S}"/Documentation || die |
105 |
if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then |
106 |
emake "${GS_ENV[@]}" all || die "doc make failed" |
107 |
emake "${GS_ENV[@]}" install || die "doc install failed" |
108 |
fi |
109 |
- cd .. |
110 |
+ popd || die |
111 |
fi |
112 |
} |